kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

fix hid generic various error

This commit is contained in:
hathach 2018-07-28 20:15:20 +07:00
parent c729db2294
commit 8b17c54609
7 changed files with 81 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/device/nrf52840/src/tusb_config.h
View File

@ -82,8 +82,8 @@
* require more IN endpoints. If disabled, they they are all packed into a single * require more IN endpoints. If disabled, they they are all packed into a single
* multiple report interface called "Generic". * multiple report interface called "Generic".
*/ */
#define CFG_TUD_DESC_BOOT_KEYBOARD 1 #define CFG_TUD_DESC_BOOT_KEYBOARD 0
#define CFG_TUD_DESC_BOOT_MOUSE 1 #define CFG_TUD_DESC_BOOT_MOUSE 0
//------------- CLASS -------------// //------------- CLASS -------------//
#define CFG_TUD_CDC 1 #define CFG_TUD_CDC 1

4
src/class/hid/hid.h
View File

@ -354,8 +354,8 @@ typedef enum
#define RI_TYPE_LOCAL 2 #define RI_TYPE_LOCAL 2
//------------- MAIN ITEMS 6.2.2.4 -------------// //------------- MAIN ITEMS 6.2.2.4 -------------//
#define HID_INPUT(x) HID_REPORT_ITEM(x, 8, RI_TYPE_MAIN, 1) #define HID_INPUT(x) HID_REPORT_ITEM(x, 8, RI_TYPE_MAIN, 1)
#define HID_OUTPUT(x) HID_REPORT_ITEM(x, 9, RI_TYPE_MAIN, 1) #define HID_OUTPUT(x) HID_REPORT_ITEM(x, 9, RI_TYPE_MAIN, 1)
#define HID_COLLECTION(x) HID_REPORT_ITEM(x, 10, RI_TYPE_MAIN, 1) #define HID_COLLECTION(x) HID_REPORT_ITEM(x, 10, RI_TYPE_MAIN, 1)
#define HID_FEATURE(x) HID_REPORT_ITEM(x, 11, RI_TYPE_MAIN, 1) #define HID_FEATURE(x) HID_REPORT_ITEM(x, 11, RI_TYPE_MAIN, 1)
#define HID_COLLECTION_END HID_REPORT_ITEM(x, 12, RI_TYPE_MAIN, 0) #define HID_COLLECTION_END HID_REPORT_ITEM(x, 12, RI_TYPE_MAIN, 0)

13
src/class/hid/hid_device.c
View File

@ -87,8 +87,9 @@ CFG_TUSB_ATTR_USBRAM static hidd_interface_t _hidd_itf;
static inline hidd_interface_t* get_interface_by_itfnum(uint8_t itf_num) static inline hidd_interface_t* get_interface_by_itfnum(uint8_t itf_num)
{ {
return ( itf_num == _kbd_itf.itf_num ) ? &_kbd_itf : return ( itf_num == _kbd_itf.itf_num ) ? &_kbd_itf :
( itf_num == _mse_itf.itf_num ) ? &_mse_itf : NULL; ( itf_num == _mse_itf.itf_num ) ? &_mse_itf :
( itf_num == _hidd_itf.itf_num ) ? &_hidd_itf : NULL;
} }
@ -333,17 +334,19 @@ tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, u
// TODO HID generic // TODO HID generic
hidd_interface_t * p_hid = &_hidd_itf; hidd_interface_t * p_hid = &_hidd_itf;
TU_ASSERT( dcd_edpt_open(rhport, desc_edpt), TUSB_ERROR_DCD_FAILED );
p_hid->itf_num = desc_itf->bInterfaceNumber; p_hid->itf_num = desc_itf->bInterfaceNumber;
p_hid->ep_in = desc_edpt->bEndpointAddress; p_hid->ep_in = desc_edpt->bEndpointAddress;
// TODO parse report ID for keyboard, mouse // TODO parse report ID for keyboard, mouse
p_hid->report_id = 0; p_hid->report_id = 0;
p_hid->report_len = 0; p_hid->report_len = desc_hid->wReportLength;
p_hid->report_desc = NULL; p_hid->report_desc = tud_desc_set.hid_report.generic;
p_hid->get_report_cb = tud_hid_generic_get_report_cb; p_hid->get_report_cb = tud_hid_generic_get_report_cb;
p_hid->set_report_cb = tud_hid_generic_set_report_cb; p_hid->set_report_cb = tud_hid_generic_set_report_cb;
return ERR_TUD_INVALID_DESCRIPTOR; *p_len = sizeof(tusb_desc_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + sizeof(tusb_desc_endpoint_t);
} }
return TUSB_ERROR_NONE; return TUSB_ERROR_NONE;

