diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2000-09-02 10:17:58 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2000-09-02 10:17:58 +0000 |
| commit | 827cc0ab25a9a244dd59685b3226dea1c12e260d (patch) | |
| tree | 69592e210d72f9abf8b2dbd8dd8bc08f0e906818 | |
| parent | 7e0b05fa532afe0d8c42ab1cacd9b746e176e688 (diff) | |
| download | FreeBSD-src-827cc0ab25a9a244dd59685b3226dea1c12e260d.zip FreeBSD-src-827cc0ab25a9a244dd59685b3226dea1c12e260d.tar.gz | |
Don't check for ohci/uhci to be loaded, check for the usb module.
| -rw-r--r-- | sys/dev/usb/usb.h | 5 | ||||
| -rw-r--r-- | usr.sbin/usbd/usbd.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index 71d903b..8982a4f 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -65,9 +65,8 @@ MALLOC_DECLARE(M_USBHC); #endif /* __FreeBSD__ */ /* these three defines are used by usbd to autoload the usb kld */ -#define USB_KLD "usb" -#define USB_OHCI "ohci/usb" -#define USB_UHCI "uhci/usb" +#define USB_KLD "usb" /* name of usb module */ +#define USB_UHUB "usb/uhub" /* root hub */ #define USB_MAX_DEVICES 128 #define USB_START_ADDR 0 diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c index ecf1001..033c22c 100644 --- a/usr.sbin/usbd/usbd.c +++ b/usr.sbin/usbd/usbd.c @@ -902,9 +902,8 @@ main(int argc, char **argv) int itimeout = TIMEOUT; /* timeout for select */ struct timeval tv; - if (modfind(USB_OHCI) < 0 && modfind(USB_UHCI) < 0) { - if (kldload(USB_KLD) < 0 || - (modfind(USB_OHCI) < 0 && modfind(USB_UHCI) < 0)) { + if (modfind(USB_UHUB) < 0) { + if (kldload(USB_KLD) < 0 || modfind(USB_UHUB) < 0) { perror(USB_KLD ": Kernel module not available"); return 1; } |
