X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=hw%2Fversatile_pci.c;h=68f18ef3f889078eac515c28f383fb6514c5ef4e;hb=cd346349b45ef056f138a184f660b8c34c3213cc;hp=aac61c7b554c6a3ff178bff39c7fe4d78680e39f;hpb=e69954b9fc698996c8416a2fb26c6b50ad9f49a9;p=qemu

diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c
index aac61c7..68f18ef 100644
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * ARM Versatile/PB PCI host controller
  *
  * Copyright (c) 2006 CodeSourcery.
@@ -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,
@@ -79,12 +79,17 @@ static CPUReadMemoryFunc *pci_vpb_config_read[] = {
 
 static int pci_vpb_irq;
 
-static void pci_vpb_set_irq(PCIDevice *d, void *pic, int irq_num, int level)
+static int pci_vpb_map_irq(PCIDevice *d, int irq_num)
 {
-    pic_set_irq_new(pic, pci_vpb_irq + irq_num, level);
+    return irq_num;
 }
 
-PCIBus *pci_vpb_init(void *pic, int irq, int realview)
+static void pci_vpb_set_irq(qemu_irq *pic, int irq_num, int level)
+{
+    qemu_set_irq(pic[pci_vpb_irq + irq_num], level);
+}
+
+PCIBus *pci_vpb_init(qemu_irq *pic, int irq, int realview)
 {
     PCIBus *s;
     PCIDevice *d;
@@ -100,15 +105,15 @@ PCIBus *pci_vpb_init(void *pic, int irq, int realview)
         base = 0x40000000;
         name = "Versatile/PB PCI Controller";
     }
-    s = pci_register_bus(pci_vpb_set_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);