merge fallout

diff --git a/hw/beagle.c b/hw/beagle.c
index 613d1c2..3e91935 100644 (file)
--- a/hw/beagle.c
+++ b/hw/beagle.c
@@ -82,6 +82,6 @@ QEMUMachine beagle_machine = {
     .name =        "beagle",
     .desc =        "Beagle board (OMAP3530)",
     .init =        beagle_init,
-    .ram_require = OMAP3XXX_SRAM_SIZE + OMAP3XXX_BOOTROM_SIZE,
+/*    .ram_require = OMAP3XXX_SRAM_SIZE + OMAP3XXX_BOOTROM_SIZE, */
 };
 

diff --git a/hw/omap.h b/hw/omap.h
index 41fef42..09ea052 100644 (file)
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -1020,7 +1020,7 @@ struct omap3_hsusb_s *omap3_hsusb_init(struct omap_target_agent_s *otg_ta,
                                        qemu_irq tll_irq);
 
 /* usb-ohci.c */
-int usb_ohci_init_omap(target_phys_addr_t base, uint32_t region_size,
+void usb_ohci_init_omap(target_phys_addr_t base, uint32_t region_size,
                        int num_ports, qemu_irq irq);
 
 

diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index f445ae0..279e82e 100644 (file)
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -63,7 +63,7 @@ typedef struct OHCIPort {
 enum ohci_type {
     OHCI_TYPE_PCI,
     OHCI_TYPE_PXA,
-    OHCI_TYPE_OMAP
+    OHCI_TYPE_OMAP,
     OHCI_TYPE_SM501,
 };
 
@@ -1749,13 +1749,14 @@ void usb_ohci_init_pxa(target_phys_addr_t base, int num_ports, int devfn,
     cpu_register_physical_memory(base, 0x1000, ohci->mem);
 }
 
-int usb_ohci_init_omap(target_phys_addr_t base, uint32_t region_size,
+void usb_ohci_init_omap(target_phys_addr_t base, uint32_t region_size,
                        int num_ports, qemu_irq irq)
 {
     OHCIState *ohci = (OHCIState *)qemu_mallocz(sizeof(OHCIState));
     
-    usb_ohci_init(ohci, num_ports, -1, irq, OHCI_TYPE_OMAP, "OHCI USB");
-    return ohci->mem;
+    usb_ohci_init(ohci, num_ports, -1, irq, OHCI_TYPE_OMAP, "OHCI USB" ,0);
+
+    cpu_register_physical_memory(base, 0x1000, ohci->mem);
 }
 
 void usb_ohci_init_sm501(uint32_t mmio_base, uint32_t localmem_base,