michaelh/zephyr
1
0
Fork 0
Code Releases Activity

usb: Rename defines to match present naming convention

Browse source 
This commit renames two defines:
CS_INTERFACE -> USB_CS_INTERFACE_DESC
CS_ENDPOINT -> USB_CS_ENDPOINT_DESC
in order to match current naming convention when it comes
to descriptors fields.

All relevant files are updated to match renamed macros.

Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>
This commit is contained in:
Emil Obalski 2019-11-29 09:08:46 +01:00 • committed by Anas Nashif
commit 85a08da966
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/usb/usb_common.h
View file

@ -71,8 +71,8 @@
#define USB_DEVICE_CAPABILITY_DESC 0x10 #define USB_DEVICE_CAPABILITY_DESC 0x10
#define USB_HID_DESC 0x21 #define USB_HID_DESC 0x21
#define USB_HID_REPORT_DESC 0x22 #define USB_HID_REPORT_DESC 0x22
#define CS_INTERFACE 0x24 #define USB_CS_INTERFACE_DESC 0x24
#define CS_ENDPOINT 0x25 #define USB_CS_ENDPOINT_DESC 0x25
#define USB_DFU_FUNCTIONAL_DESC 0x21 #define USB_DFU_FUNCTIONAL_DESC 0x21
#define USB_ASSOCIATION_DESC 0x0B #define USB_ASSOCIATION_DESC 0x0B
#define USB_BINARY_OBJECT_STORE_DESC 0x0F #define USB_BINARY_OBJECT_STORE_DESC 0x0F

8
subsys/usb/class/cdc_acm.c
View file

