Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/usb.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/usb.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.65.8.2
retrieving revision 1.66
diff -u -p -r1.65.8.2 -r1.66
--- src/sys/dev/usb/usb.h	2002/08/29 05:23:00	1.65.8.2
+++ src/sys/dev/usb/usb.h	2002/07/11 21:14:34	1.66
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.h,v 1.65.8.2 2002/08/29 05:23:00 gehenna Exp $	*/
+/*	$NetBSD: usb.h,v 1.66 2002/07/11 21:14:34 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $	*/
 
 /*
@@ -389,18 +389,15 @@ typedef struct {
 } UPACKED usb_port_status_t;
 
 /* Device class codes */
-#define UDCLASS_IN_INTERFACE	0x00
+#define UDCLASS_AUDIO		0x00
 #define UDCLASS_COMM		0x02
+#define UDCLASS_HID		0x00
 #define UDCLASS_HUB		0x09
-#define  UDSUBCLASS_HUB		0x00
-#define  UDPROTO_FSHUB		0x00
-#define  UDPROTO_HSHUBSTT	0x01
-#define  UDPROTO_HSHUBMTT	0x02
-#define UDCLASS_DIAGNOSTIC	0xdc
-#define UDCLASS_WIRELESS	0xe0
-#define  UDSUBCLASS_RF		0x01
-#define   UDPROTO_BLUETOOTH	0x01
-#define UDCLASS_VENDOR		0xff
+#define  UDSUBCLASS_HUB		0
+#define  UDPROTO_FSHUB		0
+#define  UDPROTO_HSHUBSTT	1
+#define  UDPROTO_HSHUBMTT	2
+#define UDCLASS_MASS		0x00
 
 /* Interface class codes */
 #define UICLASS_UNSPEC		0x00
@@ -426,8 +423,6 @@ typedef struct {
 
 #define UICLASS_PHYSICAL	0x05
 
-#define UICLASS_IMAGE		0x06
-
 #define UICLASS_PRINTER		0x07
 #define  UISUBCLASS_PRINTER	1
 #define  UIPROTO_PRINTER_UNI	1
@@ -468,17 +463,7 @@ typedef struct {
 #define   UIPROTO_DATA_PUF		0xfe    /* see Prot. Unit Func. Desc.*/
 #define   UIPROTO_DATA_VENDOR		0xff    /* Vendor specific */
 
-#define UICLASS_SMARTCARD	0x0b
-
-/*#define UICLASS_FIRM_UPD	0x0c*/
-
-#define UICLASS_SECURITY	0x0d
-
-#define UICLASS_DIAGNOSTIC	0xdc
-
-#define UICLASS_WIRELESS	0xe0
-#define  UISUBCLASS_RF			0x01
-#define   UIPROTO_BLUETOOTH		0x01
+#define UICLASS_FIRM_UPD	0x0c
 
 #define UICLASS_APPL_SPEC	0xfe
 #define  UISUBCLASS_FIRMWARE_DOWNLOAD	1