From e73667c07856de7c4636114e6782359d3634fa38 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 18 Mar 2014 16:23:23 +0700 Subject: [PATCH] clean up tusb_descriptors --- demos/device/src/tusb_descriptors.c | 14 +++++----- demos/device/src/tusb_descriptors.h | 40 ++++++++++++++--------------- tinyusb/device/usbd.c | 2 +- tinyusb/tusb_option.h | 6 ++--- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/demos/device/src/tusb_descriptors.c b/demos/device/src/tusb_descriptors.c index 1eff04c5..1ac847f9 100644 --- a/demos/device/src/tusb_descriptors.c +++ b/demos/device/src/tusb_descriptors.c @@ -183,7 +183,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration = .bLength = sizeof(tusb_descriptor_interface_association_t), .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_ASSOCIATION, - .bFirstInterface = INTERFACE_NUM_CDC, + .bFirstInterface = INTERFACE_NO_CDC, .bInterfaceCount = 2, .bFunctionClass = TUSB_CLASS_CDC, @@ -199,7 +199,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration = { .bLength = sizeof(tusb_descriptor_interface_t), .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, - .bInterfaceNumber = INTERFACE_NUM_CDC, + .bInterfaceNumber = INTERFACE_NO_CDC, .bAlternateSetting = 0, .bNumEndpoints = 1, .bInterfaceClass = TUSB_CLASS_CDC, @@ -251,7 +251,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration = { .bLength = sizeof(tusb_descriptor_interface_t), .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, - .bInterfaceNumber = INTERFACE_NUM_CDC+1, + .bInterfaceNumber = INTERFACE_NO_CDC+1, .bAlternateSetting = 0x00, .bNumEndpoints = 2, .bInterfaceClass = TUSB_CLASS_CDC_DATA, @@ -287,7 +287,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration = { .bLength = sizeof(tusb_descriptor_interface_t), .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, - .bInterfaceNumber = INTERFACE_NUM_HID_KEYBOARD, + .bInterfaceNumber = INTERFACE_NO_HID_KEYBOARD, .bAlternateSetting = 0x00, .bNumEndpoints = 1, .bInterfaceClass = TUSB_CLASS_HID, @@ -324,7 +324,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration = { .bLength = sizeof(tusb_descriptor_interface_t), .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, - .bInterfaceNumber = INTERFACE_NUM_HID_MOUSE, + .bInterfaceNumber = INTERFACE_NO_HID_MOUSE, .bAlternateSetting = 0x00, .bNumEndpoints = 1, .bInterfaceClass = TUSB_CLASS_HID, @@ -361,7 +361,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration = { .bLength = sizeof(tusb_descriptor_interface_t), .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, - .bInterfaceNumber = INTERFACE_NUM_MSC, + .bInterfaceNumber = INTERFACE_NO_MSC, .bAlternateSetting = 0x00, .bNumEndpoints = 2, .bInterfaceClass = TUSB_CLASS_MSC, @@ -426,7 +426,7 @@ uint16_t desc_str_serial[] = '1', '2', '3', '4' // len = 4 }; -uint8_t* const desc_str_table [TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT] = +uint8_t* const tusbd_string_desc_table [TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT] = { (uint8_t*) desc_str_language, (uint8_t*) desc_str_manufacturer, diff --git a/demos/device/src/tusb_descriptors.h b/demos/device/src/tusb_descriptors.h index a2cd62a5..057cf4cf 100644 --- a/demos/device/src/tusb_descriptors.h +++ b/demos/device/src/tusb_descriptors.h @@ -48,25 +48,25 @@ //#define CFG_PRODUCTID 0x4567 // use auto product id to prevent conflict with pc's driver // each combination of interfaces need to have a unique productid, as windows will bind & remember device driver after the first plug. -#ifndef CFG_PRODUCTID // Auto ProductID layout's Bitmap: (MSB) MassStorage | Generic | Mouse | Key | CDC (LSB) +// Auto ProductID layout's Bitmap: (MSB) MassStorage | Generic | Mouse | Key | CDC (LSB) +#ifndef CFG_PRODUCTID #define PRODUCTID_BITMAP(interface, n) ( (TUSB_CFG_DEVICE_##interface) << (n) ) #define CFG_PRODUCTID (0x4000 | ( PRODUCTID_BITMAP(CDC, 0) | PRODUCTID_BITMAP(HID_KEYBOARD, 1) | \ PRODUCTID_BITMAP(HID_MOUSE, 2) | PRODUCTID_BITMAP(HID_GENERIC, 3) | \ PRODUCTID_BITMAP(MSC, 4) ) ) #endif +#define INTERFACE_NO_CDC 0 +#define INTERFACE_NO_HID_KEYBOARD (INTERFACE_NO_CDC + 2*TUSB_CFG_DEVICE_CDC ) +#define INTERFACE_NO_HID_MOUSE (INTERFACE_NO_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_KEYBOARD ) +#define INTERFACE_NO_HID_GENERIC (INTERFACE_NO_HID_MOUSE + TUSB_CFG_DEVICE_HID_MOUSE ) +#define INTERFACE_NO_MSC (INTERFACE_NO_HID_GENERIC + TUSB_CFG_DEVICE_HID_GENERIC ) -#define INTERFACE_NUM_CDC 0 -#define INTERFACE_NUM_HID_KEYBOARD (INTERFACE_NUM_CDC + 2*TUSB_CFG_DEVICE_CDC ) -#define INTERFACE_NUM_HID_MOUSE (INTERFACE_NUM_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_KEYBOARD ) -#define INTERFACE_NUM_HID_GENERIC (INTERFACE_NUM_HID_MOUSE + TUSB_CFG_DEVICE_HID_MOUSE ) -#define INTERFACE_NUM_MSC (INTERFACE_NUM_HID_GENERIC + TUSB_CFG_DEVICE_HID_GENERIC ) - -#define TOTAL_INTEFACES (2*TUSB_CFG_DEVICE_CDC + TUSB_CFG_DEVICE_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_MOUSE + \ - TUSB_CFG_DEVICE_HID_GENERIC + TUSB_CFG_DEVICE_MSC) +#define TOTAL_INTEFACES (2*TUSB_CFG_DEVICE_CDC + TUSB_CFG_DEVICE_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_MOUSE + \ + TUSB_CFG_DEVICE_HID_GENERIC + TUSB_CFG_DEVICE_MSC) // Interface Assosication Descriptor is required when enable CDC -#define IAD_DESC_REQUIRED ( TUSB_CFG_DEVICE_CDC ) +#define IAD_DESC_REQUIRED ( TUSB_CFG_DEVICE_CDC ) //--------------------------------------------------------------------+ // Endpoints Address & Max Packet Size @@ -74,8 +74,8 @@ #define EDPT_IN(x) (0x80 | (x)) #define EDPT_OUT(x) (x) -#if TUSB_CFG_MCU == MCU_LPC175X_6X -//------------- These MCUs's endpoint number has a fixed type -------------// +#if TUSB_CFG_MCU == MCU_LPC175X_6X // MCUs's endpoint number has a fixed type + //------------- CDC -------------// #define CDC_EDPT_NOTIFICATION_ADDR EDPT_IN (1) #define CDC_EDPT_NOTIFICATION_PACKETSIZE 64 @@ -103,26 +103,26 @@ #else //------------- CDC -------------// -#define CDC_EDPT_NOTIFICATION_ADDR EDPT_IN (INTERFACE_NUM_CDC+1) +#define CDC_EDPT_NOTIFICATION_ADDR EDPT_IN (INTERFACE_NO_CDC+1) #define CDC_EDPT_NOTIFICATION_PACKETSIZE 64 -#define CDC_EDPT_DATA_OUT_ADDR EDPT_OUT(INTERFACE_NUM_CDC+2) -#define CDC_EDPT_DATA_IN_ADDR EDPT_IN (INTERFACE_NUM_CDC+2) +#define CDC_EDPT_DATA_OUT_ADDR EDPT_OUT(INTERFACE_NO_CDC+2) +#define CDC_EDPT_DATA_IN_ADDR EDPT_IN (INTERFACE_NO_CDC+2) #define CDC_EDPT_DATA_PACKETSIZE 64 //------------- HID Keyboard -------------// -#define HID_KEYBOARD_EDPT_ADDR EDPT_IN (INTERFACE_NUM_HID_KEYBOARD+1) +#define HID_KEYBOARD_EDPT_ADDR EDPT_IN (INTERFACE_NO_HID_KEYBOARD+1) #define HID_KEYBOARD_EDPT_PACKETSIZE 8 //------------- HID Mouse -------------// -#define HID_MOUSE_EDPT_ADDR EDPT_IN (INTERFACE_NUM_HID_MOUSE+1) +#define HID_MOUSE_EDPT_ADDR EDPT_IN (INTERFACE_NO_HID_MOUSE+1) #define HID_MOUSE_EDPT_PACKETSIZE 8 //------------- HID Generic -------------// //------------- Mass Storage -------------// -#define MSC_EDPT_OUT_ADDR EDPT_OUT(INTERFACE_NUM_MSC+1) -#define MSC_EDPT_IN_ADDR EDPT_IN (INTERFACE_NUM_MSC+1) +#define MSC_EDPT_OUT_ADDR EDPT_OUT(INTERFACE_NO_MSC+1) +#define MSC_EDPT_IN_ADDR EDPT_IN (INTERFACE_NO_MSC+1) #define MSC_EDPT_PACKETSIZE (TUSB_CFG_DEVICE_FULLSPEED ? 64 : 512) #endif @@ -179,7 +179,7 @@ typedef ATTR_PACKED_STRUCT(struct) //--------------------------------------------------------------------+ // STRINGS DESCRIPTOR //--------------------------------------------------------------------+ -extern uint8_t * const desc_str_table[TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT]; +extern uint8_t * const tusbd_string_desc_table[TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT]; //--------------------------------------------------------------------+ // Export descriptors diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index a42a4292..3530b996 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -350,7 +350,7 @@ static tusb_error_t get_descriptor(uint8_t coreid, tusb_control_request_t const { if ( ! (desc_index < TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT) ) return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT; - (*pp_buffer) = (uint8_t *) desc_str_table[desc_index]; + (*pp_buffer) = (uint8_t *) tusbd_string_desc_table[desc_index]; (*p_length) = **pp_buffer; }else { diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h index a7c52510..780547a5 100644 --- a/tinyusb/tusb_option.h +++ b/tinyusb/tusb_option.h @@ -39,15 +39,15 @@ #ifndef _TUSB_TUSB_OPTION_H_ #define _TUSB_TUSB_OPTION_H_ -/** \defgroup group_configuration Configuration tusb_config.h - * @{ */ - #define TUSB_VERSION_YEAR 00 #define TUSB_VERSION_MONTH 00 #define TUSB_VERSION_WEEK 0 #define TUSB_VERSION_NAME "alpha" #define TUSB_VERSION XSTRING_(TUSB_VERSION_YEAR) "." XSTRING_(TUSB_VERSION_MONTH) +/** \defgroup group_configuration Configuration tusb_config.h + * @{ */ + /** \defgroup config_mcu_selection MCU Selection * \brief TUSB_CFG_MCU must be defined to one of these * @{ */