openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'bonzini/hw-dirs' into staging 

* bonzini/hw-dirs:
  sh: move files referencing CPU to hw/sh4/
  ppc: move more files to hw/ppc
  ppc: move files referencing CPU to hw/ppc/
  m68k: move files referencing CPU to hw/m68k/
  i386: move files referencing CPU to hw/i386/
  arm: move files referencing CPU to hw/arm/
  hw: move boards and other isolated files to hw/ARCH
  ppc: express FDT dependency of pSeries and e500 boards via default-configs/
  build: always link device_tree.o into emulators if libfdt available
  hw: include hw header files with full paths
  ppc: do not use ../ in include files
  vt82c686: vt82c686 is not a PCI host bridge
  virtio-9p: remove PCI dependencies from hw/9pfs/
  virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX
  hw: move device-hotplug.o to toplevel, compile it once
  hw: move qdev-monitor.o to toplevel directory
  hw: move fifo.[ch] to libqemuutil
  hw: move char backends to backends/

Conflicts:
	backends/baum.c
	backends/msmouse.c
	hw/a15mpcore.c
	hw/arm/Makefile.objs
	hw/arm/pic_cpu.c
	hw/dataplane/event-poll.c
	hw/dataplane/virtio-blk.c
	include/char/baum.h
	include/char/msmouse.h
	qemu-char.c
	vl.c

Resolve conflicts caused by header movements.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-03-10 19:39:07 -05:00
parent 6a245c666d 7a2771d154
commit 6e72a00f90
537 changed files with 1808 additions and 1780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -51,6 +51,7 @@ ifeq ($(CONFIG_SOFTMMU),y)
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
common-obj-y += net/
common-obj-y += readline.o
common-obj-y += qdev-monitor.o device-hotplug.o
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o

1
Makefile.target
View File

@ -111,6 +111,7 @@ CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y)
obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o
obj-y += qtest.o
obj-y += hw/
obj-$(CONFIG_FDT) += device_tree.o
obj-$(CONFIG_KVM) += kvm-all.o
obj-$(CONFIG_NO_KVM) += kvm-stub.o
obj-y += memory.o savevm.o cputlb.o

4
backends/Makefile.objs
View File

@ -1,2 +1,6 @@
common-obj-y += rng.o rng-egd.o
common-obj-$(CONFIG_POSIX) += rng-random.o
common-obj-y += msmouse.o
common-obj-$(CONFIG_BRLAPI) += baum.o
$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)

2
hw/baum.c → backends/baum.c
View File

@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "char/char.h"
#include "qemu/timer.h"
#include "usb.h"
#include "hw/usb.h"
#include <brlapi.h>
#include <brlapi_constants.h>
#include <brlapi_keycodes.h>

0
hw/msmouse.c → backends/msmouse.c
View File

10
configure vendored
View File

@ -2420,6 +2420,7 @@ int main(void) { return 0; }
EOF
if compile_prog "" "$fdt_libs" ; then
fdt=yes
libs_softmmu="$libs_softmmu $fdt_libs"
else
if test "$fdt" = "yes" ; then
feature_not_found "fdt"
@ -3991,7 +3992,6 @@ case "$target_arch2" in
target_nptl="yes"
gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
target_llong_alignment=4
target_libs_softmmu="$fdt_libs"
;;
cris)
target_nptl="yes"
@ -4010,7 +4010,6 @@ case "$target_arch2" in
TARGET_ARCH=microblaze
bflt="yes"
target_nptl="yes"
target_libs_softmmu="$fdt_libs"
;;
mips|mipsel)
TARGET_ARCH=mips
@ -4036,21 +4035,18 @@ case "$target_arch2" in
ppc)
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_nptl="yes"
target_libs_softmmu="$fdt_libs"
;;
ppcemb)
TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_nptl="yes"
target_libs_softmmu="$fdt_libs"
;;
ppc64)
TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_long_alignment=8
target_libs_softmmu="$fdt_libs"
;;
ppc64abi32)
TARGET_ARCH=ppc64
@ -4058,7 +4054,6 @@ case "$target_arch2" in
TARGET_ABI_DIR=ppc
echo "TARGET_ABI32=y" >> $config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_libs_softmmu="$fdt_libs"
;;
sh4|sh4eb)
TARGET_ARCH=sh4
@ -4160,9 +4155,6 @@ case "$target_arch2" in
i386|x86_64)
echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak
esac
if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then
echo "CONFIG_PSERIES=y" >> $config_target_mak
fi
if test "$target_bigendian" = "yes" ; then
echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
fi

1
default-configs/ppc-softmmu.mak
View File

@ -40,3 +40,4 @@ CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_E500=$(CONFIG_FDT)

2
default-configs/ppc64-softmmu.mak
View File

@ -40,3 +40,5 @@ CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_PSERIES=$(CONFIG_FDT)
CONFIG_E500=$(CONFIG_FDT)

1
default-configs/ppcemb-softmmu.mak
View File

@ -35,3 +35,4 @@ CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_E500=$(CONFIG_FDT)

13
hw/device-hotplug.c → device-hotplug.c
View File

