commit 80b3ada7dd56088613a446934d144a747e740fa1
author pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Sep 24 17:01:44 2006 +0000
committer pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Sep 24 17:01:44 2006 +0000
tree 3dc8bf29b3bee0c06772b56e5add4a7d5df2de23
parent d2b5931756fdb9f839180e33898cd1e3e4fbdc90

Implement sun4u PCI IRQ routing.
Allow multiple PCI busses and PCI-PCI bridges.
Fix bugs in Versatile PCI implementation.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2166 c046a42c-6fe2-441c-8c8c-71466251a162

hw/versatile_pci.c

diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c
index 9addda8..32854c2 100644
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -11,7 +11,7 @@
 
 static inline uint32_t vpb_pci_config_addr(target_phys_addr_t addr)
 {
-    return addr & 0xf8ff;
+    return addr & 0xffffff;
 }
 
 static void pci_vpb_config_writeb (void *opaque, target_phys_addr_t addr,
@@ -105,15 +105,15 @@
         base = 0x40000000;
         name = "Versatile/PB PCI Controller";
     }
-    s = pci_register_bus(pci_vpb_set_irq, pci_vpb_map_irq, pic, 11 << 3);
+    s = pci_register_bus(pci_vpb_set_irq, pci_vpb_map_irq, pic, 11 << 3, 4);
     /* ??? Register memory space.  */
 
     mem_config = cpu_register_io_memory(0, pci_vpb_config_read,
                                         pci_vpb_config_write, s);
     /* Selfconfig area.  */
-    cpu_register_physical_memory(base + 0x01000000, 0x10000, mem_config);
+    cpu_register_physical_memory(base + 0x01000000, 0x1000000, mem_config);
     /* Normal config area.  */
-    cpu_register_physical_memory(base + 0x02000000, 0x10000, mem_config);
+    cpu_register_physical_memory(base + 0x02000000, 0x1000000, mem_config);
 
     d = pci_register_device(s, name, sizeof(PCIDevice), -1, NULL, NULL);