We now have the ability to assign the correct IRQ when PNP-OS is turned

on. So stop failing the attach if the IRQ is unassigned. With this
patch, I can now boot with PNP-OS YES in my BIOS no differently than
PNP-OS NO (which is a good thing since Windows hangs with PNP-OS NO).

Obtained from:	msmith

4 files changed, 0 insertions, 40 deletions

diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c
index 9806063..68a186b 100644
--- a/sys/dev/usb/ohci_pci.c
+++ b/sys/dev/usb/ohci_pci.c
@@ -154,16 +154,6 @@ ohci_pci_attach(device_t self)
 	int rid;
 	int intr;
 
-	/* For the moment, put in a message stating what is wrong */
-	intr = pci_read_config(self, PCIR_INTLINE, 1);
-	if (intr == 0 || intr == 255) {
-		device_printf(self, "Invalid irq %d\n", intr);
-#ifdef __i386__
-		device_printf(self, "Please switch on USB support and switch PNP-OS to 'No' in BIOS\n");
-#endif
-		return ENXIO;
-	}
-
 	/* XXX where does it say so in the spec? */
 	sc->sc_bus.usbrev = USBREV_1_0;
 
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index 003a415..d3dfa09 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -175,16 +175,6 @@ uhci_pci_attach(device_t self)
 	int intr;
 	int err;
 
-	/* For the moment, put in a message stating what is wrong */
-	intr = pci_read_config(self, PCIR_INTLINE, 1);
-	if (intr == 0 || intr == 255) {
-		device_printf(self, "Invalid irq %d\n", intr);
-#ifdef __i386__
-		device_printf(self, "Please switch on USB support and switch PNP-OS to 'No' in BIOS\n");
-#endif
-		return ENXIO;
-	}
-
 	rid = PCI_UHCI_BASE_REG;
 	sc->io_res = bus_alloc_resource(self, SYS_RES_IOPORT, &rid,
 					0, ~0, 1, RF_ACTIVE);
diff --git a/sys/pci/ohci_pci.c b/sys/pci/ohci_pci.c
index 9806063..68a186b 100644
--- a/sys/pci/ohci_pci.c
+++ b/sys/pci/ohci_pci.c
@@ -154,16 +154,6 @@ ohci_pci_attach(device_t self)
 	int rid;
 	int intr;
 
-	/* For the moment, put in a message stating what is wrong */
-	intr = pci_read_config(self, PCIR_INTLINE, 1);
-	if (intr == 0 || intr == 255) {
-		device_printf(self, "Invalid irq %d\n", intr);
-#ifdef __i386__
-		device_printf(self, "Please switch on USB support and switch PNP-OS to 'No' in BIOS\n");
-#endif
-		return ENXIO;
-	}
-
 	/* XXX where does it say so in the spec? */
 	sc->sc_bus.usbrev = USBREV_1_0;
 
diff --git a/sys/pci/uhci_pci.c b/sys/pci/uhci_pci.c
index 003a415..d3dfa09 100644
--- a/sys/pci/uhci_pci.c
+++ b/sys/pci/uhci_pci.c
@@ -175,16 +175,6 @@ uhci_pci_attach(device_t self)
 	int intr;
 	int err;
 
-	/* For the moment, put in a message stating what is wrong */
-	intr = pci_read_config(self, PCIR_INTLINE, 1);
-	if (intr == 0 || intr == 255) {
-		device_printf(self, "Invalid irq %d\n", intr);
-#ifdef __i386__
-		device_printf(self, "Please switch on USB support and switch PNP-OS to 'No' in BIOS\n");
-#endif
-		return ENXIO;
-	}
-
 	rid = PCI_UHCI_BASE_REG;
 	sc->io_res = bus_alloc_resource(self, SYS_RES_IOPORT, &rid,
 					0, ~0, 1, RF_ACTIVE);