no big deal, only rename tusb_std_request_t to tusb_control_request_t

13 files changed, 31 insertions, 21 deletions

diff --git a/tinyusb/class/cdc_host.h b/tinyusb/class/cdc_host.h
index ac8cf7acb..1d852c4eb 100644
--- a/tinyusb/class/cdc_host.h
+++ b/tinyusb/class/cdc_host.h
@@ -68,11 +68,21 @@ bool tusbh_cdc_rndis_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RES
 tusb_error_t tusbh_cdc_send(uint8_t dev_addr, void const * p_data, uint32_t length, bool is_notify);
 tusb_error_t tusbh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t length, bool is_notify);
 
-//------------- Application Callback -------------//
+//------------- CDC Application Callback -------------//
 void tusbh_cdc_mounted_cb(uint8_t dev_addr) ATTR_WEAK;
 void tusbh_cdc_unmounted_isr(uint8_t dev_addr) ATTR_WEAK;
 void tusbh_cdc_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK;
 void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes) ATTR_WEAK;
+
+//------------- RNDIS Application Callback (overshadow CDC callbacks) -------------//
+#if TUSB_CFG_HOST_CDC_RNDIS
+
+void tusbh_cdc_rndis_mounted_cb(uint8_t dev_addr) ATTR_WEAK;
+void tusbh_cdc_rndis_unmounted_isr(uint8_t dev_addr) ATTR_WEAK;
+
+
+#endif
+
 //--------------------------------------------------------------------+
 // USBH-CLASS API
 //--------------------------------------------------------------------+
diff --git a/tinyusb/class/hid_device.c b/tinyusb/class/hid_device.c
index adb252c11..3653e33ae 100644
--- a/tinyusb/class/hid_device.c
+++ b/tinyusb/class/hid_device.c
@@ -67,7 +67,7 @@ STATIC_ hidd_interface_t keyboard_intf =
 };
 #endif
 
-tusb_error_t hidd_control_request(uint8_t coreid, tusb_std_request_t const * p_request)
+tusb_error_t hidd_control_request(uint8_t coreid, tusb_control_request_t const * p_request)
 {
 #if TUSB_CFG_DEVICE_HID_KEYBOARD
   if (p_request->bmRequestType.type == TUSB_REQUEST_TYPE_STANDARD) // standard request to hid
diff --git a/tinyusb/class/hid_device.h b/tinyusb/class/hid_device.h
index d6f962bc8..92f9961aa 100644
--- a/tinyusb/class/hid_device.h
+++ b/tinyusb/class/hid_device.h
@@ -66,7 +66,7 @@ tusb_error_t tusbd_hid_mouse_send_report(tusb_mouse_report_t *p_mouse_report);
 #ifdef _TINY_USB_SOURCE_FILE_
 
 tusb_error_t hidd_init(uint8_t coreid, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);
-tusb_error_t hidd_control_request(uint8_t coreid, tusb_std_request_t const * p_request);
+tusb_error_t hidd_control_request(uint8_t coreid, tusb_control_request_t const * p_request);
 tusb_error_t hidd_configured(void);
 
 #endif
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index be1e7f28d..06b144e3f 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -221,7 +221,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
 //  OSAL_SUBTASK_INVOKED_AND_WAIT(
 //    usbh_control_xfer_subtask(
 //      dev_addr,
-//      &(tusb_std_request_t)
+//      &(tusb_control_request_t)
 //      {
 //        .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_CLASS, .recipient = TUSB_REQUEST_RECIPIENT_INTERFACE },
 //        .bRequest = HID_REQUEST_CONTROL_SET_IDLE,
@@ -238,7 +238,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
 //  OSAL_SUBTASK_INVOKED_AND_WAIT(
 //    usbh_control_xfer_subtask(
 //      dev_addr,
-//      &(tusb_std_request_t)
+//      &(tusb_control_request_t)
 //      {
 //        .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_INTERFACE },
 //        .bRequest      = TUSB_REQUEST_GET_DESCRIPTOR,
diff --git a/tinyusb/core/std_request.h b/tinyusb/core/std_request.h
index 041adb7c8..fcc2c08d7 100644
--- a/tinyusb/core/std_request.h
+++ b/tinyusb/core/std_request.h
@@ -59,7 +59,7 @@
 typedef ATTR_PACKED_STRUCT(struct){
   ATTR_PACKED_STRUCT(struct) {
     uint8_t recipient :  5; /**< Recipient type tusb_std_request_recipient_t. */
-    uint8_t type      :  2; /**< Request type tusb_std_request_type_t.  */
+    uint8_t type      :  2; /**< Request type tusb_control_request_type_t.  */
     uint8_t direction :  1; /**< Direction type. tusb_direction_t */
   } bmRequestType;
 
@@ -67,7 +67,7 @@ typedef ATTR_PACKED_STRUCT(struct){
   uint16_t wValue;
   uint16_t wIndex;
   uint16_t wLength;
-} tusb_std_request_t;
+} tusb_control_request_t;
 
 #ifdef __cplusplus
  }
