implementing initializing for RNDIS

11 files changed, 132 insertions, 11 deletions

diff --git a/demos/host/src/cdc_serial_app.c b/demos/host/src/cdc_serial_app.c
index 4cb4bc365..93f5f1514 100644
--- a/demos/host/src/cdc_serial_app.c
+++ b/demos/host/src/cdc_serial_app.c
@@ -56,7 +56,7 @@ static osal_queue_handle_t queue_hdl;
 static uint8_t buffer_in[64] TUSB_CFG_ATTR_USBRAM;
 
 //--------------------------------------------------------------------+
-// INTERNAL OBJECT & FUNCTION DECLARATION
+// tinyusb Callbacks
 //--------------------------------------------------------------------+
 void tusbh_cdc_mounted_cb(uint8_t dev_addr)
 {
diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h
index d5eda34ec..d6a0d6162 100644
--- a/demos/host/src/tusb_config.h
+++ b/demos/host/src/tusb_config.h
@@ -78,7 +78,7 @@
 #define TUSB_CFG_HOST_HID_GENERIC   0
 #define TUSB_CFG_HOST_MSC           0
 #define TUSB_CFG_HOST_CDC           1
-#define TUSB_CFG_HOST_CDC_RNDIS     0
+#define TUSB_CFG_HOST_CDC_RNDIS     1
 
 //--------------------------------------------------------------------+
 // DEVICE CONFIGURATION
diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
index 51d3d2ce2..4647f294d 100644
--- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
+++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
@@ -50,6 +50,7 @@
 
 #include "descriptor_cdc.h"
 #include "cdc_host.h"
+#include "cdc_rndis_host.h"
 
 static uint8_t dev_addr;
 static uint16_t length;
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 f99ef2ecf..d919ac304 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
@@ -50,6 +50,7 @@
 
 #include "descriptor_cdc.h"
 #include "cdc_host.h"
+#include "cdc_rndis_host.h"
 
 static uint8_t dev_addr;
 static uint16_t length;
@@ -66,14 +67,33 @@ static pipe_handle_t pipe_int          = { .dev_addr  = 1, .xfer_type = TUSB_XFE
 extern cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX];
 static cdch_data_t * p_cdc = &cdch_data[0];
 
+tusb_control_request_t req_send_cmd =
+{
+    .bmRequestType = {
+        .direction = TUSB_DIR_HOST_TO_DEV,
+        .type      = TUSB_REQUEST_TYPE_CLASS,
+        .recipient = TUSB_REQUEST_RECIPIENT_INTERFACE
+    },
+    .bRequest = SEND_ENCAPSULATED_COMMAND,
+};
+
+
+void stub_mutex_wait(osal_mutex_handle_t mutex_hdl, uint32_t msec, tusb_error_t *p_error, int num_call)
+{
+  *p_error = TUSB_ERROR_NONE;
+}
 
 void setUp(void)
 {
   length = 0;
   dev_addr = 1;
+  req_send_cmd.wIndex = p_comm_interface->bInterfaceNumber;
 
   cdch_init();
 
+  osal_mutex_wait_StubWithCallback(stub_mutex_wait);
+  osal_mutex_release_IgnoreAndReturn(TUSB_ERROR_NONE);
+
   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);
@@ -84,10 +104,38 @@ void tearDown(void)
 
 }
 
-//tusb_
-void test_rndis_send_initalize(void)
+
+rndis_msg_initialize_t msg_init =
+{
+    .type          = RNDIS_MSG_INITIALIZE,
+    .length        = sizeof(rndis_msg_initialize_t),
+    .request_id    = 1, // TODO should use some magic number
+    .major_version = 1,
+    .minor_version = 0,
+    .max_xfer_size = 0x4000 // TODO mimic windows
+};
+
+void test_rndis_send_initalize_failed(void)
 {
-//  usbh_control_xfer_subtask_ExpectAndReturn(dev_addr, )
+  req_send_cmd.wLength = sizeof(rndis_msg_initialize_t);
+  usbh_control_xfer_subtask_ExpectWithArrayAndReturn(dev_addr,
+    &req_send_cmd, 1,
+    (uint8_t*)&msg_init, sizeof(rndis_msg_initialize_t), TUSB_ERROR_OSAL_TIMEOUT);
+
+  tusbh_cdc_rndis_mounted_cb_Expect(dev_addr);
+
+  //------------- Code Under Test -------------//
+  TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) );
+}
+
+void test_rndis_send_initalize_ok(void)
+{
+  req_send_cmd.wLength = sizeof(rndis_msg_initialize_t);
+  usbh_control_xfer_subtask_ExpectWithArrayAndReturn(dev_addr,
+    &req_send_cmd, 1,
+    (uint8_t*)&msg_init, sizeof(rndis_msg_initialize_t), TUSB_ERROR_OSAL_TIMEOUT);
+
+  tusbh_cdc_rndis_mounted_cb_Expect(dev_addr);
 
   //------------- Code Under Test -------------//
   TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) );
