1) Remove the definition of usb_cdc_generic_descriptor_t. It is

equivalent to usb_descriptor_t

2) Rename USB_CDC_CM_CM_OVER_DATA to USB_CDC_CM_OVER_DATA

1 files changed, 1 insertions, 7 deletions

diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index df7484a..5187a4a 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -64,12 +64,6 @@ typedef struct {
 	uByte		bLength;
 	uByte		bDescriptorType;
 	uByte		bDescriptorSubtype;
-} usb_cdc_generic_descriptor_t;
-
-typedef struct {
-	uByte		bLength;
-	uByte		bDescriptorType;
-	uByte		bDescriptorSubtype;
 	uWord		bcdCDC;
 } usb_cdc_header_descriptor_t;
 
@@ -79,7 +73,7 @@ typedef struct {
 	uByte		bDescriptorSubtype;
 	uByte		bmCapabilities;
 #define USB_CDC_CM_DOES_CM		0x01
-#define USB_CDC_CM_CM_OVER_DATA		0x02
+#define USB_CDC_CM_OVER_DATA		0x02
 	uByte		bDataInterface;
 } usb_cdc_cm_descriptor_t;