usb: Rename defines to match present naming convention

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 <[email protected]>

Author: Emil Obalski

include/usb/usb_common.h

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

subsys/usb/class/cdc_acm.c

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

subsys/usb/class/netusb/function_ecm.c

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

subsys/usb/class/netusb/function_rndis.c

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