PCI and IRQ rework, pci.c rewritten from ground up, fixes numerous issues such as the bridge being added when the number of normal PCI devices equals the number of normal PCI slots, Windows 95 PCI operation on Intel 430NX, sharing of PCI IRQ's with non-PCI level-triggered devices, having both configuration mechanisms operating at the same time (ALi M1435), etc., and makes the code much more readable.

src/scsi/scsi_buslogic.c

@@ -1748,7 +1748,7 @@ buslogic_init(const device_t *info)
     }
 
     if (bl->chip == CHIP_BUSLOGIC_PCI_958D_1995_12_30) {
-        dev->pci_slot = pci_add_card(PCI_ADD_NORMAL, BuslogicPCIRead, BuslogicPCIWrite, dev);
+        pci_add_card(PCI_ADD_NORMAL, BuslogicPCIRead, BuslogicPCIWrite, dev, &dev->pci_slot);
 
         buslogic_pci_bar[0].addr_regs[0] = 1;
         buslogic_pci_bar[1].addr_regs[0] = 0;

src/scsi/scsi_ncr53c8xx.c

@@ -234,6 +234,7 @@ typedef struct ncr53c8xx_t {
     int waiting;
 
     uint8_t current_lun;
+    uint8_t irq_state;
 
     uint8_t istat;
     uint8_t dcmd;
@@ -498,10 +499,10 @@ static void
 do_irq(ncr53c8xx_t *dev, int level)
 {
     if (level) {
-        pci_set_irq(dev->pci_slot, PCI_INTA);
+        pci_set_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
         ncr53c8xx_log("Raising IRQ...\n");
     } else {
-        pci_clear_irq(dev->pci_slot, PCI_INTA);
+        pci_clear_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
         ncr53c8xx_log("Lowering IRQ...\n");
     }
 }
@@ -534,12 +535,16 @@ ncr53c8xx_update_irq(ncr53c8xx_t *dev)
         level = 1;
     }
 
+#ifdef STATE_KEEPING
     if (level != dev->last_level) {
+#endif
         ncr53c8xx_log("Update IRQ level %d dstat %02x sist %02x%02x\n",
                       level, dev->dstat, dev->sist1, dev->sist0);
         dev->last_level = level;
         do_irq(dev, level); /* Only do something with the IRQ if the new level differs from the previous one. */
+#ifdef STATE_KEEPING
     }
+#endif
 }
 
 /* Stop SCRIPTS execution and raise a SCSI interrupt.  */
@@ -2552,9 +2557,9 @@ ncr53c8xx_init(const device_t *info)
         dev->has_bios = 0;
 
     if (info->local & 0x8000)
-        dev->pci_slot = pci_add_card(PCI_ADD_SCSI, ncr53c8xx_pci_read, ncr53c8xx_pci_write, dev);
+        pci_add_card(PCI_ADD_SCSI, ncr53c8xx_pci_read, ncr53c8xx_pci_write, dev, &dev->pci_slot);
     else
-        dev->pci_slot = pci_add_card(PCI_ADD_NORMAL, ncr53c8xx_pci_read, ncr53c8xx_pci_write, dev);
+        pci_add_card(PCI_ADD_NORMAL, ncr53c8xx_pci_read, ncr53c8xx_pci_write, dev, &dev->pci_slot);
 
     if (dev->chip == CHIP_875) {
         dev->chip_rev = 0x04;

src/scsi/scsi_pcscsi.c

@@ -197,6 +197,7 @@ typedef struct esp_t {
         int     pos;
     } dma_86c01;
 
+    uint8_t irq_state;
     uint8_t pos_regs[8];
 } esp_t;
 
@@ -247,10 +248,10 @@ esp_irq(esp_t *dev, int level)
         }
     } else {
         if (level) {
-            pci_set_irq(dev->pci_slot, PCI_INTA);
+            pci_set_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
             esp_log("Raising IRQ...\n");
         } else {
-            pci_clear_irq(dev->pci_slot, PCI_INTA);
+            pci_clear_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
             esp_log("Lowering IRQ...\n");
         }
     }
@@ -1842,7 +1843,7 @@ dc390_init(UNUSED(const device_t *info))
     dev->PCIBase  = 0;
     dev->MMIOBase = 0;
 
-    dev->pci_slot = pci_add_card(PCI_ADD_NORMAL, esp_pci_read, esp_pci_write, dev);
+    pci_add_card(PCI_ADD_NORMAL, esp_pci_read, esp_pci_write, dev, &dev->pci_slot);
 
     esp_pci_bar[0].addr_regs[0] = 1;
     esp_pci_regs[0x04]          = 3;

src/scsi/scsi_x54x.c

@@ -83,23 +83,27 @@ x54x_irq(x54x_t *dev, int set)
     if (dev->card_bus & DEVICE_PCI) {
         x54x_log("PCI IRQ: %02X, PCI_INTA\n", dev->pci_slot);
         if (set)
-            pci_set_irq(dev->pci_slot, PCI_INTA);
+            pci_set_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
         else
-            pci_clear_irq(dev->pci_slot, PCI_INTA);
+            pci_clear_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
     } else {
         x54x_log("%sing IRQ %i\n", set ? "Rais" : "Lower", irq);
 
-        if (set) {
-            if (dev->interrupt_type)
-                int_type = dev->interrupt_type(dev);
+        if (dev->interrupt_type)
+            int_type = dev->interrupt_type(dev);
 
+        if (set) {
             if (int_type)
-                picintlevel(1 << irq);
+                picintlevel(1 << irq, &dev->irq_state);
             else
                 picint(1 << irq);
-        } else
-            picintc(1 << irq);
-    }
+        } else {
+            if (int_type)
+                picintclevel(1 << irq, &dev->irq_state);
+            else
+                picintc(1 << irq);
+        }
+    }    
 }
 
 static void
@@ -1415,6 +1419,7 @@ static void
 x54x_reset(x54x_t *dev)
 {
     clear_irq(dev);
+    dev->irq_state = 0;
     if (dev->flags & X54X_INT_GEOM_WRITABLE)
         dev->Geometry = 0x90;
     else