@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "boards.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "qemu/config-file.h"
#include "sysemu/sysemu.h"
@ -47,15 +47,6 @@ DriveInfo *add_init_drive(const char *optstr)
return dinfo;
}
#if !defined(TARGET_I386)
int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo)
{
/* On non-x86 we don't do PCI hotplug */
monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type);
return -1;
}
#endif
void drive_hot_add(Monitor *mon, const QDict *qdict)
{
DriveInfo *dinfo = NULL;

53
hw/9pfs/virtio-9p-device.c
View File

@ -14,9 +14,9 @@
#include "hw/virtio.h"
#include "hw/pc.h"
#include "qemu/sockets.h"
#include "hw/virtio-pci.h"
#include "virtio-9p.h"
#include "fsdev/qemu-fsdev.h"
#include "virtio-9p-device.h"
#include "virtio-9p-xattr.h"
#include "virtio-9p-coth.h"
@ -136,54 +136,3 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf)
return &s->vdev;
}
static int virtio_9p_init_pci(PCIDevice *pci_dev)
{
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
VirtIODevice *vdev;
vdev = virtio_9p_init(&pci_dev->qdev, &proxy->fsconf);
vdev->nvectors = proxy->nvectors;
virtio_init_pci(proxy, vdev);
/* make the actual value visible */
proxy->nvectors = vdev->nvectors;
return 0;
}
static Property virtio_9p_properties[] = {
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features),
DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, fsconf.tag),
DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, fsconf.fsdev_id),
DEFINE_PROP_END_OF_LIST(),
};
static void virtio_9p_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = virtio_9p_init_pci;
k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
k->device_id = PCI_DEVICE_ID_VIRTIO_9P;
k->revision = VIRTIO_PCI_ABI_VERSION;
k->class_id = 0x2;
dc->props = virtio_9p_properties;
dc->reset = virtio_pci_reset;
}
static const TypeInfo virtio_9p_info = {
.name = "virtio-9p-pci",
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VirtIOPCIProxy),
.class_init = virtio_9p_class_init,
};
static void virtio_9p_register_types(void)
{
type_register_static(&virtio_9p_info);
virtio_9p_set_fd_limit();
}
type_init(virtio_9p_register_types)

4
hw/9p.h → hw/9pfs/virtio-9p-device.h
View File

@ -11,8 +11,8 @@
*
*/
#ifndef QEMU_9P_H
#define QEMU_9P_H
#ifndef QEMU_VIRTIO_9P_DEVICE_H
#define QEMU_VIRTIO_9P_DEVICE_H
typedef struct V9fsConf
{

1
hw/9pfs/virtio-9p-proxy.c
View File

@ -13,6 +13,7 @@
#include <sys/un.h>
#include "hw/virtio.h"
#include "virtio-9p.h"
#include "qemu/error-report.h"
#include "fsdev/qemu-fsdev.h"
#include "virtio-9p-proxy.h"

3
hw/9pfs/virtio-9p.c
View File

@ -14,7 +14,6 @@
#include "hw/virtio.h"
#include "hw/pc.h"
#include "qemu/sockets.h"
#include "hw/virtio-pci.h"
#include "virtio-9p.h"
#include "fsdev/qemu-fsdev.h"
#include "virtio-9p-xattr.h"
@ -3269,7 +3268,7 @@ void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)
free_pdu(s, pdu);
}
void virtio_9p_set_fd_limit(void)
static void __attribute__((__constructor__)) virtio_9p_set_fd_limit(void)
{
struct rlimit rlim;
if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) {

1
hw/9pfs/virtio-9p.h
View File

@ -389,7 +389,6 @@ static inline uint8_t v9fs_request_cancelled(V9fsPDU *pdu)
}
extern void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq);
extern void virtio_9p_set_fd_limit(void);
extern void v9fs_reclaim_fd(V9fsPDU *pdu);
extern void v9fs_path_init(V9fsPath *path);
extern void v9fs_path_free(V9fsPath *path);

8
hw/Makefile.objs
View File

@ -44,7 +44,6 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
endif
common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
common-obj-$(CONFIG_SDHCI) += sdhci.o
common-obj-y += fifo.o
common-obj-y += pam.o
# PPC devices
@ -190,10 +189,8 @@ common-obj-$(CONFIG_SSI_SD) += ssi-sd.o
common-obj-$(CONFIG_SD) += sd.o
common-obj-y += bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o
common-obj-y += bt-hci-csr.o
common-obj-y += msmouse.o ps2.o
common-obj-y += qdev-monitor.o
common-obj-y += ps2.o
common-obj-y += qdev-properties-system.o
common-obj-$(CONFIG_BRLAPI) += baum.o
# xen backend driver support
common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o
@ -209,8 +206,6 @@ obj-$(CONFIG_SOFTMMU) += vhost_net.o
obj-$(CONFIG_VHOST_NET) += vhost.o
obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
obj-$(CONFIG_VGA) += vga.o
obj-$(CONFIG_SOFTMMU) += device-hotplug.o
obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
# Inter-VM PCI shared memory & VFIO PCI device assignment
ifeq ($(CONFIG_PCI), y)
@ -218,5 +213,4 @@ obj-$(CONFIG_KVM) += ivshmem.o
obj-$(CONFIG_LINUX) += vfio_pci.o
endif
$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
endif

2
hw/a15mpcore.c
View File

@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "sysemu/kvm.h"
/* A15MP private memory region. */

2
hw/a9mpcore.c
View File