@ -118,7 +118,7 @@ struct usb_cdc_acm_config {
#define INITIALIZER_IF_HDR \ #define INITIALIZER_IF_HDR \
{ \ { \
.bFunctionLength = sizeof(struct cdc_header_descriptor),\ .bFunctionLength = sizeof(struct cdc_header_descriptor),\
.bDescriptorType = CS_INTERFACE, \ .bDescriptorType = USB_CS_INTERFACE_DESC, \
.bDescriptorSubtype = HEADER_FUNC_DESC, \ .bDescriptorSubtype = HEADER_FUNC_DESC, \
.bcdCDC = sys_cpu_to_le16(USB_1_1), \ .bcdCDC = sys_cpu_to_le16(USB_1_1), \
} }
@ -126,7 +126,7 @@ struct usb_cdc_acm_config {
#define INITIALIZER_IF_CM \ #define INITIALIZER_IF_CM \
{ \ { \
.bFunctionLength = sizeof(struct cdc_cm_descriptor), \ .bFunctionLength = sizeof(struct cdc_cm_descriptor), \
.bDescriptorType = CS_INTERFACE, \ .bDescriptorType = USB_CS_INTERFACE_DESC, \
.bDescriptorSubtype = CALL_MANAGEMENT_FUNC_DESC, \ .bDescriptorSubtype = CALL_MANAGEMENT_FUNC_DESC, \
.bmCapabilities = 0x02, \ .bmCapabilities = 0x02, \
.bDataInterface = 1, \ .bDataInterface = 1, \
@ -141,7 +141,7 @@ struct usb_cdc_acm_config {
#define INITIALIZER_IF_ACM \ #define INITIALIZER_IF_ACM \
{ \ { \
.bFunctionLength = sizeof(struct cdc_acm_descriptor), \ .bFunctionLength = sizeof(struct cdc_acm_descriptor), \
.bDescriptorType = CS_INTERFACE, \ .bDescriptorType = USB_CS_INTERFACE_DESC, \
.bDescriptorSubtype = ACM_FUNC_DESC, \ .bDescriptorSubtype = ACM_FUNC_DESC, \
.bmCapabilities = 0x02, \ .bmCapabilities = 0x02, \
} }
@ -149,7 +149,7 @@ struct usb_cdc_acm_config {
#define INITIALIZER_IF_UNION \ #define INITIALIZER_IF_UNION \
{ \ { \
.bFunctionLength = sizeof(struct cdc_union_descriptor), \ .bFunctionLength = sizeof(struct cdc_union_descriptor), \
.bDescriptorType = CS_INTERFACE, \ .bDescriptorType = USB_CS_INTERFACE_DESC, \
.bDescriptorSubtype = UNION_FUNC_DESC, \ .bDescriptorSubtype = UNION_FUNC_DESC, \
.bControlInterface = 0, \ .bControlInterface = 0, \
.bSubordinateInterface0 = 1, \ .bSubordinateInterface0 = 1, \

6
subsys/usb/class/netusb/function_ecm.c
View file

@ -78,14 +78,14 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_cdc_ecm_config cdc_ecm_cfg = {
/* Header Functional Descriptor */ /* Header Functional Descriptor */
.if0_header = { .if0_header = {
.bFunctionLength = sizeof(struct cdc_header_descriptor), .bFunctionLength = sizeof(struct cdc_header_descriptor),
.bDescriptorType = CS_INTERFACE, .bDescriptorType = USB_CS_INTERFACE_DESC,
.bDescriptorSubtype = HEADER_FUNC_DESC, .bDescriptorSubtype = HEADER_FUNC_DESC,
.bcdCDC = sys_cpu_to_le16(USB_1_1), .bcdCDC = sys_cpu_to_le16(USB_1_1),
}, },
/* Union Functional Descriptor */ /* Union Functional Descriptor */
.if0_union = { .if0_union = {
.bFunctionLength = sizeof(struct cdc_union_descriptor), .bFunctionLength = sizeof(struct cdc_union_descriptor),
.bDescriptorType = CS_INTERFACE, .bDescriptorType = USB_CS_INTERFACE_DESC,
.bDescriptorSubtype = UNION_FUNC_DESC, .bDescriptorSubtype = UNION_FUNC_DESC,
.bControlInterface = 0, .bControlInterface = 0,
.bSubordinateInterface0 = 1, .bSubordinateInterface0 = 1,
@ -93,7 +93,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_cdc_ecm_config cdc_ecm_cfg = {
/* Ethernet Networking Functional descriptor */ /* Ethernet Networking Functional descriptor */
.if0_netfun_ecm = { .if0_netfun_ecm = {
.bFunctionLength = sizeof(struct cdc_ecm_descriptor), .bFunctionLength = sizeof(struct cdc_ecm_descriptor),
.bDescriptorType = CS_INTERFACE, .bDescriptorType = USB_CS_INTERFACE_DESC,
.bDescriptorSubtype = ETHERNET_FUNC_DESC, .bDescriptorSubtype = ETHERNET_FUNC_DESC,
.iMACAddress = 4, .iMACAddress = 4,
.bmEthernetStatistics = sys_cpu_to_le32(0), /* None */ .bmEthernetStatistics = sys_cpu_to_le32(0), /* None */

8
subsys/usb/class/netusb/function_rndis.c
View file

@ -89,14 +89,14 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_rndis_config rndis_cfg = {
/* Header Functional Descriptor */ /* Header Functional Descriptor */
.if0_header = { .if0_header = {
.bFunctionLength = sizeof(struct cdc_header_descriptor), .bFunctionLength = sizeof(struct cdc_header_descriptor),
.bDescriptorType = CS_INTERFACE, .bDescriptorType = USB_CS_INTERFACE_DESC,
.bDescriptorSubtype = HEADER_FUNC_DESC, .bDescriptorSubtype = HEADER_FUNC_DESC,
.bcdCDC = sys_cpu_to_le16(USB_1_1), .bcdCDC = sys_cpu_to_le16(USB_1_1),
}, },
/* Call Management Functional Descriptor */ /* Call Management Functional Descriptor */
.if0_cm = { .if0_cm = {
.bFunctionLength = sizeof(struct cdc_cm_descriptor), .bFunctionLength = sizeof(struct cdc_cm_descriptor),
.bDescriptorType = CS_INTERFACE, .bDescriptorType = USB_CS_INTERFACE_DESC,
.bDescriptorSubtype = CALL_MANAGEMENT_FUNC_DESC, .bDescriptorSubtype = CALL_MANAGEMENT_FUNC_DESC,
.bmCapabilities = 0x00, .bmCapabilities = 0x00,
.bDataInterface = 1, .bDataInterface = 1,
@ -104,7 +104,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_rndis_config rndis_cfg = {
/* ACM Functional Descriptor */ /* ACM Functional Descriptor */
.if0_acm = { .if0_acm = {
.bFunctionLength = sizeof(struct cdc_acm_descriptor), .bFunctionLength = sizeof(struct cdc_acm_descriptor),
.bDescriptorType = CS_INTERFACE, .bDescriptorType = USB_CS_INTERFACE_DESC,
.bDescriptorSubtype = ACM_FUNC_DESC, .bDescriptorSubtype = ACM_FUNC_DESC,
/* Device supports the request combination of: /* Device supports the request combination of:
* Set_Line_Coding, * Set_Line_Coding,
@ -117,7 +117,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_rndis_config rndis_cfg = {
/* Union Functional Descriptor */ /* Union Functional Descriptor */
.if0_union = { .if0_union = {
.bFunctionLength = sizeof(struct cdc_union_descriptor), .bFunctionLength = sizeof(struct cdc_union_descriptor),
.bDescriptorType = CS_INTERFACE, .bDescriptorType = USB_CS_INTERFACE_DESC,
.bDescriptorSubtype = UNION_FUNC_DESC, .bDescriptorSubtype = UNION_FUNC_DESC,
.bControlInterface = 0, .bControlInterface = 0,
.bSubordinateInterface0 = 1, .bSubordinateInterface0 = 1,