4 files changed, 15 insertions, 5 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,