11
src/class/hid/hid_device.h
View File

@ -47,6 +47,17 @@
extern "C" { extern "C" {
#endif #endif
//--------------------------------------------------------------------+
// Class Driver Configuration
//--------------------------------------------------------------------+
#if !CFG_TUD_HID_KEYBOARD && CFG_TUD_DESC_BOOT_KEYBOARD
#error CFG_TUD_HID_KEYBOARD must be enabled
#endif
#if !CFG_TUD_HID_MOUSE && CFG_TUD_DESC_BOOT_MOUSE
#error CFG_TUD_HID_MOUSE must be enabled
#endif
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// HID GENERIC API // HID GENERIC API

9
src/device/usbd.c
View File

@ -328,14 +328,11 @@ static void usbd_reset(uint8_t rhport)
tud_desc_set.hid_report.boot_mouse = _desc_auto_hid_boot_mse_report; tud_desc_set.hid_report.boot_mouse = _desc_auto_hid_boot_mse_report;
#endif #endif
#if 0 // CFG_TUD_HID_BOOT_PROTOCOL #if TUD_OPT_HID_GENERIC
extern uint8_t const _desc_auto_hid_generic_report[];
#if CFG_TUD_HID_KEYBOARD + CFG_TUD_HID_MOUSE tud_desc_set.hid_report.generic = _desc_auto_hid_generic_report;
tud_desc_set.hid_report.composite = ;
#endif #endif
#endif
#endif // CFG_TUD_DESC_AUTO #endif // CFG_TUD_DESC_AUTO
} }

98
src/device/usbd_desc.c
View File