@ -8,7 +8,7 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
typedef struct A9MPPrivState {
SysBusDevice busdev;

2
hw/a9scu.c
View File

@ -8,7 +8,7 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
/* A9MP private memory region. */

6
hw/ac97.c
View File

@ -17,10 +17,10 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "audiodev.h"
#include "hw/hw.h"
#include "hw/audiodev.h"
#include "audio/audio.h"
#include "pci/pci.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"
enum {

6
hw/acpi.c
View File

@ -19,9 +19,9 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysemu/sysemu.h"
#include "hw.h"
#include "pc.h"
#include "acpi.h"
#include "hw/hw.h"
#include "hw/pc.h"
#include "hw/acpi.h"
#include "monitor/monitor.h"
struct acpi_table_header {

10
hw/acpi_ich9.c
View File

@ -23,16 +23,16 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pc.h"
#include "pci/pci.h"
#include "hw/hw.h"
#include "hw/pc.h"
#include "hw/pci/pci.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
#include "acpi.h"
#include "hw/acpi.h"
#include "sysemu/kvm.h"
#include "exec/address-spaces.h"
#include "ich9.h"
#include "hw/ich9.h"
//#define DEBUG

2
hw/acpi_ich9.h
View File

@ -21,7 +21,7 @@
#ifndef HW_ACPI_ICH9_H
#define HW_ACPI_ICH9_H
#include "acpi.h"
#include "hw/acpi.h"
typedef struct ICH9LPCPMRegs {
/*

14
hw/acpi_piix4.c
View File

@ -18,16 +18,16 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pc.h"
#include "apm.h"
#include "pm_smbus.h"
#include "pci/pci.h"
#include "acpi.h"
#include "hw/hw.h"
#include "hw/pc.h"
#include "hw/apm.h"
#include "hw/pm_smbus.h"
#include "hw/pci/pci.h"
#include "hw/acpi.h"
#include "sysemu/sysemu.h"
#include "qemu/range.h"
#include "exec/ioport.h"
#include "fw_cfg.h"
#include "hw/fw_cfg.h"
#include "exec/address-spaces.h"
//#define DEBUG

4
hw/adb.c
View File

@ -21,8 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "hw.h"
#include "adb.h"
#include "hw/hw.h"
#include "hw/adb.h"
#include "ui/console.h"
/* debug ADB */

2
hw/adb.h
View File

@ -26,7 +26,7 @@
#if !defined(__ADB_H__)
#define __ADB_H__
#include "qdev.h"
#include "hw/qdev.h"
#define MAX_ADB_DEVICES 16

8
hw/adlib.c
View File

@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "audiodev.h"
#include "hw/hw.h"
#include "hw/audiodev.h"
#include "audio/audio.h"
#include "isa.h"
#include "hw/isa.h"
//#define DEBUG
@ -47,7 +47,7 @@
void YMF262UpdateOneQEMU (int which, INT16 *dst, int length);
#define SHIFT 2
#else
#include "fmopl.h"
#include "hw/fmopl.h"
#define SHIFT 1
#endif

2
hw/ads7846.c
View File

@ -10,7 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "ssi.h"
#include "hw/ssi.h"
#include "ui/console.h"
typedef struct {

4
hw/alpha/Makefile.objs
View File

@ -1,4 +1,6 @@
obj-y = mc146818rtc.o
obj-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o
obj-y += alpha_typhoon.o
obj-y := $(addprefix ../,$(obj-y))
obj-y += dp264.o pci.o

16
hw/alpha_dp264.c → hw/alpha/dp264.c
View File

@ -6,16 +6,16 @@
* that we need to emulate as well.
*/
#include "hw.h"
#include "hw/hw.h"
#include "elf.h"
#include "loader.h"
#include "boards.h"
#include "alpha_sys.h"
#include "hw/loader.h"
#include "hw/boards.h"
#include "hw/alpha_sys.h"
#include "sysemu/sysemu.h"
#include "mc146818rtc.h"
#include "ide.h"
#include "i8254.h"
#include "serial.h"
#include "hw/mc146818rtc.h"
#include "hw/ide.h"
#include "hw/i8254.h"
#include "hw/serial.h"
#define MAX_IDE_BUS 2

2
hw/alpha_pci.c → hw/alpha/pci.c
View File

@ -7,7 +7,7 @@
*/
#include "config.h"
#include "alpha_sys.h"
#include "hw/alpha_sys.h"
#include "qemu/log.h"
#include "sysemu/sysemu.h"

10
hw/alpha_sys.h
View File

@ -3,11 +3,11 @@
#ifndef HW_ALPHA_H
#define HW_ALPHA_H 1
#include "pci/pci.h"
#include "pci/pci_host.h"
#include "ide.h"
#include "pc.h"
#include "irq.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/ide.h"
#include "hw/pc.h"
#include "hw/irq.h"
PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, AlphaCPU *[4],

6
hw/alpha_typhoon.c
View File

@ -8,10 +8,10 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "hw.h"
#include "devices.h"
#include "hw/hw.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "hw/alpha_sys.h"
#include "exec/address-spaces.h"

12
hw/apb_pci.c
View File

@ -26,12 +26,12 @@
Ultrasparc PCI host is called the PCI Bus Module (PBM). The APB is
the secondary PCI bridge. */
#include "sysbus.h"
#include "pci/pci.h"
#include "pci/pci_host.h"
#include "pci/pci_bridge.h"
#include "pci/pci_bus.h"
#include "apb_pci.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
#include "hw/apb_pci.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"

12
hw/apic.c
View File

@ -17,14 +17,14 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
#include "qemu/thread.h"
#include "apic_internal.h"
#include "apic.h"
#include "ioapic.h"
#include "pci/msi.h"
#include "hw/apic_internal.h"
#include "hw/apic.h"
#include "hw/ioapic.h"
#include "hw/pci/msi.h"
#include "qemu/host-utils.h"
#include "trace.h"
#include "pc.h"
#include "apic-msidef.h"
#include "hw/pc.h"
#include "hw/apic-msidef.h"
#define MAX_APIC_WORDS 8

4
hw/apic_common.c
View File

@ -17,8 +17,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
#include "apic.h"
#include "apic_internal.h"
#include "hw/apic.h"
#include "hw/apic_internal.h"
#include "trace.h"
#include "sysemu/kvm.h"

2
hw/apic_internal.h
View File

@ -21,7 +21,7 @@
#define QEMU_APIC_INTERNAL_H
#include "exec/memory.h"
#include "sysbus.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
/* APIC Local Vector Table */

6
hw/apm.c
View File

@ -20,9 +20,9 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "apm.h"
#include "hw.h"
#include "pci/pci.h"
#include "hw/apm.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
//#define DEBUG

2
hw/apm.h
View File

@ -3,7 +3,7 @@
#include <stdint.h>
#include "qemu-common.h"
#include "hw.h"
#include "hw/hw.h"
#include "exec/memory.h"
typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);

4
hw/applesmc.c
View File

@ -30,8 +30,8 @@
*
*/
#include "hw.h"
#include "isa.h"
#include "hw/hw.h"
#include "hw/isa.h"
#include "ui/console.h"
#include "qemu/timer.h"

42
hw/arm/Makefile.objs
View File

@ -1,37 +1,37 @@
obj-y = integratorcp.o versatilepb.o arm_pic.o
obj-y += arm_boot.o
obj-y += xilinx_zynq.o zynq_slcr.o
obj-y += zynq_slcr.o
obj-y += xilinx_spips.o
obj-y += arm_gic.o arm_gic_common.o
obj-y += a9scu.o
obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o
obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o
obj-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o
obj-y += realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o
obj-y += exynos4210_gic.o exynos4210_combiner.o
obj-y += exynos4210_uart.o exynos4210_pwm.o
obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o
obj-y += exynos4210_rtc.o exynos4210_i2c.o
obj-y += arm_mptimer.o a15mpcore.o
obj-y += armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o
obj-y += highbank.o
obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
obj-y += armv7m_nvic.o stellaris_enet.o
obj-y += pxa2xx_timer.o pxa2xx_dma.o
obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
obj-y += gumstix.o
obj-y += zaurus.o ide/microdrive.o spitz.o tosa.o tc6393xb.o
obj-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
obj-y += zaurus.o ide/microdrive.o tc6393xb.o
obj-y += omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
omap_gpio.o omap_intc.o omap_uart.o
obj-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o
obj-y += omap_sx1.o palm.o tsc210x.o
obj-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o
obj-y += mst_fpga.o mainstone.o
obj-y += z2.o
obj-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o
obj-y += tsc210x.o
obj-y += blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o
obj-y += mst_fpga.o
obj-y += bitbang_i2c.o marvell_88w8618_audio.o
obj-y += framebuffer.o
obj-y += vexpress.o
obj-y += strongarm.o
obj-y += collie.o
obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
obj-y += kzm.o
obj-$(CONFIG_FDT) += ../device_tree.o
obj-$(CONFIG_KVM) += kvm/arm_gic.o
obj-y := $(addprefix ../,$(obj-y))
obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o
obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o
obj-y += omap_sx1.o palm.o pic_cpu.o realview.o spitz.o stellaris.o
obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o
obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
obj-y += omap1.o omap2.o

6
hw/armv7m.c → hw/arm/armv7m.c
View File

@ -7,9 +7,9 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "arm-misc.h"
#include "loader.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/loader.h"
#include "elf.h"
/* Bitbanded IO. Each word corresponds to a single bit. */

8
hw/arm_boot.c → hw/arm/boot.c
View File

@ -8,11 +8,11 @@
*/
#include "config.h"
#include "hw.h"
#include "arm-misc.h"
#include "hw/hw.h"
#include "hw/arm-misc.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
#include "sysemu/device_tree.h"
#include "qemu/config-file.h"

14
hw/collie.c → hw/arm/collie.c
View File

@ -8,13 +8,13 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "sysbus.h"
#include "boards.h"
#include "devices.h"
#include "strongarm.h"
#include "arm-misc.h"
#include "flash.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/devices.h"
#include "hw/strongarm.h"
#include "hw/arm-misc.h"
#include "hw/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

12
hw/exynos4210.c → hw/arm/exynos4210.c
View File

@ -21,13 +21,13 @@
*
*/
#include "boards.h"
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "sysbus.h"
#include "arm-misc.h"
#include "loader.h"
#include "exynos4210.h"
#include "usb/hcd-ehci.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/loader.h"
#include "hw/exynos4210.h"
#include "hw/usb/hcd-ehci.h"
#define EXYNOS4210_CHIPID_ADDR 0x10000000

8
hw/exynos4_boards.c → hw/arm/exynos4_boards.c
View File

@ -22,12 +22,12 @@
*/
#include "sysemu/sysemu.h"
#include "sysbus.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "arm-misc.h"
#include "hw/arm-misc.h"
#include "exec/address-spaces.h"
#include "exynos4210.h"
#include "boards.h"
#include "hw/exynos4210.h"
#include "hw/boards.h"
#undef DEBUG

10
hw/gumstix.c → hw/arm/gumstix.c
View File

@ -34,12 +34,12 @@
* # qemu-system-arm -M verdex -pflash flash -monitor null -nographic -m 289
*/
#include "hw.h"
#include "pxa.h"
#include "hw/hw.h"
#include "hw/pxa.h"
#include "net/net.h"
#include "flash.h"
#include "devices.h"
#include "boards.h"
#include "hw/flash.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

12
hw/highbank.c → hw/arm/highbank.c
View File

@ -17,14 +17,14 @@
*
*/
#include "sysbus.h"
#include "arm-misc.h"
#include "devices.h"
#include "loader.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "hw/loader.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "sysbus.h"
#include "hw/boards.h"
#include "hw/sysbus.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

8
hw/integratorcp.c → hw/arm/integratorcp.c
View File

@ -7,10 +7,10 @@
* This code is licensed under the GPL
*/
#include "sysbus.h"
#include "devices.h"
#include "boards.h"
#include "arm-misc.h"
#include "hw/sysbus.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/arm-misc.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"

14
hw/kzm.c → hw/arm/kzm.c
View File

@ -13,16 +13,16 @@
* i.MX31 SoC
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "hw.h"
#include "arm-misc.h"
#include "devices.h"
#include "hw/hw.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "serial.h"
#include "imx.h"
#include "hw/boards.h"
#include "hw/serial.h"
#include "hw/imx.h"
/* Memory map for Kzm Emulation Baseboard:
* 0x00000000-0x00003fff 16k secure ROM IGNORED

14
hw/mainstone.c → hw/arm/mainstone.c
View File

@ -11,15 +11,15 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pxa.h"
#include "arm-misc.h"
#include "hw/hw.h"
#include "hw/pxa.h"
#include "hw/arm-misc.h"
#include "net/net.h"
#include "devices.h"
#include "boards.h"
#include "flash.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/flash.h"
#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
/* Device addresses */

16
hw/musicpal.c → hw/arm/musicpal.c
View File

@ -9,19 +9,19 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysbus.h"
#include "arm-misc.h"
#include "devices.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "serial.h"
#include "hw/boards.h"
#include "hw/serial.h"
#include "qemu/timer.h"
#include "ptimer.h"
#include "hw/ptimer.h"
#include "block/block.h"
#include "flash.h"
#include "hw/flash.h"
#include "ui/console.h"
#include "i2c.h"
#include "hw/i2c.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
#include "ui/pixel_ops.h"

22
hw/nseries.c → hw/arm/nseries.c
View File

@ -20,19 +20,19 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "omap.h"
#include "arm-misc.h"
#include "irq.h"
#include "hw/omap.h"
#include "hw/arm-misc.h"
#include "hw/irq.h"
#include "ui/console.h"
#include "boards.h"
#include "i2c.h"
#include "devices.h"
#include "flash.h"
#include "hw.h"
#include "bt.h"
#include "loader.h"
#include "hw/boards.h"
#include "hw/i2c.h"
#include "hw/devices.h"
#include "hw/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
/* Nokia N8x0 support */

10
hw/omap1.c → hw/arm/omap1.c
View File

@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
#include "arm-misc.h"
#include "omap.h"
#include "hw/hw.h"
#include "hw/arm-misc.h"
#include "hw/omap.h"
#include "sysemu/sysemu.h"
#include "soc_dma.h"
#include "hw/soc_dma.h"
#include "sysemu/blockdev.h"
#include "qemu/range.h"
#include "sysbus.h"
#include "hw/sysbus.h"
/* Should signal the TCMI/GPMC */
uint32_t omap_badwidth_read8(void *opaque, hwaddr addr)

12
hw/omap2.c → hw/arm/omap2.c
View File

@ -19,15 +19,15 @@
*/
#include "sysemu/blockdev.h"
#include "hw.h"
#include "arm-misc.h"
#include "omap.h"
#include "hw/hw.h"
#include "hw/arm-misc.h"
#include "hw/omap.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "char/char.h"
#include "flash.h"
#include "soc_dma.h"
#include "sysbus.h"
#include "hw/flash.h"
#include "hw/soc_dma.h"
#include "hw/sysbus.h"
#include "audio/audio.h"
/* Enhanced Audio Controller (CODEC only) */

10
hw/omap_sx1.c → hw/arm/omap_sx1.c
View File

@ -25,12 +25,12 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "omap.h"
#include "boards.h"
#include "arm-misc.h"
#include "flash.h"
#include "hw/omap.h"
#include "hw/boards.h"
#include "hw/arm-misc.h"
#include "hw/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

12
hw/palm.c → hw/arm/palm.c
View File

@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
#include "hw/hw.h"
#include "audio/audio.h"
#include "sysemu/sysemu.h"
#include "ui/console.h"
#include "omap.h"
#include "boards.h"
#include "arm-misc.h"
#include "devices.h"
#include "loader.h"
#include "hw/omap.h"
#include "hw/boards.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
static uint32_t static_readb(void *opaque, hwaddr offset)

4
hw/arm_pic.c → hw/arm/pic_cpu.c
View File

@ -7,8 +7,8 @@
* This code is licensed under the LGPL
*/
#include "hw.h"
#include "arm-misc.h"
#include "hw/hw.h"
#include "hw/arm-misc.h"
#include "sysemu/kvm.h"
/* Input 0 is IRQ and input 1 is FIQ. */

10
hw/pxa2xx.c → hw/arm/pxa2xx.c
View File

@ -7,12 +7,12 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "pxa.h"
#include "hw/sysbus.h"
#include "hw/pxa.h"
#include "sysemu/sysemu.h"
#include "serial.h"
#include "i2c.h"
#include "ssi.h"
#include "hw/serial.h"
#include "hw/i2c.h"
#include "hw/ssi.h"
#include "char/char.h"
#include "sysemu/blockdev.h"

6
hw/pxa2xx_gpio.c → hw/arm/pxa2xx_gpio.c
View File

@ -7,9 +7,9 @@
* This code is licensed under the GPL.
*/
#include "hw.h"
#include "sysbus.h"
#include "pxa.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/pxa.h"
#define PXA2XX_GPIO_BANKS 4

6
hw/pxa2xx_pic.c → hw/arm/pxa2xx_pic.c
View File

@ -8,9 +8,9 @@
* This code is licensed under the GPL.
*/
#include "hw.h"
#include "pxa.h"
#include "sysbus.h"
#include "hw/hw.h"
#include "hw/pxa.h"
#include "hw/sysbus.h"
#define ICIP 0x00 /* Interrupt Controller IRQ Pending register */
#define ICMR 0x04 /* Interrupt Controller Mask register */

14
hw/realview.c → hw/arm/realview.c
View File

@ -7,15 +7,15 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "arm-misc.h"
#include "primecell.h"
#include "devices.h"
#include "pci/pci.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/primecell.h"
#include "hw/devices.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "i2c.h"
#include "hw/boards.h"
#include "hw/i2c.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

22
hw/spitz.c → hw/arm/spitz.c
View File

@ -10,23 +10,23 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pxa.h"
#include "arm-misc.h"
#include "hw/hw.h"
#include "hw/pxa.h"
#include "hw/arm-misc.h"
#include "sysemu/sysemu.h"
#include "pcmcia.h"
#include "i2c.h"
#include "ssi.h"
#include "flash.h"
#include "hw/pcmcia.h"
#include "hw/i2c.h"
#include "hw/ssi.h"
#include "hw/flash.h"
#include "qemu/timer.h"
#include "devices.h"
#include "sharpsl.h"
#include "hw/devices.h"
#include "hw/sharpsl.h"
#include "ui/console.h"
#include "block/block.h"
#include "audio/audio.h"
#include "boards.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#undef REG_FMT

12
hw/stellaris.c → hw/arm/stellaris.c
View File

@ -7,14 +7,14 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "ssi.h"
#include "arm-misc.h"
#include "devices.h"
#include "hw/sysbus.h"
#include "hw/ssi.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "qemu/timer.h"
#include "i2c.h"
#include "hw/i2c.h"
#include "net/net.h"
#include "boards.h"
#include "hw/boards.h"
#include "exec/address-spaces.h"
#define GPIO_A 0

20
hw/tosa.c → hw/arm/tosa.c
View File

@ -11,18 +11,18 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pxa.h"
#include "arm-misc.h"
#include "devices.h"
#include "sharpsl.h"
#include "pcmcia.h"
#include "hw/hw.h"
#include "hw/pxa.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "hw/sharpsl.h"
#include "hw/pcmcia.h"
#include "block/block.h"
#include "boards.h"
#include "i2c.h"
#include "ssi.h"
#include "hw/boards.h"
#include "hw/i2c.h"
#include "hw/ssi.h"
#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#define TOSA_RAM 0x04000000

14
hw/versatilepb.c → hw/arm/versatilepb.c
View File

@ -7,17 +7,17 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "arm-misc.h"
#include "devices.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "pci/pci.h"
#include "i2c.h"
#include "boards.h"
#include "hw/pci/pci.h"
#include "hw/i2c.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
#include "flash.h"
#include "hw/flash.h"
#define VERSATILE_FLASH_ADDR 0x34000000
#define VERSATILE_FLASH_SIZE (64 * 1024 * 1024)

12
hw/vexpress.c → hw/arm/vexpress.c
View File

@ -21,16 +21,16 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysbus.h"
#include "arm-misc.h"
#include "primecell.h"
#include "devices.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/primecell.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "hw/boards.h"
#include "exec/address-spaces.h"
#include "sysemu/blockdev.h"
#include "flash.h"
#include "hw/flash.h"
#define VEXPRESS_BOARD_ID 0x8e0
#define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024)

12
hw/xilinx_zynq.c → hw/arm/xilinx_zynq.c
View File

@ -15,16 +15,16 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "sysbus.h"
#include "arm-misc.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "flash.h"
#include "hw/boards.h"
#include "hw/flash.h"
#include "sysemu/blockdev.h"
#include "loader.h"
#include "ssi.h"
#include "hw/loader.h"
#include "hw/ssi.h"
#define NUM_SPI_FLASHES 4
#define NUM_QSPI_FLASHES 2

16
hw/z2.c → hw/arm/z2.c
View File

@ -11,15 +11,15 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pxa.h"
#include "arm-misc.h"
#include "devices.h"
#include "i2c.h"
#include "ssi.h"
#include "boards.h"
#include "hw/hw.h"
#include "hw/pxa.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "hw/i2c.h"
#include "hw/ssi.h"
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "flash.h"
#include "hw/flash.h"
#include "sysemu/blockdev.h"
#include "ui/console.h"
#include "audio/audio.h"

2
hw/arm11mpcore.c
View File

@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
/* MPCore private memory region. */

4
hw/arm_gic.c
View File

@ -18,8 +18,8 @@
* armv7m_nvic device.
*/
#include "sysbus.h"
#include "arm_gic_internal.h"
#include "hw/sysbus.h"
#include "hw/arm_gic_internal.h"
//#define DEBUG_GIC

2
hw/arm_gic_common.c
View File

@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "arm_gic_internal.h"
#include "hw/arm_gic_internal.h"
static void gic_save(QEMUFile *f, void *opaque)
{

2
hw/arm_gic_internal.h
View File

@ -21,7 +21,7 @@
#ifndef QEMU_ARM_GIC_INTERNAL_H
#define QEMU_ARM_GIC_INTERNAL_H
#include "sysbus.h"
#include "hw/sysbus.h"
/* Maximum number of possible interrupts, determined by the GIC architecture */
#define GIC_MAXIRQ 1020

2
hw/arm_l2x0.c
View File

@ -18,7 +18,7 @@
*
*/
#include "sysbus.h"
#include "hw/sysbus.h"
/* L2C-310 r3p2 */
#define CACHE_ID 0x410000c8

2
hw/arm_mptimer.c
View File

@ -19,7 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
/* This device implements the per-cpu private timer and watchdog block

6
hw/arm_sysctl.c
View File

@ -7,10 +7,10 @@
* This code is licensed under the GPL.
*/
#include "hw.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "sysbus.h"
#include "primecell.h"
#include "hw/sysbus.h"
#include "hw/primecell.h"
#include "sysemu/sysemu.h"
#define LOCK_VALUE 0xa05f

6
hw/arm_timer.c
View File

@ -7,11 +7,11 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "qemu-common.h"
#include "qdev.h"
#include "ptimer.h"
#include "hw/qdev.h"
#include "hw/ptimer.h"
/* Common timer implementation. */

6
hw/armv7m_nvic.c
View File

@ -10,11 +10,11 @@
* NVIC. Much of that is also implemented here.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "arm-misc.h"
#include "hw/arm-misc.h"
#include "exec/address-spaces.h"
#include "arm_gic_internal.h"
#include "hw/arm_gic_internal.h"
typedef struct {
GICState gic;

6
hw/bitbang_i2c.c
View File

@ -9,9 +9,9 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "bitbang_i2c.h"
#include "sysbus.h"
#include "hw/hw.h"
#include "hw/bitbang_i2c.h"
#include "hw/sysbus.h"
//#define DEBUG_BITBANG_I2C

2
hw/bitbang_i2c.h
View File

@ -1,7 +1,7 @@
#ifndef BITBANG_I2C_H
#define BITBANG_I2C_H
#include "i2c.h"
#include "hw/i2c.h"
typedef struct bitbang_i2c_interface bitbang_i2c_interface;

14
hw/blizzard.c
View File

@ -20,8 +20,8 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "devices.h"
#include "vga_int.h"
#include "hw/devices.h"
#include "hw/vga_int.h"
#include "ui/pixel_ops.h"
typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int);
@ -941,15 +941,15 @@ static void blizzard_screen_dump(void *opaque, const char *filename,
}
#define DEPTH 8
#include "blizzard_template.h"
#include "hw/blizzard_template.h"
#define DEPTH 15
#include "blizzard_template.h"
#include "hw/blizzard_template.h"
#define DEPTH 16
#include "blizzard_template.h"
#include "hw/blizzard_template.h"
#define DEPTH 24
#include "blizzard_template.h"
#include "hw/blizzard_template.h"
#define DEPTH 32
#include "blizzard_template.h"
#include "hw/blizzard_template.h"
void *s1d13745_init(qemu_irq gpio_int)
{

2
hw/boards.h
View File

@ -4,7 +4,7 @@
#define HW_BOARDS_H
#include "sysemu/blockdev.h"
#include "qdev.h"
#include "hw/qdev.h"
#define DEFAULT_MACHINE_OPTIONS \
.boot_order = "cad"

10
hw/bonito.c
View File

@ -39,11 +39,11 @@
#include <assert.h>
#include "hw.h"
#include "pci/pci.h"
#include "pc.h"
#include "mips.h"
#include "pci/pci_host.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pc.h"
#include "hw/mips.h"
#include "hw/pci/pci_host.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"

4
hw/bt-hci-csr.c
View File

@ -21,9 +21,9 @@
#include "qemu-common.h"
#include "char/char.h"
#include "qemu/timer.h"
#include "irq.h"
#include "hw/irq.h"
#include "bt/bt.h"
#include "bt.h"
#include "hw/bt.h"
struct csrhci_s {
int enable;

4
hw/bt-hci.c
View File

@ -20,9 +20,9 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "usb.h"
#include "hw/usb.h"
#include "bt/bt.h"
#include "bt.h"
#include "hw/bt.h"
struct bt_hci_s {
uint8_t *(*evt_packet)(void *opaque);

4
hw/bt-hid.c
View File

@ -21,8 +21,8 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "ui/console.h"
#include "hid.h"
#include "bt.h"
#include "hw/hid.h"
#include "hw/bt.h"
enum hid_transaction_req {
BT_HANDSHAKE = 0x0,

2
hw/bt-l2cap.c
View File

@ -19,7 +19,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "bt.h"
#include "hw/bt.h"
#define L2CAP_CID_MAX 0x100 /* Between 0x40 and 0x10000 */

2
hw/bt-sdp.c
View File

@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
#include "bt.h"
#include "hw/bt.h"
struct bt_l2cap_sdp_state_s {
struct bt_l2cap_conn_params_s *channel;

2
hw/bt.c
View File

@ -19,7 +19,7 @@
#include "qemu-common.h"
#include "bt/bt.h"
#include "bt.h"
#include "hw/bt.h"
/* Slave implementations can ignore this */
static void bt_dummy_lmp_mode_change(struct bt_link_s *link)

2
hw/cadence_gem.c
View File

@ -24,7 +24,7 @@
#include <zlib.h> /* For crc32 */
#include "sysbus.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "net/checksum.h"

2
hw/cadence_ttc.c
View File

@ -16,7 +16,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#ifdef CADENCE_TTC_ERR_DEBUG

2
hw/cadence_uart.c
View File

@ -16,7 +16,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "char/char.h"
#include "qemu/timer.h"

4
hw/cbus.c
View File

@ -21,8 +21,8 @@
*/
#include "qemu-common.h"
#include "irq.h"
#include "devices.h"
#include "hw/irq.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
//#define DEBUG

2
hw/ccid.h
View File

@ -10,7 +10,7 @@
#ifndef CCID_H
#define CCID_H
#include "qdev.h"
#include "hw/qdev.h"
typedef struct CCIDCardState CCIDCardState;
typedef struct CCIDCardInfo CCIDCardInfo;

2
hw/cdrom.c
View File

@ -26,7 +26,7 @@
here. */
#include "qemu-common.h"
#include "scsi.h"
#include "hw/scsi.h"
static void lba_to_msf(uint8_t *buf, int lba)
{

44
hw/cirrus_vga.c
View File

@ -26,11 +26,11 @@
* Reference: Finn Thogersons' VGADOC4b
* available at http://home.worldonline.dk/~finth/
*/
#include "hw.h"
#include "pci/pci.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "ui/console.h"
#include "vga_int.h"
#include "loader.h"
#include "hw/vga_int.h"
#include "hw/loader.h"
/*
* TODO:
@ -288,63 +288,63 @@ static void cirrus_bitblt_fill_nop(CirrusVGAState *s,
#define ROP_NAME 0
#define ROP_FN(d, s) 0
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME src_and_dst
#define ROP_FN(d, s) (s) & (d)
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME src_and_notdst
#define ROP_FN(d, s) (s) & (~(d))
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME notdst
#define ROP_FN(d, s) ~(d)
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME src
#define ROP_FN(d, s) s
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME 1
#define ROP_FN(d, s) ~0
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME notsrc_and_dst
#define ROP_FN(d, s) (~(s)) & (d)
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME src_xor_dst
#define ROP_FN(d, s) (s) ^ (d)
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME src_or_dst
#define ROP_FN(d, s) (s) | (d)
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME notsrc_or_notdst
#define ROP_FN(d, s) (~(s)) | (~(d))
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME src_notxor_dst
#define ROP_FN(d, s) ~((s) ^ (d))
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME src_or_notdst
#define ROP_FN(d, s) (s) | (~(d))
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME notsrc
#define ROP_FN(d, s) (~(s))
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME notsrc_or_dst
#define ROP_FN(d, s) (~(s)) | (d)
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
#define ROP_NAME notsrc_and_notdst
#define ROP_FN(d, s) (~(s)) & (~(d))
#include "cirrus_vga_rop.h"
#include "hw/cirrus_vga_rop.h"
static const cirrus_bitblt_rop_t cirrus_fwd_rop[16] = {
cirrus_bitblt_rop_fwd_0,
@ -2165,13 +2165,13 @@ static void cirrus_cursor_invalidate(VGACommonState *s1)
}
#define DEPTH 8
#include "cirrus_vga_template.h"
#include "hw/cirrus_vga_template.h"
#define DEPTH 16
#include "cirrus_vga_template.h"
#include "hw/cirrus_vga_template.h"
#define DEPTH 32
#include "cirrus_vga_template.h"
#include "hw/cirrus_vga_template.h"
static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y)
{

8
hw/cirrus_vga_rop.h
View File

@ -191,16 +191,16 @@ glue(glue(cirrus_bitblt_rop_bkwd_transp_, ROP_NAME),_16)(CirrusVGAState *s,
}
#define DEPTH 8
#include "cirrus_vga_rop2.h"
#include "hw/cirrus_vga_rop2.h"
#define DEPTH 16
#include "cirrus_vga_rop2.h"
#include "hw/cirrus_vga_rop2.h"
#define DEPTH 24
#include "cirrus_vga_rop2.h"
#include "hw/cirrus_vga_rop2.h"
#define DEPTH 32
#include "cirrus_vga_rop2.h"
#include "hw/cirrus_vga_rop2.h"
#undef ROP_NAME
#undef ROP_OP

10
hw/cris/Makefile.objs
View File

@ -1,8 +1,3 @@
# Boards
obj-y = cris_pic_cpu.o
obj-y += cris-boot.o
obj-y += axis_dev88.o
# IO blocks
obj-y += etraxfs_dma.o
obj-y += etraxfs_pic.o
@ -11,3 +6,8 @@ obj-y += etraxfs_timer.o
obj-y += etraxfs_ser.o
obj-y := $(addprefix ../,$(obj-y))
# Boards
obj-y += pic_cpu.o
obj-y += boot.o
obj-y += axis_dev88.o

12
hw/axis_dev88.c → hw/cris/axis_dev88.c
View File

@ -22,14 +22,14 @@
* THE SOFTWARE.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "flash.h"
#include "boards.h"
#include "etraxfs.h"
#include "loader.h"
#include "hw/flash.h"
#include "hw/boards.h"
#include "hw/etraxfs.h"
#include "hw/loader.h"
#include "elf.h"
#include "cris-boot.h"
#include "hw/cris-boot.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

6
hw/cris-boot.c → hw/cris/boot.c
View File

@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "loader.h"
#include "hw/hw.h"
#include "hw/loader.h"
#include "elf.h"
#include "cris-boot.h"
#include "hw/cris-boot.h"
static void main_cpu_reset(void *opaque)
{

Some files were not shown because too many files have changed in this diff Show More