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
This commit is contained in:
Nick Sayer 2000-12-03 17:07:19 +00:00
parent 48a1ef2284
commit 305501d329
4 changed files with 0 additions and 40 deletions

View File

@ -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;

View File

@ -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);

View File

@ -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;

View File

@ -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);