start to add msc host, fix dangerous problem with unstable device when plugged --> 200 ms delay. 50ms delay after each port reset

5 files changed, 83 insertions, 18 deletions

diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c
index 8f4bc7e21..c90e84dbb 100644
--- a/tinyusb/class/cdc_host.c
+++ b/tinyusb/class/cdc_host.c
@@ -56,7 +56,7 @@
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
-/*STATIC_*/ cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX];
+/*STATIC_*/ cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX]; // TODO to be static
 
 STATIC_ INLINE_ bool tusbh_cdc_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
 STATIC_ INLINE_ bool tusbh_cdc_is_mounted(uint8_t dev_addr)
@@ -193,7 +193,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
     for(uint32_t i=0; i<2; i++)
     {
       tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) p_desc;
-      ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_CDCH_DESCRIPTOR_CORRUPTED);
+      ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED);
 
       pipe_handle_t * p_pipe_hdl =  ( p_endpoint->bEndpointAddress &  TUSB_DIR_DEV_TO_HOST_MASK ) ?
           &p_cdc->pipe_in : &p_cdc->pipe_out;
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index 60e0ab6d3..e3d74fa12 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -83,12 +83,8 @@ static inline tusb_error_t hidh_interface_open(uint8_t dev_addr, uint8_t interfa
 static inline void hidh_interface_close(uint8_t dev_addr, hidh_interface_info_t *p_hid) ATTR_ALWAYS_INLINE;
 static inline void hidh_interface_close(uint8_t dev_addr, hidh_interface_info_t *p_hid)
 {
-  pipe_handle_t pipe_hdl = p_hid->pipe_hdl;
-  if ( pipehandle_is_valid(pipe_hdl) )
-  {
-    memclr_(p_hid, sizeof(hidh_interface_info_t));
-    ASSERT_INT( TUSB_ERROR_NONE,  hcd_pipe_close(pipe_hdl), VOID_RETURN );
-  }
+  (void) hcd_pipe_close(p_hid->pipe_hdl);
+  memclr_(p_hid, sizeof(hidh_interface_info_t));
 }
 
 // called from public API need to validate parameters
diff --git a/tinyusb/class/msc.h b/tinyusb/class/msc.h
index 53e2e93df..efa137a2b 100644
--- a/tinyusb/class/msc.h
+++ b/tinyusb/class/msc.h
@@ -71,6 +71,11 @@ enum {
   MSC_PROTOCOL_BOT              = 0x50
 };
 
+enum {
+  MSC_REQUEST_GET_MAX_LUN = 254,
+  MSC_REQUEST_RESET       = 255
+};
+
 
 //--------------------------------------------------------------------+
 // SCSI Primary Command (SPC-4)
diff --git a/tinyusb/class/msc_host.c b/tinyusb/class/msc_host.c
index 5d0630813..760bc34f5 100644
--- a/tinyusb/class/msc_host.c
+++ b/tinyusb/class/msc_host.c
@@ -51,6 +51,16 @@
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
 //--------------------------------------------------------------------+
+typedef struct {
+  pipe_handle_t bulk_in, bulk_out;
+  uint8_t interface_number;
+  uint8_t max_lun;
+}msch_interface_t;
+
+/*STATIC_*/ msch_interface_t msch_data[TUSB_CFG_HOST_DEVICE_MAX]; // TODO to be static
+
+// TODO rename this
+STATIC_ uint8_t msch_buffer[10] TUSB_CFG_ATTR_USBRAM;
 
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
@@ -59,13 +69,61 @@
 //--------------------------------------------------------------------+
 // IMPLEMENTATION
 //--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// CLASS-USBH API (don't require to verify parameters)
+//--------------------------------------------------------------------+
 void msch_init(void)
 {
-
+  memclr_(msch_data, sizeof(msch_interface_t)*TUSB_CFG_HOST_DEVICE_MAX);
 }
 
-tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *descriptor, uint16_t *p_length)
+tusb_error_t msch_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 (! ( MSC_SUBCLASS_SCSI == p_interface_desc->bInterfaceSubClass &&
+          MSC_PROTOCOL_BOT  == p_interface_desc->bInterfaceProtocol ) )
+  {
+    return TUSB_ERROR_MSCH_UNSUPPORTED_PROTOCOL;
+  }
+
+  //------------- Open Data Pipe -------------//
+  tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( p_interface_desc );
+  for(uint32_t i=0; i<2; i++)
+  {
+    ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED);
+
+    pipe_handle_t * p_pipe_hdl =  ( p_endpoint->bEndpointAddress &  TUSB_DIR_DEV_TO_HOST_MASK ) ?
+        &msch_data[dev_addr-1].bulk_in : &msch_data[dev_addr-1].bulk_out;
+
+    (*p_pipe_hdl) = hcd_pipe_open(dev_addr, p_endpoint, TUSB_CLASS_MSC);
+    ASSERT ( pipehandle_is_valid(*p_pipe_hdl), TUSB_ERROR_HCD_OPEN_PIPE_FAILED );
+
+    p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( p_endpoint );
+  }
+
+  msch_data[dev_addr-1].interface_number = p_interface_desc->bInterfaceNumber;
+  (*p_length) += sizeof(tusb_descriptor_interface_t) + 2*sizeof(tusb_descriptor_endpoint_t);
+
+  OSAL_SUBTASK_INVOKED_AND_WAIT(
+    usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_INTERFACE),
+                               MSC_REQUEST_GET_MAX_LUN, 0, msch_data[dev_addr-1].interface_number,
+                               1, msch_buffer ),
+    error
+  );
+
+  if(TUSB_ERROR_NONE == error /* TODO STALL means zero */)
+  {
+    msch_data[dev_addr-1].max_lun = msch_buffer[0];
+
+    tusbh_msc_mounted_cb(dev_addr);
+  }
+
+  OSAL_SUBTASK_END
+
   return TUSB_ERROR_NONE;
 }
 
