diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-11-25 20:50:43 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-11-25 20:50:43 +0000 |
| commit | 4a162c052d7f5406eff93d5b119cb7a27f8edc47 (patch) | |
| tree | 3ebb1424c185382aecce6a98c6d6713fc47bea42 /sys/dev/usb/controller | |
| parent | 0960dfee41a0d4a8397a5ae182649588b7deeba8 (diff) | |
| download | FreeBSD-src-4a162c052d7f5406eff93d5b119cb7a27f8edc47.zip FreeBSD-src-4a162c052d7f5406eff93d5b119cb7a27f8edc47.tar.gz | |
Disable interrupts after doing early takeover of the usb controller in case usb
isnt actually compiled in (or kldloaded) as the controller could cause spurious
interrupts.
Tested by: Florian Smeets
Diffstat (limited to 'sys/dev/usb/controller')
| -rw-r--r-- | sys/dev/usb/controller/uhci_pci.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/controller/uhcireg.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index 3956ead..7609b0f 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -88,8 +88,6 @@ __FBSDID("$FreeBSD$"); /* PIIX4E has no separate stepping */ -#define PCI_UHCI_BASE_REG 0x20 - static device_probe_t uhci_pci_probe; static device_attach_t uhci_pci_attach; static device_detach_t uhci_pci_detach; diff --git a/sys/dev/usb/controller/uhcireg.h b/sys/dev/usb/controller/uhcireg.h index eeabbf0..993b73c 100644 --- a/sys/dev/usb/controller/uhcireg.h +++ b/sys/dev/usb/controller/uhcireg.h @@ -39,6 +39,8 @@ #ifndef _UHCIREG_H_ #define _UHCIREG_H_ +#define PCI_UHCI_BASE_REG 0x20 + /* PCI config registers */ #define PCI_USBREV 0x60 /* USB protocol revision */ #define PCI_USB_REV_MASK 0xff |
