diff options
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ehci_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/ohci_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/uhci_pci.c | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c index 37142c9..1bfa013 100644 --- a/sys/dev/usb/ehci_pci.c +++ b/sys/dev/usb/ehci_pci.c @@ -163,8 +163,8 @@ ehci_pci_attach(device_t self) pci_enable_busmaster(self); rid = PCI_CBMEM; - sc->io_res = bus_alloc_resource(self, SYS_RES_MEMORY, &rid, - 0, ~0, 1, RF_ACTIVE); + sc->io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, + RF_ACTIVE); if (!sc->io_res) { device_printf(self, "Could not map memory\n"); return ENXIO; @@ -173,7 +173,7 @@ ehci_pci_attach(device_t self) sc->ioh = rman_get_bushandle(sc->io_res); rid = 0; - sc->irq_res = bus_alloc_resource(self, SYS_RES_IRQ, &rid, 0, ~0, 1, + sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); if (sc->irq_res == NULL) { device_printf(self, "Could not allocate irq\n"); diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c index 558c440..0aa9f5d 100644 --- a/sys/dev/usb/ohci_pci.c +++ b/sys/dev/usb/ohci_pci.c @@ -221,8 +221,8 @@ ohci_pci_attach(device_t self) pci_enable_busmaster(self); rid = PCI_CBMEM; - sc->io_res = bus_alloc_resource(self, SYS_RES_MEMORY, &rid, - 0, ~0, 1, RF_ACTIVE); + sc->io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, + RF_ACTIVE); if (!sc->io_res) { device_printf(self, "Could not map memory\n"); return ENXIO; @@ -231,7 +231,7 @@ ohci_pci_attach(device_t self) sc->ioh = rman_get_bushandle(sc->io_res); rid = 0; - sc->irq_res = bus_alloc_resource(self, SYS_RES_IRQ, &rid, 0, ~0, 1, + sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); if (sc->irq_res == NULL) { device_printf(self, "Could not allocate irq\n"); diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c index b263201..f2946ab 100644 --- a/sys/dev/usb/uhci_pci.c +++ b/sys/dev/usb/uhci_pci.c @@ -251,8 +251,8 @@ uhci_pci_attach(device_t self) pci_enable_busmaster(self); rid = PCI_UHCI_BASE_REG; - sc->io_res = bus_alloc_resource(self, SYS_RES_IOPORT, &rid, - 0, ~0, 1, RF_ACTIVE); + sc->io_res = bus_alloc_resource_any(self, SYS_RES_IOPORT, &rid, + RF_ACTIVE); if (!sc->io_res) { device_printf(self, "Could not map ports\n"); return ENXIO; @@ -264,8 +264,7 @@ uhci_pci_attach(device_t self) bus_space_write_2(sc->iot, sc->ioh, UHCI_INTR, 0); rid = 0; - sc->irq_res = bus_alloc_resource(self, SYS_RES_IRQ, &rid, - 0, ~0, 1, + sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); if (sc->irq_res == NULL) { device_printf(self, "Could not allocate irq\n"); |
