no big deal, only rename tusb_std_request_t to tusb_control_request_t

9 files changed, 19 insertions, 15 deletions

diff --git a/tests/lpc18xx_43xx/test/host/cdc/cdc_callback.h b/tests/lpc18xx_43xx/test/host/cdc/cdc_callback.h
index c5004ee88..8dcfc4eac 100644
--- a/tests/lpc18xx_43xx/test/host/cdc/cdc_callback.h
+++ b/tests/lpc18xx_43xx/test/host/cdc/cdc_callback.h
@@ -58,6 +58,9 @@ void tusbh_cdc_unmounted_isr(uint8_t dev_addr);
 void tusbh_cdc_isr(uint8_t dev_addr, tusb_event_t event);
 void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes);
 
+void tusbh_cdc_rndis_mounted_cb(uint8_t dev_addr) ATTR_WEAK;
+void tusbh_cdc_rndis_unmounted_isr(uint8_t dev_addr) ATTR_WEAK;
+
 
 #ifdef __cplusplus
  }
diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
index 0e661073a..f99ef2ecf 100644
--- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
+++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
@@ -77,9 +77,6 @@ void setUp(void)
   hcd_pipe_open_ExpectAndReturn(dev_addr, p_endpoint_notification, TUSB_CLASS_CDC, pipe_notification);
   hcd_pipe_open_ExpectAndReturn(dev_addr, p_endpoint_out, TUSB_CLASS_CDC, pipe_out);
   hcd_pipe_open_ExpectAndReturn(dev_addr, p_endpoint_in, TUSB_CLASS_CDC, pipe_int);
-  tusbh_cdc_mounted_cb_Expect(dev_addr);
-
-  TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) );
 }
 
 void tearDown(void)
@@ -87,7 +84,11 @@ void tearDown(void)
 
 }
 
-void test_(void)
+//tusb_
+void test_rndis_send_initalize(void)
 {
+//  usbh_control_xfer_subtask_ExpectAndReturn(dev_addr, )
 
+  //------------- Code Under Test -------------//
+  TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) );
 }
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
index 8490feb54..77419736a 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
@@ -99,7 +99,7 @@ void test_addr0_control_close(void)
   TEST_ASSERT_STATUS( hcd_pipe_control_open(dev_addr, control_max_packet_size) );
 
   TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_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_ADDRESS,
                               .wValue   = 3 },
@@ -124,7 +124,7 @@ void test_isr_disconnect_then_async_advance_control_pipe(void)
   TEST_ASSERT_STATUS( hcd_pipe_control_open(dev_addr, control_max_packet_size) );
 
   TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_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_ADDRESS,
                               .wValue   = 3 },
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
index 4b760fe0e..392c5167d 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
@@ -103,7 +103,7 @@ void tearDown(void)
 //--------------------------------------------------------------------+
 // CONTROL TRANSFER
 //--------------------------------------------------------------------+
-tusb_std_request_t request_get_dev_desc =
+tusb_control_request_t request_get_dev_desc =
 {
     .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
     .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -111,7 +111,7 @@ tusb_std_request_t request_get_dev_desc =
     .wLength  = 18
 };
 
-tusb_std_request_t request_set_dev_addr =
+tusb_control_request_t request_set_dev_addr =
 {
     .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
     .bRequest = TUSB_REQUEST_SET_ADDRESS,
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
index c46bd8844..b715d2df2 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
@@ -118,7 +118,7 @@ void test_keyboard_is_supported_ok(void)
   TEST_ASSERT_TRUE( tusbh_hid_keyboard_is_mounted(dev_addr) );
 }
 
-static tusb_error_t stub_set_idle_request(uint8_t address, tusb_std_request_t const* p_request, uint8_t* data, int num_call)
+static tusb_error_t stub_set_idle_request(uint8_t address, tusb_control_request_t const* p_request, uint8_t* data, int num_call)
 {
   TEST_ASSERT_EQUAL( dev_addr, address);
 
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
index 2e9a291f4..c549cf19a 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
@@ -107,7 +107,7 @@ void test_mouse_is_supported_ok(void)
   TEST_ASSERT_TRUE( tusbh_hid_mouse_is_mounted(dev_addr) );
 }
 