@ -40,17 +40,11 @@
#if TUSB_OPT_DEVICE_ENABLED #if TUSB_OPT_DEVICE_ENABLED
#define _TINY_USB_SOURCE_FILE_
#include "tusb.h" #include "tusb.h"
#if CFG_TUD_DESC_AUTO #if CFG_TUD_DESC_AUTO
// Generic (multiple) Report : Keyboard + Mouse + Gamepad + Joystick
#define HID_GENERIC (CFG_TUD_HID && ( (CFG_TUD_HID_KEYBOARD && !CFG_TUD_DESC_BOOT_KEYBOARD) || \
(CFG_TUD_HID_MOUSE && !CFG_TUD_DESC_BOOT_MOUSE) ))
/*------------- VID/PID -------------*/ /*------------- VID/PID -------------*/
#ifndef CFG_TUD_DESC_VID #ifndef CFG_TUD_DESC_VID
#define CFG_TUD_DESC_VID 0xCAFE #define CFG_TUD_DESC_VID 0xCAFE
@ -66,7 +60,7 @@
*/ */
#define _PID_MAP(itf, n) ( (CFG_TUD_##itf) << (n) ) #define _PID_MAP(itf, n) ( (CFG_TUD_##itf) << (n) )
#define CFG_TUD_DESC_PID (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \ #define CFG_TUD_DESC_PID (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \
_PID_MAP(HID_KEYBOARD, 2) | _PID_MAP(HID_MOUSE, 3) | (HID_GENERIC << 4) ) _PID_MAP(HID_KEYBOARD, 2) | _PID_MAP(HID_MOUSE, 3) | (TUD_OPT_HID_GENERIC << 4) )
#endif #endif
/*------------- Interface Numbering -------------*/ /*------------- Interface Numbering -------------*/
@ -74,56 +68,46 @@
* If a interface is not enabled, the later will take its place * If a interface is not enabled, the later will take its place
*/ */
#define ITF_NUM_CDC 0 #define ITF_NUM_CDC 0
#define ITF_NUM_MSC (ITF_NUM_CDC + 2*CFG_TUD_CDC) #define ITF_NUM_MSC (ITF_NUM_CDC + 2*CFG_TUD_CDC)
#define ITF_NUM_HID_KBD (ITF_NUM_MSC + CFG_TUD_MSC) #define ITF_NUM_HID_BOOT_KBD (ITF_NUM_MSC + CFG_TUD_MSC)
#define ITF_NUM_HID_MSE (ITF_NUM_HID_KBD + CFG_TUD_HID_KEYBOARD) #define ITF_NUM_HID_BOOT_MSE (ITF_NUM_HID_BOOT_KBD + CFG_TUD_DESC_BOOT_KEYBOARD)
#define ITF_NUM_HID_GEN (ITF_NUM_HID_BOOT_MSE + CFG_TUD_DESC_BOOT_MOUSE)
#define ITF_NUM_HID_GEN (ITF_NUM_HID_MSE + CFG_TUD_HID_MOUSE) #define ITF_TOTAL (ITF_NUM_HID_GEN + TUD_OPT_HID_GENERIC)
#define ITF_TOTAL (ITF_NUM_HID_GEN + HID_GENERIC)
/*------------- Endpoint Numbering & Size -------------*/ /*------------- Endpoint Numbering & Size -------------*/
#define _EP_IN(x) (0x80 | (x)) #define _EP_IN(x) (0x80 | (x))
#define _EP_OUT(x) (x) #define _EP_OUT(x) (x)
// CDC // CDC
#define EP_CDC_NOTIF _EP_IN (ITF_NUM_CDC+1) #define EP_CDC_NOTIF _EP_IN ( ITF_NUM_CDC+1 )
#define EP_CDC_NOTIF_SIZE 8 #define EP_CDC_NOTIF_SIZE 8
#define EP_CDC_OUT _EP_OUT(ITF_NUM_CDC+2) #define EP_CDC_OUT _EP_OUT( ITF_NUM_CDC+2 )
#define EP_CDC_IN _EP_IN (ITF_NUM_CDC+2) #define EP_CDC_IN _EP_IN ( ITF_NUM_CDC+2 )
// Mass Storage // Mass Storage
#define EP_MSC_OUT _EP_OUT(ITF_NUM_MSC+1) #define EP_MSC_OUT _EP_OUT( ITF_NUM_MSC+1 )
#define EP_MSC_IN _EP_IN (ITF_NUM_MSC+1) #define EP_MSC_IN _EP_IN ( ITF_NUM_MSC+1 )
// HID Keyboard with boot protocol // HID Keyboard with boot protocol
#if CFG_TUD_HID_KEYBOARD && CFG_TUD_DESC_BOOT_KEYBOARD #define EP_HID_KBD_BOOT _EP_IN ( ITF_NUM_HID_BOOT_KBD+1 )
#define EP_HID_KBD_BOOT _EP_IN (ITF_NUM_HID_KBD+1) #define EP_HID_KBD_BOOT_SZ 8
#define EP_HID_KBD_BOOT_SZ 8
#endif
// HID Mouse with boot protocol // HID Mouse with boot protocol
#if CFG_TUD_HID_MOUSE && CFG_TUD_DESC_BOOT_MOUSE #define EP_HID_MSE_BOOT _EP_IN ( ITF_NUM_HID_BOOT_MSE+1 )
#define EP_HID_MSE_BOOT _EP_IN (ITF_NUM_HID_MSE+1) #define EP_HID_MSE_BOOT_SZ 8
#define EP_HID_MSE_BOOT_SZ 8
#endif
// HID composite = keyboard + mouse + gamepad + etc ...
#define EP_HID_GEN _EP_IN ( ITF_NUM_HID_GEN+1 )
#if HID_GENERIC #define EP_HID_GEN_SIZE 16
// HID composite = keyboard + mouse
#define EP_HID_GEN _EP_IN (EP_HID_MSE_BOOT+1)
#define EP_HID_GEN_SIZE 16
#endif
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// HID Report Descriptors // Auto generated HID Report Descriptors
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@ -135,6 +119,7 @@
HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ) ,\ HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ) ,\
HID_COLLECTION ( HID_COLLECTION_APPLICATION ) ,\ HID_COLLECTION ( HID_COLLECTION_APPLICATION ) ,\
/* 8 bits Modifier Keys (Shfit, Control, Alt) */ \ /* 8 bits Modifier Keys (Shfit, Control, Alt) */ \
__VA_ARGS__ \
HID_USAGE_PAGE ( HID_USAGE_PAGE_KEYBOARD ) ,\ HID_USAGE_PAGE ( HID_USAGE_PAGE_KEYBOARD ) ,\
HID_USAGE_MIN ( 224 ) ,\ HID_USAGE_MIN ( 224 ) ,\
HID_USAGE_MAX ( 231 ) ,\ HID_USAGE_MAX ( 231 ) ,\
@ -173,7 +158,7 @@
uint8_t const _desc_auto_hid_boot_kbd_report[] = { HID_REPORT_KEYBOARD() }; uint8_t const _desc_auto_hid_boot_kbd_report[] = { HID_REPORT_KEYBOARD() };
#endif #endif
#endif #endif // hid keyboard
/*------------- Mouse Descriptor -------------*/ /*------------- Mouse Descriptor -------------*/
#if CFG_TUD_HID_MOUSE #if CFG_TUD_HID_MOUSE
@ -181,6 +166,7 @@ uint8_t const _desc_auto_hid_boot_kbd_report[] = { HID_REPORT_KEYBOARD() };
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\ HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ) ,\
HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ) ,\ HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ) ,\
HID_COLLECTION ( HID_COLLECTION_APPLICATION ) ,\ HID_COLLECTION ( HID_COLLECTION_APPLICATION ) ,\
__VA_ARGS__ \
HID_USAGE ( HID_USAGE_DESKTOP_POINTER ) ,\ HID_USAGE ( HID_USAGE_DESKTOP_POINTER ) ,\
HID_COLLECTION ( HID_COLLECTION_PHYSICAL ) ,\ HID_COLLECTION ( HID_COLLECTION_PHYSICAL ) ,\
HID_USAGE_PAGE ( HID_USAGE_PAGE_BUTTON ) ,\ HID_USAGE_PAGE ( HID_USAGE_PAGE_BUTTON ) ,\
@ -219,11 +205,29 @@ uint8_t const _desc_auto_hid_boot_kbd_report[] = { HID_REPORT_KEYBOARD() };
uint8_t const _desc_auto_hid_boot_mse_report[] = { HID_REPORT_MOUSE() }; uint8_t const _desc_auto_hid_boot_mse_report[] = { HID_REPORT_MOUSE() };
#endif #endif
#endif // hid mouse
/*------------- Generic (composite) Descriptor -------------*/
#if TUD_OPT_HID_GENERIC
uint8_t const _desc_auto_hid_generic_report[] =
{
#if !CFG_TUD_DESC_BOOT_KEYBOARD
HID_REPORT_KEYBOARD( HID_REPORT_ID(1), ),
#endif #endif
#if !CFG_TUD_DESC_BOOT_MOUSE
HID_REPORT_MOUSE( HID_REPORT_ID(2), )
#endif
};
#endif // hid generic
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Auto generate descriptor /* Auto generated Device & Configuration descriptor
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
// For highspeed device but currently in full speed mode // For highspeed device but currently in full speed mode
@ -323,7 +327,7 @@ typedef struct ATTR_PACKED
} hid_mse_boot; } hid_mse_boot;
#endif #endif
#if HID_GENERIC #if TUD_OPT_HID_GENERIC
struct ATTR_PACKED struct ATTR_PACKED
{ {
@ -516,7 +520,7 @@ desc_auto_cfg_t const _desc_auto_config_struct =
{ {
.bLength = sizeof(tusb_desc_interface_t), .bLength = sizeof(tusb_desc_interface_t),
.bDescriptorType = TUSB_DESC_INTERFACE, .bDescriptorType = TUSB_DESC_INTERFACE,
.bInterfaceNumber = ITF_NUM_HID_KBD, .bInterfaceNumber = ITF_NUM_HID_BOOT_KBD,
.bAlternateSetting = 0x00, .bAlternateSetting = 0x00,
.bNumEndpoints = 1, .bNumEndpoints = 1,
.bInterfaceClass = TUSB_CLASS_HID, .bInterfaceClass = TUSB_CLASS_HID,
@ -556,7 +560,7 @@ desc_auto_cfg_t const _desc_auto_config_struct =
{ {
.bLength = sizeof(tusb_desc_interface_t), .bLength = sizeof(tusb_desc_interface_t),
.bDescriptorType = TUSB_DESC_INTERFACE, .bDescriptorType = TUSB_DESC_INTERFACE,
.bInterfaceNumber = ITF_NUM_HID_MSE, .bInterfaceNumber = ITF_NUM_HID_BOOT_MSE,
.bAlternateSetting = 0x00, .bAlternateSetting = 0x00,
.bNumEndpoints = 1, .bNumEndpoints = 1,
.bInterfaceClass = TUSB_CLASS_HID, .bInterfaceClass = TUSB_CLASS_HID,
@ -589,10 +593,10 @@ desc_auto_cfg_t const _desc_auto_config_struct =
#endif // boot mouse #endif // boot mouse
#if HID_GENERIC #if TUD_OPT_HID_GENERIC
//------------- HID Generic Multiple report -------------// //------------- HID Generic Multiple report -------------//
.hid_composite = .hid_generic =
{ {
.itf = .itf =
{ {
@ -600,7 +604,7 @@ desc_auto_cfg_t const _desc_auto_config_struct =
.bDescriptorType = TUSB_DESC_INTERFACE, .bDescriptorType = TUSB_DESC_INTERFACE,
.bInterfaceNumber = ITF_NUM_HID_GEN, .bInterfaceNumber = ITF_NUM_HID_GEN,
.bAlternateSetting = 0x00, .bAlternateSetting = 0x00,
.bNumEndpoints = 2, .bNumEndpoints = 1,
.bInterfaceClass = TUSB_CLASS_HID, .bInterfaceClass = TUSB_CLASS_HID,
.bInterfaceSubClass = 0, .bInterfaceSubClass = 0,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,

4
src/tusb_option.h
View File

@ -171,6 +171,10 @@
#define CFG_TUD_MSC 0 #define CFG_TUD_MSC 0
#endif #endif
// Generic (multiple) Report : Keyboard + Mouse + Gamepad + Joystick
#define TUD_OPT_HID_GENERIC (CFG_TUD_HID && ( (CFG_TUD_HID_KEYBOARD && !CFG_TUD_DESC_BOOT_KEYBOARD) || \
(CFG_TUD_HID_MOUSE && !CFG_TUD_DESC_BOOT_MOUSE) ))
#endif // TUSB_OPT_DEVICE_ENABLED #endif // TUSB_OPT_DEVICE_ENABLED
//-------------------------------------------------------------------- //--------------------------------------------------------------------