Re: [patch] 2.3.30pre6 alpha updates

[Richard Henderson]

On Mon, Dec 06, 1999 at 12:09:27AM +0100, Andrea Arcangeli wrote:
> In the meantime I suggest to keep the 2.2.x way so people will just run
> 2.3.30 fine ;). We can fix this without forbidding people to run the 2.3.x
> tree fine.

Try this instead of hacking up the generic pci code unnecessarily.


r~



--- sys_dp264.c.orig    Sun Dec  5 23:29:46 1999
+++ sys_dp264.c Sun Dec  5 23:40:02 1999
@@ -274,8 +274,19 @@ dp264_map_irq(struct pci_dev *dev, u8 sl
        struct pci_controler *hose = dev->sysdata;
        int irq = COMMON_TABLE_LOOKUP;
 
-       if (irq > 0)
+       if (irq > 0) {
                irq += 16 * hose->index;
+       } else {
+               /* ??? The Contaq IDE controler on the ISA bridge uses
+                  "legacy" interrupts 14 and 15.  I don't know if anything
+                  can wind up at the same slot+pin on hose1, so we'll
+                  just have to trust whatever value the console might
+                  have assigned.  */
+
+               u8 irq8;
+               pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq8);
+               irq = irq8;
+       }
 
        return irq;
 }