michaelh/zephyr
1
0
Fork 0
Code Releases Activity

usb: Remove duplicated CDC_ECM_SUBCLASS definition

Browse source 
Use ECM_SUBCLASS instead.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2018-04-04 12:41:45 +03:00 • committed by Anas Nashif
commit 4291fb67a3
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/usb/usb_common.h
View file

@ -104,7 +104,6 @@
/* Sub-classes */ /* Sub-classes */
#define ACM_SUBCLASS 0x02 #define ACM_SUBCLASS 0x02
#define CDC_ECM_SUBCLASS 0x06
#define CDC_NCM_SUBCLASS 0x0d #define CDC_NCM_SUBCLASS 0x0d
#define BOOT_INTERFACE_SUBCLASS 0x01 #define BOOT_INTERFACE_SUBCLASS 0x01
#define SCSI_TRANSPARENT_SUBCLASS 0x06 #define SCSI_TRANSPARENT_SUBCLASS 0x06

6
subsys/usb/usb_descriptor.c
View file

@ -411,7 +411,7 @@ static struct dev_common_descriptor common_desc = {
.bFirstInterface = FIRST_IFACE_CDC_ECM, .bFirstInterface = FIRST_IFACE_CDC_ECM,
.bInterfaceCount = 0x02, .bInterfaceCount = 0x02,
.bFunctionClass = COMMUNICATION_DEVICE_CLASS, .bFunctionClass = COMMUNICATION_DEVICE_CLASS,
.bFunctionSubClass = CDC_ECM_SUBCLASS, .bFunctionSubClass = ECM_SUBCLASS,
.bFunctionProtocol = 0, .bFunctionProtocol = 0,
.iFunction = 0, .iFunction = 0,
}, },
@ -426,7 +426,7 @@ static struct dev_common_descriptor common_desc = {
.bAlternateSetting = 0, .bAlternateSetting = 0,
.bNumEndpoints = 1, .bNumEndpoints = 1,
.bInterfaceClass = COMMUNICATION_DEVICE_CLASS, .bInterfaceClass = COMMUNICATION_DEVICE_CLASS,
.bInterfaceSubClass = CDC_ECM_SUBCLASS, .bInterfaceSubClass = ECM_SUBCLASS,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.iInterface = 0, .iInterface = 0,
}, },
@ -491,7 +491,7 @@ static struct dev_common_descriptor common_desc = {
.bAlternateSetting = 1, .bAlternateSetting = 1,
.bNumEndpoints = 2, .bNumEndpoints = 2,
.bInterfaceClass = COMMUNICATION_DEVICE_CLASS_DATA, .bInterfaceClass = COMMUNICATION_DEVICE_CLASS_DATA,
.bInterfaceSubClass = CDC_ECM_SUBCLASS, .bInterfaceSubClass = ECM_SUBCLASS,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.iInterface = 0, .iInterface = 0,
}, },