diff options
| -rw-r--r-- | Makefile.objs | 3 | ||||
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rw-r--r-- | default-configs/ppc-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/ppc64-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/ppcemb-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/prep_pci.c | 8 |
6 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.objs b/Makefile.objs index 7ac8920..3968c35 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -150,7 +150,10 @@ hw-obj-$(CONFIG_USB_UHCI) += usb-uhci.o hw-obj-$(CONFIG_USB_OHCI) += usb-ohci.o hw-obj-$(CONFIG_FDC) += fdc.o hw-obj-$(CONFIG_ACPI) += acpi.o + +# PPC devices hw-obj-$(CONFIG_OPENPIC) += openpic.o +hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o # PCI watchdog devices hw-obj-y += wdt_i6300esb.o diff --git a/Makefile.target b/Makefile.target index a90add6..51d0fec 100644 --- a/Makefile.target +++ b/Makefile.target @@ -193,7 +193,7 @@ obj-ppc-y = ppc.o obj-ppc-y += vga.o dma.o # PREP target obj-ppc-y += pckbd.o i8259.o mc146818rtc.o -obj-ppc-y += prep_pci.o ppc_prep.o +obj-ppc-y += ppc_prep.o # Mac shared devices obj-ppc-y += macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o # OldWorld PowerMac diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index ca7e228..17691d9 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_SERIAL=y CONFIG_I8254=y CONFIG_FDC=y CONFIG_OPENPIC=y +CONFIG_PREP_PCI=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 1987f44..774edd3 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_SERIAL=y CONFIG_I8254=y CONFIG_FDC=y CONFIG_OPENPIC=y +CONFIG_PREP_PCI=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 18eac99..bcd5bd8 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_SERIAL=y CONFIG_I8254=y CONFIG_FDC=y CONFIG_OPENPIC=y +CONFIG_PREP_PCI=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 19f028c..144fde0 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -49,18 +49,14 @@ static void PPC_PCIIO_writeb (void *opaque, target_phys_addr_t addr, uint32_t va static void PPC_PCIIO_writew (void *opaque, target_phys_addr_t addr, uint32_t val) { PREPPCIState *s = opaque; -#ifdef TARGET_WORDS_BIGENDIAN val = bswap16(val); -#endif pci_data_write(s->bus, PPC_PCIIO_config(addr), val, 2); } static void PPC_PCIIO_writel (void *opaque, target_phys_addr_t addr, uint32_t val) { PREPPCIState *s = opaque; -#ifdef TARGET_WORDS_BIGENDIAN val = bswap32(val); -#endif pci_data_write(s->bus, PPC_PCIIO_config(addr), val, 4); } @@ -77,9 +73,7 @@ static uint32_t PPC_PCIIO_readw (void *opaque, target_phys_addr_t addr) PREPPCIState *s = opaque; uint32_t val; val = pci_data_read(s->bus, PPC_PCIIO_config(addr), 2); -#ifdef TARGET_WORDS_BIGENDIAN val = bswap16(val); -#endif return val; } @@ -88,9 +82,7 @@ static uint32_t PPC_PCIIO_readl (void *opaque, target_phys_addr_t addr) PREPPCIState *s = opaque; uint32_t val; val = pci_data_read(s->bus, PPC_PCIIO_config(addr), 4); -#ifdef TARGET_WORDS_BIGENDIAN val = bswap32(val); -#endif return val; } |
