Compile usb-ohci only once
Push TARGET_WORDS_BIGENDIAN dependency to board level.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
diff --git a/Makefile.objs b/Makefile.objs
index 54a3e92..1eb7e19 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -143,6 +143,7 @@
hw-obj-$(CONFIG_I8254) += i8254.o
hw-obj-$(CONFIG_PCSPK) += pcspk.o
hw-obj-$(CONFIG_USB_UHCI) += usb-uhci.o
+hw-obj-$(CONFIG_USB_OHCI) += usb-ohci.o
hw-obj-$(CONFIG_FDC) += fdc.o
# PCI watchdog devices
diff --git a/Makefile.target b/Makefile.target
index 7778732..b42dae2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -186,9 +186,6 @@
# xen backend driver support
obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
-# USB layer
-obj-$(CONFIG_USB_OHCI) += usb-ohci.o
-
# PCI network cards
obj-y += rtl8139.o
obj-y += e1000.o
diff --git a/hw/devices.h b/hw/devices.h
index 0ac561d..e9e8ec7 100644
--- a/hw/devices.h
+++ b/hw/devices.h
@@ -69,5 +69,5 @@
/* usb-ohci.c */
void usb_ohci_init_sm501(uint32_t mmio_base, uint32_t localmem_base,
- int num_ports, int devfn, qemu_irq irq);
+ int num_ports, int devfn, qemu_irq irq, int be);
#endif
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index d131aa5..16d289c 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -387,7 +387,7 @@
escc_mem_index);
if (usb_enabled) {
- usb_ohci_init_pci(pci_bus, -1);
+ usb_ohci_init_pci(pci_bus, -1, 1);
}
/* U3 needs to use USB for input because Linux doesn't support via-cuda
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 27ddc01..d7ee858 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -370,7 +370,7 @@
escc_mem_index);
if (usb_enabled) {
- usb_ohci_init_pci(pci_bus, -1);
+ usb_ohci_init_pci(pci_bus, -1, 1);
}
if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index a5e25b5..bb5967a 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -750,7 +750,7 @@
#endif
if (usb_enabled) {
- usb_ohci_init_pci(pci_bus, -1);
+ usb_ohci_init_pci(pci_bus, -1, 1);
}
m48t59 = m48t59_init(i8259[8], 0, 0x0074, NVRAM_SIZE, 59);
diff --git a/hw/pxa.h b/hw/pxa.h
index 2ca36c2..8d6a8c3 100644
--- a/hw/pxa.h
+++ b/hw/pxa.h
@@ -213,8 +213,4 @@
PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision);
PXA2xxState *pxa255_init(unsigned int sdram_size);
-/* usb-ohci.c */
-void usb_ohci_init_pxa(target_phys_addr_t base, int num_ports, int devfn,
- qemu_irq irq);
-
#endif /* PXA_H */
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index 705c369..4fafba2 100644
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -9,6 +9,7 @@
#include "sysbus.h"
#include "pxa.h"
+#include "usb-ohci.h"
#include "sysemu.h"
#include "pc.h"
#include "i2c.h"
@@ -2128,7 +2129,11 @@
}
if (usb_enabled) {
- usb_ohci_init_pxa(0x4c000000, 3, -1, s->pic[PXA2XX_PIC_USBH1]);
+#ifdef TARGET_WORDS_BIGENDIAN
+ usb_ohci_init_pxa(0x4c000000, 3, -1, s->pic[PXA2XX_PIC_USBH1], 1);
+#else
+ usb_ohci_init_pxa(0x4c000000, 3, -1, s->pic[PXA2XX_PIC_USBH1], 0);
+#endif
}
s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000);
@@ -2247,7 +2252,11 @@
}
if (usb_enabled) {
- usb_ohci_init_pxa(0x4c000000, 3, -1, s->pic[PXA2XX_PIC_USBH1]);
+#ifdef TARGET_WORDS_BIGENDIAN
+ usb_ohci_init_pxa(0x4c000000, 3, -1, s->pic[PXA2XX_PIC_USBH1], 1);
+#else
+ usb_ohci_init_pxa(0x4c000000, 3, -1, s->pic[PXA2XX_PIC_USBH1], 0);
+#endif
}
s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000);
diff --git a/hw/realview.c b/hw/realview.c
index f786699..c102ddc 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -266,7 +266,11 @@
pic[48], pic[49], pic[50], pic[51], NULL);
pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci");
if (usb_enabled) {
- usb_ohci_init_pci(pci_bus, -1);
+#ifdef TARGET_WORDS_BIGENDIAN
+ usb_ohci_init_pci(pci_bus, -1, 1);
+#else
+ usb_ohci_init_pci(pci_bus, -1, 0);
+#endif
}
n = drive_get_max_bus(IF_SCSI);
while (n >= 0) {
diff --git a/hw/sm501.c b/hw/sm501.c
index 1a342bd..41ef3bf 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -1222,8 +1222,13 @@
0x1000, sm501_disp_ctrl_index);
/* bridge to usb host emulation module */
+#ifdef TARGET_WORDS_BIGENDIAN
usb_ohci_init_sm501(base + MMIO_BASE_OFFSET + SM501_USB_HOST, base,
- 2, -1, irq);
+ 2, -1, irq, 1);
+#else
+ usb_ohci_init_sm501(base + MMIO_BASE_OFFSET + SM501_USB_HOST, base,
+ 2, -1, irq, 0);
+#endif
/* bridge to serial emulation module */
if (chr) {
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index 5c5dc4a..93f7d79 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -30,7 +30,6 @@
#include "qemu-timer.h"
#include "usb.h"
#include "pci.h"
-#include "pxa.h"
#include "devices.h"
#include "usb-ohci.h"
@@ -1399,7 +1398,7 @@
return;
}
-static uint32_t ohci_mem_read(void *ptr, target_phys_addr_t addr)
+static uint32_t ohci_mem_read_le(void *ptr, target_phys_addr_t addr)
{
OHCIState *ohci = ptr;
uint32_t retval;
@@ -1516,21 +1515,22 @@
retval = 0xffffffff;
}
}
-
-#ifdef TARGET_WORDS_BIGENDIAN
- retval = bswap32(retval);
-#endif
return retval;
}
-static void ohci_mem_write(void *ptr, target_phys_addr_t addr, uint32_t val)
+static uint32_t ohci_mem_read_be(void *ptr, target_phys_addr_t addr)
+{
+ uint32_t retval;
+
+ retval = ohci_mem_read_le(ptr, addr);
+ retval = bswap32(retval);
+ return retval;
+}
+
+static void ohci_mem_write_le(void *ptr, target_phys_addr_t addr, uint32_t val)
{
OHCIState *ohci = ptr;
-#ifdef TARGET_WORDS_BIGENDIAN
- val = bswap32(val);
-#endif
-
/* Only aligned reads are allowed on OHCI */
if (addr & 3) {
fprintf(stderr, "usb-ohci: Mis-aligned write\n");
@@ -1647,24 +1647,43 @@
}
}
+static void ohci_mem_write_be(void *ptr, target_phys_addr_t addr, uint32_t val)
+{
+ val = bswap32(val);
+ ohci_mem_write_le(ptr, addr, val);
+}
+
/* Only dword reads are defined on OHCI register space */
-static CPUReadMemoryFunc * const ohci_readfn[3]={
- ohci_mem_read,
- ohci_mem_read,
- ohci_mem_read
+static CPUReadMemoryFunc * const ohci_readfn_be[3]={
+ ohci_mem_read_be,
+ ohci_mem_read_be,
+ ohci_mem_read_be
};
/* Only dword writes are defined on OHCI register space */
-static CPUWriteMemoryFunc * const ohci_writefn[3]={
- ohci_mem_write,
- ohci_mem_write,
- ohci_mem_write
+static CPUWriteMemoryFunc * const ohci_writefn_be[3]={
+ ohci_mem_write_be,
+ ohci_mem_write_be,
+ ohci_mem_write_be
+};
+
+static CPUReadMemoryFunc * const ohci_readfn_le[3]={
+ ohci_mem_read_le,
+ ohci_mem_read_le,
+ ohci_mem_read_le
+};
+
+static CPUWriteMemoryFunc * const ohci_writefn_le[3]={
+ ohci_mem_write_le,
+ ohci_mem_write_le,
+ ohci_mem_write_le
};
static void usb_ohci_init(OHCIState *ohci, DeviceState *dev,
int num_ports, int devfn,
qemu_irq irq, enum ohci_type type,
- const char *name, uint32_t localmem_base)
+ const char *name, uint32_t localmem_base,
+ int be)
{
int i;
@@ -1684,7 +1703,13 @@
usb_frame_time, usb_bit_time);
}
- ohci->mem = cpu_register_io_memory(ohci_readfn, ohci_writefn, ohci);
+ if (be) {
+ ohci->mem = cpu_register_io_memory(ohci_readfn_be, ohci_writefn_be,
+ ohci);
+ } else {
+ ohci->mem = cpu_register_io_memory(ohci_readfn_le, ohci_writefn_le,
+ ohci);
+ }
ohci->localmem_base = localmem_base;
ohci->name = name;
@@ -1704,6 +1729,7 @@
typedef struct {
PCIDevice pci_dev;
OHCIState state;
+ uint32_t be;
} OHCIPCIState;
static void ohci_mapfunc(PCIDevice *pci_dev, int i,
@@ -1728,7 +1754,7 @@
usb_ohci_init(&ohci->state, &dev->qdev, num_ports,
ohci->pci_dev.devfn, ohci->pci_dev.irq[0],
- OHCI_TYPE_PCI, ohci->pci_dev.name, 0);
+ OHCI_TYPE_PCI, ohci->pci_dev.name, 0, ohci->be);
/* TODO: avoid cast below by using dev */
pci_register_bar((struct PCIDevice *)ohci, 0, 256,
@@ -1736,29 +1762,33 @@
return 0;
}
-void usb_ohci_init_pci(struct PCIBus *bus, int devfn)
+void usb_ohci_init_pci(struct PCIBus *bus, int devfn, int be)
{
- pci_create_simple(bus, devfn, "pci-ohci");
+ PCIDevice *dev;
+
+ dev = pci_create(bus, devfn, "pci-ohci");
+ qdev_prop_set_uint32(&dev->qdev, "be", be);
+ qdev_init_nofail(&dev->qdev);
}
void usb_ohci_init_pxa(target_phys_addr_t base, int num_ports, int devfn,
- qemu_irq irq)
+ qemu_irq irq, int be)
{
OHCIState *ohci = (OHCIState *)qemu_mallocz(sizeof(OHCIState));
usb_ohci_init(ohci, NULL /* FIXME */, num_ports, devfn, irq,
- OHCI_TYPE_PXA, "OHCI USB", 0);
+ OHCI_TYPE_PXA, "OHCI USB", 0, be);
cpu_register_physical_memory(base, 0x1000, ohci->mem);
}
void usb_ohci_init_sm501(uint32_t mmio_base, uint32_t localmem_base,
- int num_ports, int devfn, qemu_irq irq)
+ int num_ports, int devfn, qemu_irq irq, int be)
{
OHCIState *ohci = (OHCIState *)qemu_mallocz(sizeof(OHCIState));
usb_ohci_init(ohci, NULL /* FIXME */, num_ports, devfn, irq,
- OHCI_TYPE_SM501, "OHCI USB", localmem_base);
+ OHCI_TYPE_SM501, "OHCI USB", localmem_base, be);
cpu_register_physical_memory(mmio_base, 0x1000, ohci->mem);
}
@@ -1768,6 +1798,10 @@
.qdev.desc = "Apple USB Controller",
.qdev.size = sizeof(OHCIPCIState),
.init = usb_ohci_initfn_pci,
+ .qdev.props = (Property[]) {
+ DEFINE_PROP_HEX32("be", OHCIPCIState, be, 0),
+ DEFINE_PROP_END_OF_LIST(),
+ }
};
static void ohci_register(void)
diff --git a/hw/usb-ohci.h b/hw/usb-ohci.h
index eefcef3..aadc365 100644
--- a/hw/usb-ohci.h
+++ b/hw/usb-ohci.h
@@ -3,7 +3,8 @@
#include "qemu-common.h"
-void usb_ohci_init_pci(struct PCIBus *bus, int devfn);
-
+void usb_ohci_init_pci(struct PCIBus *bus, int devfn, int be);
+void usb_ohci_init_pxa(target_phys_addr_t base, int num_ports, int devfn,
+ qemu_irq irq, int be);
#endif
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 391f5b8..a962106 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -218,7 +218,11 @@
}
}
if (usb_enabled) {
- usb_ohci_init_pci(pci_bus, -1);
+#ifdef TARGET_WORDS_BIGENDIAN
+ usb_ohci_init_pci(pci_bus, -1, 1);
+#else
+ usb_ohci_init_pci(pci_bus, -1, 0);
+#endif
}
n = drive_get_max_bus(IF_SCSI);
while (n >= 0) {
