pass the initialize_cmplt

3 files changed, 25 insertions, 14 deletions

diff --git a/tinyusb/class/cdc_rndis.h b/tinyusb/class/cdc_rndis.h
index e03df1540..6a928a021 100644
--- a/tinyusb/class/cdc_rndis.h
+++ b/tinyusb/class/cdc_rndis.h
@@ -137,7 +137,7 @@ typedef struct {
   uint32_t major_version;
   uint32_t minor_version;
   uint32_t device_flags;
-  uint32_t medium;
+  uint32_t medium; // medium type, is 0x00 for RNDIS_MEDIUM_802_3
   uint32_t max_packet_per_xfer;
   uint32_t max_xfer_size;
   uint32_t packet_alignment_factor;
diff --git a/tinyusb/class/cdc_rndis_host.c b/tinyusb/class/cdc_rndis_host.c
index 3f098c902..1c7d256fc 100644
--- a/tinyusb/class/cdc_rndis_host.c
+++ b/tinyusb/class/cdc_rndis_host.c
@@ -55,10 +55,11 @@
 #define RNDIS_MSG_PAYLOAD_MAX   (1024*4)
 
 static uint8_t msg_notification[TUSB_CFG_HOST_DEVICE_MAX][8] TUSB_CFG_ATTR_USBRAM;
+static uint32_t msg_payload[RNDIS_MSG_PAYLOAD_MAX/4]  TUSB_CFG_ATTR_USBRAM;
+
 STATIC_ rndish_data_t rndish_data[TUSB_CFG_HOST_DEVICE_MAX];
 
 // TODO Microsoft requires message length for any get command must be at least 0x400 bytes
-static uint32_t msg_payload[RNDIS_MSG_PAYLOAD_MAX/4]  TUSB_CFG_ATTR_USBRAM;
 
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
@@ -122,19 +123,19 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
 {
   tusb_error_t error;
 
-  *((rndis_msg_initialize_t*) msg_payload) = (rndis_msg_initialize_t)
-                                            {
-                                                .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
-                                            };
-
   OSAL_SUBTASK_BEGIN
 
   //------------- Send RNDIS Message Initialize -------------//
+  *((rndis_msg_initialize_t*) msg_payload) = (rndis_msg_initialize_t)
+                                              {
+                                                  .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
+                                              };
+
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_INTERFACE),
                                SEND_ENCAPSULATED_COMMAND, 0, p_cdc->interface_number,
@@ -144,9 +145,10 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
   if ( TUSB_ERROR_NONE != error )   SUBTASK_EXIT(error);
 
   //------------- waiting for Response Available notification -------------//
-  (void) hcd_pipe_xfer(p_cdc->pipe_notification, msg_notification[dev_addr], 8, true);
+  (void) hcd_pipe_xfer(p_cdc->pipe_notification, msg_notification[dev_addr-1], 8, true);
   osal_semaphore_wait(rndish_data[dev_addr-1].sem_notification_hdl, OSAL_TIMEOUT_NORMAL, &error);
   if ( TUSB_ERROR_NONE != error )   SUBTASK_EXIT(error);
+  SUBTASK_ASSERT(msg_notification[dev_addr-1][0] == 1);
 
   //------------- Get RNDIS Message Initialize Complete -------------//
   OSAL_SUBTASK_INVOKED_AND_WAIT(
@@ -155,9 +157,17 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
                                RNDIS_MSG_PAYLOAD_MAX, (uint8_t*) msg_payload ),
     error
   );
-
   if ( TUSB_ERROR_NONE != error )   SUBTASK_EXIT(error);
 
+  rndis_msg_initialize_cmplt_t * const p_init_cmpt = (rndis_msg_initialize_cmplt_t *) msg_payload;
+
+   // TODO currently not support multiple data packets per xfer
+  SUBTASK_ASSERT(p_init_cmpt->type == RNDIS_MSG_INITIALIZE_CMPLT && p_init_cmpt->status == RNDIS_STATUS_SUCCESS &&
+                 p_init_cmpt->max_packet_per_xfer == 1 && p_init_cmpt->max_xfer_size <= RNDIS_MSG_PAYLOAD_MAX);
+  rndish_data[dev_addr-1].max_xfer_size = p_init_cmpt->max_xfer_size;
+
+
+
   if ( tusbh_cdc_rndis_mounted_cb )
   {
     tusbh_cdc_rndis_mounted_cb(dev_addr);
diff --git a/tinyusb/class/cdc_rndis_host.h b/tinyusb/class/cdc_rndis_host.h
index 8a2bca397..5ca691587 100644
--- a/tinyusb/class/cdc_rndis_host.h
+++ b/tinyusb/class/cdc_rndis_host.h
@@ -62,6 +62,7 @@
 typedef struct {
   OSAL_SEM_DEF(semaphore_notification);
   osal_semaphore_handle_t sem_notification_hdl;  // used to wait on notification pipe
+  uint32_t max_xfer_size; // got from device's msg initialize complete
 }rndish_data_t;
 
 void rndish_init(void);