diff --git a/tinyusb/core/tusb_types.h b/tinyusb/core/tusb_types.h
index 4d4d976e1..2e90369ca 100644
--- a/tinyusb/core/tusb_types.h
+++ b/tinyusb/core/tusb_types.h
@@ -113,7 +113,7 @@ typedef enum {
   TUSB_REQUEST_TYPE_STANDARD = 0,
   TUSB_REQUEST_TYPE_CLASS,
   TUSB_REQUEST_TYPE_VENDOR
-} tusb_std_request_type_t;
+} tusb_control_request_type_t;
 
 typedef enum {
   TUSB_REQUEST_RECIPIENT_DEVICE =0,
diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h
index 2f362f6fd..86e4da656 100644
--- a/tinyusb/device/usbd.h
+++ b/tinyusb/device/usbd.h
@@ -66,7 +66,7 @@
 //--------------------------------------------------------------------+
 typedef struct {
   tusb_error_t (* const init)(uint8_t, tusb_descriptor_interface_t const *, uint16_t*);
-  tusb_error_t (* const control_request) (uint8_t, tusb_std_request_t const *);
+  tusb_error_t (* const control_request) (uint8_t, tusb_control_request_t const *);
 //  void (* const isr) (pipe_handle_t, tusb_event_t);
 //  void (* const close) (uint8_t);
 } device_class_driver_t;
diff --git a/tinyusb/device/usbd_dcd.h b/tinyusb/device/usbd_dcd.h
index bf6ca0d3e..b824012e4 100644
--- a/tinyusb/device/usbd_dcd.h
+++ b/tinyusb/device/usbd_dcd.h
@@ -60,7 +60,7 @@
 typedef struct {
   volatile uint8_t state;
   uint8_t address;
-  tusb_std_request_t setup_packet;
+  tusb_control_request_t setup_packet;
   uint8_t interface2class[USBD_MAX_INTERFACE]; // determine interface number belongs to which class
   uint8_t endpoint_idx2class[USBD_MAX_ENDPOINT]; // determine endpoint index belongs to which class
 }usbd_device_info_t;
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index c1ea9a7ed..401a1256d 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -297,7 +297,7 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
   return TUSB_ERROR_NONE;
 }
 
-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_std_request_t const * p_request, uint8_t data[])
+tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])
 {
   ehci_qhd_t * const p_qhd = get_control_qhd(dev_addr);
 
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 788c989f4..bb6b40455 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -91,7 +91,7 @@ void hcd_isr(uint8_t hostid);
 //--------------------------------------------------------------------+
 // TODO control xfer should be used via usbh layer
 tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size) ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_std_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;
 tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;
 
 pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const * endpoint_desc, uint8_t class_code) ATTR_WARN_UNUSED_RESULT;
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 11c8ec302..43c3b5ae6 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -184,7 +184,7 @@ tusb_error_t usbh_init(void)
 
 //------------- USBH control transfer -------------//
 // function called within a task, requesting os blocking services, subtask input parameter must be static/global variables
-tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_std_request_t const* p_request, uint8_t* data)
+tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_control_request_t const* p_request, uint8_t* data)
 {
   tusb_error_t error;
 
@@ -347,7 +347,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       0,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -368,7 +368,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       0,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_SET_ADDRESS,
@@ -396,7 +396,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       new_addr,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -420,7 +420,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       new_addr,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -438,7 +438,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       new_addr,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -457,7 +457,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT (
     usbh_control_xfer_subtask(
         new_addr,
-        &(tusb_std_request_t)
+        &(tusb_control_request_t)
         {
           .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
           .bRequest = TUSB_REQUEST_SET_CONFIGURATION,
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index 31efcd536..84e4fc930 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -111,7 +111,7 @@ void         tusbh_device_mount_failed_cb(tusb_error_t error, tusb_descriptor_de
 OSAL_TASK_FUNCTION (usbh_enumeration_task) (void* p_task_para);
 tusb_error_t usbh_init(void);
 
-tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_std_request_t const* p_request, uint8_t* data);
+tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_control_request_t const* p_request, uint8_t* data);
 
 #endif
 
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index cda043541..2e251396c 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -98,7 +98,7 @@ typedef struct { // TODO internal structure, re-order members
   //------------- control pipe -------------//
   struct {
     volatile uint8_t pipe_status;
-    tusb_std_request_t request;
+    tusb_control_request_t request;
 
     OSAL_SEM_DEF(semaphore);          // TODO move to semaphore pool ?
     osal_semaphore_handle_t sem_hdl;  // used to synchronize with HCD when control xfer complete