diff options
| author | joe <joe@FreeBSD.org> | 2002-02-26 01:15:08 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-02-26 01:15:08 +0000 |
| commit | 1f5739bd13d33baa13b3feb2c57b1736ca7c0641 (patch) | |
| tree | 7c7067063eb0c393f750ca2100b972dcabae5bb7 /sys/dev | |
| parent | 3f12466c8d9d0889a2a539e50cf9f656012a466d (diff) | |
| download | FreeBSD-src-1f5739bd13d33baa13b3feb2c57b1736ca7c0641.zip FreeBSD-src-1f5739bd13d33baa13b3feb2c57b1736ca7c0641.tar.gz | |
Merge from NetBSD:
usb.h (rev 1.61):
date: 2002/01/01 14:23:37; author: augustss;
Add a missing subclass definition.
usb.h (rev 1.63) and usb_port.h (rev 1.52):
date: 2002/02/25 00:46:37; author: augustss;
Some portability improvement.
Add define for usb.h version.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/usb.h | 20 | ||||
| -rw-r--r-- | sys/dev/usb/usb_port.h | 9 |
2 files changed, 13 insertions, 16 deletions
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index b300dd7..dacae62 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -1,4 +1,4 @@ -/* $NetBSD: usb/usb.h,v 1.60 2001/12/29 15:44:11 augustss Exp $ */ +/* $NetBSD: usb.h,v 1.63 2002/02/25 00:46:37 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -47,26 +47,13 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) #include <sys/ioctl.h> +#endif #if defined(_KERNEL) #include <dev/usb/usb_port.h> #endif /* _KERNEL */ -#elif defined(__FreeBSD__) -#if defined(_KERNEL) -#include <sys/malloc.h> - -MALLOC_DECLARE(M_USB); -MALLOC_DECLARE(M_USBDEV); -MALLOC_DECLARE(M_USBHC); - -#include <dev/usb/usb_port.h> -#endif /* _KERNEL */ -#endif /* __FreeBSD__ */ - -/* these three defines are used by usbd to autoload the usb kld */ -#define USB_KLD "usb" /* name of usb module */ -#define USB_UHUB "usb/uhub" /* root hub */ +#define USB_STACK_VERSION 2 #define USB_MAX_DEVICES 128 #define USB_START_ADDR 0 @@ -474,6 +461,7 @@ typedef struct { #define UICLASS_FIRM_UPD 0x0c #define UICLASS_APPL_SPEC 0xfe +#define UISUBCLASS_FIRMWARE_DOWNLOAD 1 #define UISUBCLASS_IRDA 2 #define UIPROTO_IRDA 0 diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index e2ac72f..642b439 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -284,6 +284,15 @@ __CONCAT(dname,_detach)(self, flags) \ #include "opt_usb.h" +#if defined(_KERNEL) +#include <sys/malloc.h> + +MALLOC_DECLARE(M_USB); +MALLOC_DECLARE(M_USBDEV); +MALLOC_DECLARE(M_USBHC); + +#endif + #define USBVERBOSE #define Static static |