-static tusb_error_t stub_set_idle_request(uint8_t address, tusb_std_request_t const* p_request, uint8_t* data, int num_call)
+static tusb_error_t stub_set_idle_request(uint8_t address, tusb_control_request_t const* p_request, uint8_t* data, int num_call)
 {
   TEST_ASSERT_EQUAL( dev_addr, address);
 
diff --git a/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c b/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
index d233c45d4..a4af90ee9 100644
--- a/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
+++ b/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
@@ -62,7 +62,7 @@ tusb_speed_t device_speed = TUSB_SPEED_FULL;
 
 void queue_recv_stub (osal_queue_handle_t const queue_hdl, uint32_t *p_data, uint32_t msec, tusb_error_t *p_error, int num_call);
 void semaphore_wait_success_stub(osal_semaphore_handle_t const sem_hdl, uint32_t msec, tusb_error_t *p_error, int num_call);
-tusb_error_t control_xfer_stub(uint8_t dev_addr, const tusb_std_request_t * const p_request, uint8_t data[], int num_call);
+tusb_error_t control_xfer_stub(uint8_t dev_addr, const tusb_control_request_t * const p_request, uint8_t data[], int num_call);
 
 void setUp(void)
 {
@@ -119,7 +119,7 @@ semaphore_wait_timeout(6)
 semaphore_wait_timeout(7)
 semaphore_wait_timeout(8)
 
-tusb_error_t control_xfer_stub(uint8_t dev_addr, const tusb_std_request_t * const p_request, uint8_t data[], int num_call)
+tusb_error_t control_xfer_stub(uint8_t dev_addr, const tusb_control_request_t * const p_request, uint8_t data[], int num_call)
 {
   switch (num_call)
   {
diff --git a/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c b/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
index 90f7d1824..6b365b90c 100644
--- a/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
+++ b/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
@@ -181,7 +181,7 @@ static void mutex_wait_failed_stub(osal_mutex_handle_t const sem_hdl, uint32_t m
 
 void test_usbh_control_xfer_mutex_failed(void)
 {
-  tusb_std_request_t a_request;
+  tusb_control_request_t a_request;
 
   osal_mutex_wait_StubWithCallback(mutex_wait_failed_stub);
   osal_mutex_release_ExpectAndReturn(usbh_devices[dev_addr].control.mutex_hdl, TUSB_ERROR_NONE);
@@ -192,7 +192,7 @@ void test_usbh_control_xfer_mutex_failed(void)
 
 void test_usbh_control_xfer_ok(void)
 {
-  tusb_std_request_t a_request;
+  tusb_control_request_t a_request;
 
   osal_mutex_wait_StubWithCallback(semaphore_wait_success_stub);
 
diff --git a/tests/support/ehci_controller_fake.c b/tests/support/ehci_controller_fake.c
index 51f149591..36944c8fe 100644
--- a/tests/support/ehci_controller_fake.c
+++ b/tests/support/ehci_controller_fake.c
@@ -71,7 +71,7 @@ void ehci_controller_control_xfer_proceed(uint8_t dev_addr, uint8_t p_data[])
   ehci_qtd_t * p_qtd_data  = p_qtd_setup + 1;
   ehci_qtd_t * p_qtd_status = p_qtd_setup + 2;
 
-  tusb_std_request_t const *p_request = (tusb_std_request_t *) p_qtd_setup->buffer[0];
+  tusb_control_request_t const *p_request = (tusb_control_request_t *) p_qtd_setup->buffer[0];
 
   if (p_request->wLength > 0 && p_request->bmRequestType.direction == TUSB_DIR_DEV_TO_HOST)
   {