@@ -76,7 +134,10 @@ void msch_isr(pipe_handle_t pipe_hdl, tusb_event_t event)
 
 void msch_close(uint8_t dev_addr)
 {
+  (void) hcd_pipe_close(msch_data[dev_addr-1].bulk_in);
+  (void) hcd_pipe_close(msch_data[dev_addr-1].bulk_out);
 
+  memclr_(&msch_data[dev_addr-1], sizeof(msch_interface_t));
 }
 
 
diff --git a/tinyusb/class/msc_host.h b/tinyusb/class/msc_host.h
index 5d73fb6a6..8f90d8923 100644
--- a/tinyusb/class/msc_host.h
+++ b/tinyusb/class/msc_host.h
@@ -58,14 +58,17 @@
 //--------------------------------------------------------------------+
 // MASS STORAGE Application API
 //--------------------------------------------------------------------+
-bool          tusbh_msc_scsi_is_supported(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;
-tusb_interface_status_t tusbh_msc_scsi_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
+bool          tusbh_msc_is_supported(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;
+tusb_interface_status_t tusbh_msc_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
+
+tusb_error_t  tusbh_msc_inquiry(uint8_t dev_addr, uint8_t instance_num, msc_scsi_inquiry_t * p_inquiry_data) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  tusbh_msc_test_unit_ready(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  tusbh_msc_read_capacity10(uint8_t dev_addr, uint8_t instance_num, msc_scsi_read_capacity10_t * p_buffer) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  tusbh_msc_read10(uint8_t dev_addr, uint8_t instance_num, void * p_buffer, uint32_t length) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  tusbh_msc_write10(uint8_t dev_addr, uint8_t instance_num, void const * p_data, uint32_t length) ATTR_WARN_UNUSED_RESULT;
+//------------- Application Callback -------------//
+void tusbh_msc_mounted_cb(uint8_t dev_addr);
 
-tusb_error_t  tusbh_msc_scsi_inquiry(uint8_t dev_addr, uint8_t instance_num, msc_scsi_inquiry_t * p_inquiry_data) ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  tusbh_msc_scsi_test_unit_ready(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  tusbh_msc_scsi_read_capacity10(uint8_t dev_addr, uint8_t instance_num, msc_scsi_read_capacity10_t * p_buffer) ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  tusbh_msc_scsi_read10(uint8_t dev_addr, uint8_t instance_num, void * p_buffer, uint32_t length) ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  tusbh_msc_scsi_write10(uint8_t dev_addr, uint8_t instance_num, void const * p_data, uint32_t length) ATTR_WARN_UNUSED_RESULT;
 
 //--------------------------------------------------------------------+
 // USBH-CLASS DRIVER API
@@ -73,7 +76,7 @@ tusb_error_t  tusbh_msc_scsi_write10(uint8_t dev_addr, uint8_t instance_num, voi
 #ifdef _TINY_USB_SOURCE_FILE_
 
 void         msch_init(void);
-tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *descriptor, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;
 void         msch_isr(pipe_handle_t pipe_hdl, tusb_event_t event);
 void         msch_close(uint8_t dev_addr);
 #endif