diff --git a/tests/support/tusb_config.h b/tests/support/tusb_config.h
index fad061ba7..4b4c83b4e 100644
--- a/tests/support/tusb_config.h
+++ b/tests/support/tusb_config.h
@@ -75,6 +75,7 @@
 #define TUSB_CFG_HOST_HID_KEYBOARD               1
 #define TUSB_CFG_HOST_HID_MOUSE                  1
 #define TUSB_CFG_HOST_CDC                        1
+#define TUSB_CFG_HOST_CDC_RNDIS                  1
 
 #define HOST_HCD_XFER_INTERRUPT
 #define HOST_HCD_XFER_BULK
@@ -105,6 +106,7 @@
 #define TUSB_CFG_DEVICE_MSC           0
 #define TUSB_CFG_DEVICE_CDC           0
 
+
 //--------------------------------------------------------------------+
 // COMMON CONFIGURATION
 //--------------------------------------------------------------------+
diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c
index ac4338853..e0f4501ec 100644
--- a/tinyusb/class/cdc_host.c
+++ b/tinyusb/class/cdc_host.c
@@ -47,6 +47,7 @@
 //--------------------------------------------------------------------+
 #include "common/common.h"
 #include "cdc_host.h"
+#include "cdc_rndis_host.h"
 
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
@@ -128,6 +129,9 @@ void cdch_init(void)
 
 tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length)
 {
+  tusb_error_t error;
+
+  OSAL_SUBTASK_BEGIN
 
   if ( CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL != p_interface_desc->bInterfaceSubClass)
   {
@@ -194,13 +198,23 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
     }
   }
 
+#if TUSB_CFG_HOST_CDC_RNDIS // TODO move to rndis_host.c
+  //------------- RNDIS -------------//
+  if ( 0xff == p_cdc->interface_protocol )
+  {
+    OSAL_SUBTASK_INVOKED_AND_WAIT( rndish_open_subtask(dev_addr, p_cdc), error );
+  }
+
+  if ( TUSB_ERROR_NONE != error ) // device is not an rndis
+#endif
+
   // FIXME mounted class flag is not set yet
   if (tusbh_cdc_mounted_cb)
   {
     tusbh_cdc_mounted_cb(dev_addr);
   }
 
-  return TUSB_ERROR_NONE;
+  OSAL_SUBTASK_END
 }
 
 void cdch_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes)
@@ -232,6 +246,10 @@ void cdch_close(uint8_t dev_addr)
     err3 = hcd_pipe_close(p_cdc->pipe_out);
   }
 
+#if TUSB_CFG_HOST_CDC_RNDIS
+
+#endif
+
   memclr_(p_cdc, sizeof(cdch_data_t));
 
   if (tusbh_cdc_unmounted_isr)
diff --git a/tinyusb/class/cdc_rndis_host.c b/tinyusb/class/cdc_rndis_host.c
index 3ba2db7a3..ebb3285bb 100644
--- a/tinyusb/class/cdc_rndis_host.c
+++ b/tinyusb/class/cdc_rndis_host.c
@@ -52,6 +52,7 @@
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
 //--------------------------------------------------------------------+
+static uint8_t msg_notification[TUSB_CFG_HOST_DEVICE_MAX][8] TUSB_CFG_ATTR_USBRAM;
 
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
@@ -90,4 +91,46 @@ static tusb_error_t rndis_body_subtask(void)
   OSAL_SUBTASK_END
 }
 
+
+
+tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
+{
+  tusb_error_t error;
+
+  static rndis_msg_initialize_t msg_init =
+  {
+      .type          = RNDIS_MSG_INITIALIZE,
+      .length        = sizeof(rndis_msg_initialize_t),
+      .request_id    = 1, // TODO should use some magic number
+      .major_version = 1,
+      .minor_version = 0,
+      .max_xfer_size = 0x4000 // TODO mimic windows
+  };
+
+  static tusb_control_request_t control_request =
+  {
+      .bmRequestType = {
+          .direction = TUSB_DIR_HOST_TO_DEV,
+          .type      = TUSB_REQUEST_TYPE_CLASS,
+          .recipient = TUSB_REQUEST_RECIPIENT_INTERFACE
+      },
+      .bRequest = SEND_ENCAPSULATED_COMMAND,
+      .wLength   = sizeof(rndis_msg_initialize_t)
+//      .wIndex   = p_cdc->interface_number,
+  };
+
+  OSAL_SUBTASK_BEGIN
+
+  control_request.wIndex   = p_cdc->interface_number;
+
+  OSAL_SUBTASK_INVOKED_AND_WAIT ( usbh_control_xfer_subtask(dev_addr, &control_request, (uint8_t*)&msg_init), error ) ;
+
+  if ( tusbh_cdc_rndis_mounted_cb )
+  {
+    tusbh_cdc_rndis_mounted_cb(dev_addr);
+  }
+
+  OSAL_SUBTASK_END
+}
+
 #endif
