diff options
| author | imp <imp@FreeBSD.org> | 2007-06-21 14:42:34 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2007-06-21 14:42:34 +0000 |
| commit | d4fd7053d478e89ca3be425ced1a36ebf68d553e (patch) | |
| tree | ed0dd4914af2fd4bc48d4d26d7e7b701359acf47 /sys/dev/usb/uhci_pci.c | |
| parent | ac6798a72c8fe23cdd0de3feb6488518edba738c (diff) | |
| download | FreeBSD-src-d4fd7053d478e89ca3be425ced1a36ebf68d553e.zip FreeBSD-src-d4fd7053d478e89ca3be425ced1a36ebf68d553e.tar.gz | |
Latest round of usb cleanups:
o Consistently use device_foo_t and bus_foo_t for functions implementing
device_foo and bus_foo respectively. Adjust those routines that were wrong
(we should do this throughout the tree).
o make all the modules depend on usb. Otherwise these modules won't
load.
o ucycom doesn't need usb_port.h
o Minor unifdefing
o uhub, umass, ums, urio, uscanner conversion complete.
o ukbd: Remove the NO_SET_PROTO quirk (fixes a PR 77940). NetBSD removed
their check and setting the proto a long time ago.
o umodem panic fixed. UQ_ASSUME_CM_OVER_DATA quirk removed because I've never
seen a umodem that needed this rejection for proection (this gets rid of
~20% of the quirks).
Approved by: re@ (kensmith)
PR: 77940
Diffstat (limited to 'sys/dev/usb/uhci_pci.c')
| -rw-r--r-- | sys/dev/usb/uhci_pci.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c index dd4af7f..6c880a5 100644 --- a/sys/dev/usb/uhci_pci.c +++ b/sys/dev/usb/uhci_pci.c @@ -58,13 +58,11 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/bus.h> #include <sys/queue.h> -#if defined(__FreeBSD__) #include <sys/bus.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> -#endif #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -155,11 +153,10 @@ static const char *uhci_device_generic = "UHCI (generic) USB controller"; #define PCI_UHCI_BASE_REG 0x20 -static int uhci_pci_attach(device_t self); -static int uhci_pci_detach(device_t self); -static int uhci_pci_suspend(device_t self); -static int uhci_pci_resume(device_t self); - +static device_attach_t uhci_pci_attach; +static device_detach_t uhci_pci_detach; +static device_suspend_t uhci_pci_suspend; +static device_resume_t uhci_pci_resume; static int uhci_pci_suspend(device_t self) |
