From e0dbb489aed9d9e7f081c379400dcb74600ede6a Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Wed, 12 May 2021 19:27:05 +0700
Subject: [PATCH] rename CFG_TUSB_HOST_ENUM_BUFFER_SIZE to
 CFG_TUH_ENUMERATION_BUFSZIE

add usbh_get_enum_buf
---
 examples/host/cdc_msc_hid/src/tusb_config.h | 13 +++++++++++++
 src/host/usbh.c                             |  9 +++++++--
 src/host/usbh.h                             |  2 ++
 src/host/usbh_control.c                     |  2 +-
 src/tusb_option.h                           |  4 ++--
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/examples/host/cdc_msc_hid/src/tusb_config.h b/examples/host/cdc_msc_hid/src/tusb_config.h
index 82155f1c..e1e02e31 100644
--- a/examples/host/cdc_msc_hid/src/tusb_config.h
+++ b/examples/host/cdc_msc_hid/src/tusb_config.h
@@ -71,6 +71,9 @@
 // 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_CDC                 1
 
@@ -85,6 +88,16 @@
 
 #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
  }
 #endif
diff --git a/src/host/usbh.c b/src/host/usbh.c
index f7cad464..fe0b2b98 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -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);
 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 -------------//
 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;
 }
 
+uint8_t* usbh_get_enum_buf(void)
+{
+  return _usbh_ctrl_buf;
+}
+
 //--------------------------------------------------------------------+
 // 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
   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
   TU_LOG2("Get Configuration Descriptor\r\n");
diff --git a/src/host/usbh.h b/src/host/usbh.h
index 809ffd40..5e7abe86 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -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_enum_buf(void);
+
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/host/usbh_control.c b/src/host/usbh_control.c
index 2b9f4779..974d1066 100644
--- a/src/host/usbh_control.c
+++ b/src/host/usbh_control.c
@@ -50,7 +50,7 @@ typedef struct
 static usbh_control_xfer_t _ctrl_xfer;
 
 //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
diff --git a/src/tusb_option.h b/src/tusb_option.h
index b59c7cb2..53d3d9d2 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -269,8 +269,8 @@
   //------------- HID CLASS -------------//
   #define HOST_CLASS_HID   ( CFG_TUH_HID_KEYBOARD + CFG_TUH_HID_MOUSE + CFG_TUSB_HOST_HID_GENERIC )
 
-  #ifndef CFG_TUSB_HOST_ENUM_BUFFER_SIZE
-    #define CFG_TUSB_HOST_ENUM_BUFFER_SIZE 256
+  #ifndef CFG_TUH_ENUMERATION_BUFSZIE
+    #define CFG_TUH_ENUMERATION_BUFSZIE 256
   #endif
 
   //------------- CLASS -------------//