rename CFG_TUSB_HOST_ENUM_BUFFER_SIZE to CFG_TUH_ENUMERATION_BUFSZIE
add usbh_get_enum_buf
This commit is contained in:
parent
e83bdcdfdc
commit
e0dbb489ae
|
@ -71,6 +71,9 @@
|
||||||
// CONFIGURATION
|
// CONFIGURATION
|
||||||
//--------------------------------------------------------------------
|
//--------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Size of buffer to hold descriptors and other data used for enumeration
|
||||||
|
#define CFG_TUH_ENUMERATION_BUFSZIE 256
|
||||||
|
|
||||||
#define CFG_TUH_HUB 1
|
#define CFG_TUH_HUB 1
|
||||||
#define CFG_TUH_CDC 1
|
#define CFG_TUH_CDC 1
|
||||||
|
|
||||||
|
@ -85,6 +88,16 @@
|
||||||
|
|
||||||
#define CFG_TUSB_HOST_DEVICE_MAX (CFG_TUH_HUB ? 5 : 1) // normal hub has 4 ports
|
#define CFG_TUSB_HOST_DEVICE_MAX (CFG_TUH_HUB ? 5 : 1) // normal hub has 4 ports
|
||||||
|
|
||||||
|
//------------- HID -------------//
|
||||||
|
|
||||||
|
// Max number of reports per interface
|
||||||
|
// E.g composite HID with keyboard + mouse + gamepad will have 3 reports
|
||||||
|
#define CFG_TUH_HID_REPORT_MAX 4
|
||||||
|
|
||||||
|
// Max buffer
|
||||||
|
#define CFG_TUH_HID_REPORT_DESCRIPTOR_BUFSIZE 256
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -131,7 +131,7 @@ CFG_TUSB_MEM_SECTION usbh_device_t _usbh_devices[CFG_TUSB_HOST_DEVICE_MAX+1];
|
||||||
OSAL_QUEUE_DEF(OPT_MODE_HOST, _usbh_qdef, CFG_TUH_TASK_QUEUE_SZ, hcd_event_t);
|
OSAL_QUEUE_DEF(OPT_MODE_HOST, _usbh_qdef, CFG_TUH_TASK_QUEUE_SZ, hcd_event_t);
|
||||||
static osal_queue_t _usbh_q;
|
static osal_queue_t _usbh_q;
|
||||||
|
|
||||||
CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) static uint8_t _usbh_ctrl_buf[CFG_TUSB_HOST_ENUM_BUFFER_SIZE];
|
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t _usbh_ctrl_buf[CFG_TUH_ENUMERATION_BUFSZIE];
|
||||||
|
|
||||||
//------------- Helper Function Prototypes -------------//
|
//------------- Helper Function Prototypes -------------//
|
||||||
static bool enum_new_device(hcd_event_t* event);
|
static bool enum_new_device(hcd_event_t* event);
|
||||||
|
@ -144,6 +144,11 @@ uint8_t usbh_get_rhport(uint8_t dev_addr)
|
||||||
return _usbh_devices[dev_addr].rhport;
|
return _usbh_devices[dev_addr].rhport;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint8_t* usbh_get_enum_buf(void)
|
||||||
|
{
|
||||||
|
return _usbh_ctrl_buf;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// PUBLIC API (Parameter Verification is required)
|
// PUBLIC API (Parameter Verification is required)
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
|
@ -849,7 +854,7 @@ static bool enum_get_9byte_config_desc_complete(uint8_t dev_addr, tusb_control_r
|
||||||
// Use offsetof to avoid pointer to the odd/misaligned address
|
// Use offsetof to avoid pointer to the odd/misaligned address
|
||||||
memcpy(&total_len, (uint8_t*) desc_config + offsetof(tusb_desc_configuration_t, wTotalLength), 2);
|
memcpy(&total_len, (uint8_t*) desc_config + offsetof(tusb_desc_configuration_t, wTotalLength), 2);
|
||||||
|
|
||||||
TU_ASSERT(total_len <= CFG_TUSB_HOST_ENUM_BUFFER_SIZE);
|
TU_ASSERT(total_len <= CFG_TUH_ENUMERATION_BUFSZIE);
|
||||||
|
|
||||||
// Get full configuration descriptor
|
// Get full configuration descriptor
|
||||||
TU_LOG2("Get Configuration Descriptor\r\n");
|
TU_LOG2("Get Configuration Descriptor\r\n");
|
||||||
|
|
|
@ -124,6 +124,8 @@ void usbh_driver_set_config_complete(uint8_t dev_addr, uint8_t itf_num);
|
||||||
|
|
||||||
uint8_t usbh_get_rhport(uint8_t dev_addr);
|
uint8_t usbh_get_rhport(uint8_t dev_addr);
|
||||||
|
|
||||||
|
uint8_t* usbh_get_enum_buf(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -50,7 +50,7 @@ typedef struct
|
||||||
static usbh_control_xfer_t _ctrl_xfer;
|
static usbh_control_xfer_t _ctrl_xfer;
|
||||||
|
|
||||||
//CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN
|
//CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN
|
||||||
//static uint8_t _tuh_ctrl_buf[CFG_TUSB_HOST_ENUM_BUFFER_SIZE];
|
//static uint8_t _tuh_ctrl_buf[CFG_TUH_ENUMERATION_BUFSZIE];
|
||||||
|
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
|
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
|
||||||
|
|
|
@ -269,8 +269,8 @@
|
||||||
//------------- HID CLASS -------------//
|
//------------- HID CLASS -------------//
|
||||||
#define HOST_CLASS_HID ( CFG_TUH_HID_KEYBOARD + CFG_TUH_HID_MOUSE + CFG_TUSB_HOST_HID_GENERIC )
|
#define HOST_CLASS_HID ( CFG_TUH_HID_KEYBOARD + CFG_TUH_HID_MOUSE + CFG_TUSB_HOST_HID_GENERIC )
|
||||||
|
|
||||||
#ifndef CFG_TUSB_HOST_ENUM_BUFFER_SIZE
|
#ifndef CFG_TUH_ENUMERATION_BUFSZIE
|
||||||
#define CFG_TUSB_HOST_ENUM_BUFFER_SIZE 256
|
#define CFG_TUH_ENUMERATION_BUFSZIE 256
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//------------- CLASS -------------//
|
//------------- CLASS -------------//
|
||||||
|
|
Loading…
Reference in New Issue