diff --git a/tinyusb/class/cdc_rndis_host.h b/tinyusb/class/cdc_rndis_host.h
index a61866479..ce8e4bced 100644
--- a/tinyusb/class/cdc_rndis_host.h
+++ b/tinyusb/class/cdc_rndis_host.h
@@ -54,6 +54,7 @@
  extern "C" {
 #endif
 
+tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) ATTR_WARN_UNUSED_RESULT;
 
 #ifdef __cplusplus
  }
diff --git a/tinyusb/core/tusb_types.h b/tinyusb/core/tusb_types.h
index 2e90369ca..d5708d77f 100644
--- a/tinyusb/core/tusb_types.h
+++ b/tinyusb/core/tusb_types.h
@@ -196,6 +196,7 @@ typedef enum tusb_device_state_{
 }tusb_device_state_t;
 
 typedef enum {
+  TUSB_EVENT_NONE = 0,
   TUSB_EVENT_XFER_COMPLETE,
   TUSB_EVENT_XFER_ERROR,
   TUSB_EVENT_XFER_STALLED,
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 06c95f4fe..7e7de66d2 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -184,6 +184,8 @@ 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, uint8_t bmRequestType, uint8_t bRequest,
+//                                       uint16_t wValue, uint16_t wIndex, uint16_t wLength, 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;
@@ -195,15 +197,16 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_control_request_t
 
   usbh_devices[dev_addr].control.request = *p_request;
   /*SUBTASK_ASSERT_STATUS*/ (void) ( hcd_pipe_control_xfer(dev_addr, &usbh_devices[dev_addr].control.request, data) );
-  usbh_devices[dev_addr].control.pipe_status = TUSB_INTERFACE_STATUS_BUSY;
+  usbh_devices[dev_addr].control.pipe_status = 0;
 
   osal_semaphore_wait(usbh_devices[dev_addr].control.sem_hdl, OSAL_TIMEOUT_NORMAL, &error); // careful of local variable without static
 
   osal_mutex_release(usbh_devices[dev_addr].control.mutex_hdl);
 
   // TODO make handler for this function general purpose
-  SUBTASK_ASSERT_WITH_HANDLER(TUSB_ERROR_NONE == error && usbh_devices[dev_addr].control.pipe_status != TUSB_INTERFACE_STATUS_ERROR,
-                                     tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
+  SUBTASK_ASSERT_WITH_HANDLER(TUSB_ERROR_NONE == error &&
+                              TUSB_EVENT_XFER_COMPLETE == usbh_devices[dev_addr].control.pipe_status,
+                              tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
 
   OSAL_SUBTASK_END
 }
@@ -241,7 +244,7 @@ void usbh_xfer_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_event_t even
   uint8_t class_index = std_class_code_to_index(class_code);
   if (TUSB_XFER_CONTROL == pipe_hdl.xfer_type)
   {
-    usbh_devices[ pipe_hdl.dev_addr ].control.pipe_status = (event == TUSB_EVENT_XFER_COMPLETE) ? TUSB_INTERFACE_STATUS_COMPLETE : TUSB_INTERFACE_STATUS_ERROR;
+    usbh_devices[ pipe_hdl.dev_addr ].control.pipe_status = event;
     osal_semaphore_post( usbh_devices[ pipe_hdl.dev_addr ].control.sem_hdl );
   }else if (usbh_class_drivers[class_index].isr)
   {
@@ -451,7 +454,9 @@ tusb_error_t enumeration_body_subtask(void)
 
       if (usbh_class_drivers[class_index].open_subtask)      // supported class
       {
-        uint16_t length=0;
+        static uint16_t length;
+        length = 0;
+
         OSAL_SUBTASK_INVOKED_AND_WAIT ( // parameters in task/sub_task must be static storage (static or global)
             usbh_class_drivers[class_index].open_subtask( new_addr, (tusb_descriptor_interface_t*) p_desc, &length ),
             error
diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h
index 7f61731bb..e15bdd1a6 100644
--- a/tinyusb/osal/osal.h
+++ b/tinyusb/osal/osal.h
@@ -93,6 +93,8 @@ tusb_error_t osal_task_create(osal_task_t *task);
 #define OSAL_TASK_FUNCTION(task_name) \
     void task_name
 
+void osal_task_delay(uint32_t msec);
+
 #define OSAL_TASK_LOOP_BEGIN
 #define OSAL_TASK_LOOP_END