host msc built but got hardfault with inquiry command

3 files changed, 61 insertions, 52 deletions

diff --git a/src/class/cdc/cdc_host.h b/src/class/cdc/cdc_host.h
index 8d0b1d28d..192842dfa 100644
--- a/src/class/cdc/cdc_host.h
+++ b/src/class/cdc/cdc_host.h
@@ -127,7 +127,7 @@ void tuh_cdc_xfer_isr(uint8_t dev_addr, xfer_result_t event, cdc_pipeid_t pipe_i
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void cdch_init(void);

-bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length);

+bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *itf_desc, uint16_t *p_length);

 void cdch_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);

 void cdch_close(uint8_t dev_addr);

 

diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index 4f5f0c599..f2b4deb73 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -76,7 +76,7 @@ bool tuh_msc_is_mounted(uint8_t dev_addr)
 bool tuh_msc_is_busy(uint8_t dev_addr)

 {

   return  msch_data[dev_addr-1].is_initialized &&

-          hcd_pipe_is_busy(msch_data[dev_addr-1].bulk_in);

+          hcd_pipe_is_busy(dev_addr, msch_data[dev_addr-1].bulk_in);

 }

 

 uint8_t const* tuh_msc_get_vendor_name(uint8_t dev_addr)

@@ -110,23 +110,22 @@ static inline void msc_cbw_add_signature(msc_cbw_t *p_cbw, uint8_t lun)
   p_cbw->lun        = lun;

 }

 

-static tusb_error_t msch_command_xfer(msch_interface_t * p_msch, void* p_buffer) ATTR_WARN_UNUSED_RESULT;

-static tusb_error_t msch_command_xfer(msch_interface_t * p_msch, void* p_buffer)

+static tusb_error_t msch_command_xfer(uint8_t dev_addr, msch_interface_t * p_msch, void* p_buffer)

 {

   if ( NULL != p_buffer)

   { // there is data phase

     if (p_msch->cbw.dir & TUSB_DIR_IN_MASK)

     {

-      TU_ASSERT_ERR( hcd_pipe_xfer(p_msch->bulk_out, (uint8_t*) &p_msch->cbw, sizeof(msc_cbw_t), false) );

-      TU_ASSERT_ERR( hcd_pipe_queue_xfer(p_msch->bulk_in , p_buffer, p_msch->cbw.total_bytes) );

+      TU_ASSERT_ERR( hcd_pipe_xfer(dev_addr, p_msch->bulk_out, (uint8_t*) &p_msch->cbw, sizeof(msc_cbw_t), false) );

+      TU_ASSERT_ERR( hcd_pipe_queue_xfer(dev_addr, p_msch->bulk_in , p_buffer, p_msch->cbw.total_bytes) );

     }else

     {

-      TU_ASSERT_ERR( hcd_pipe_queue_xfer(p_msch->bulk_out, (uint8_t*) &p_msch->cbw, sizeof(msc_cbw_t)) );

-      TU_ASSERT_ERR( hcd_pipe_xfer(p_msch->bulk_out , p_buffer, p_msch->cbw.total_bytes, false) );

+      TU_ASSERT_ERR( hcd_pipe_queue_xfer(dev_addr, p_msch->bulk_out, (uint8_t*) &p_msch->cbw, sizeof(msc_cbw_t)) );

+      TU_ASSERT_ERR( hcd_pipe_xfer(dev_addr, p_msch->bulk_out , p_buffer, p_msch->cbw.total_bytes, false) );

     }

   }

 

-  TU_ASSERT_ERR( hcd_pipe_xfer(p_msch->bulk_in , (uint8_t*) &p_msch->csw, sizeof(msc_csw_t), true) );

+  TU_ASSERT_ERR( hcd_pipe_xfer(dev_addr, p_msch->bulk_in , (uint8_t*) &p_msch->csw, sizeof(msc_csw_t), true) );

 

   return TUSB_ERROR_NONE;

 }

@@ -150,7 +149,7 @@ tusb_error_t tusbh_msc_inquiry(uint8_t dev_addr, uint8_t lun, uint8_t *p_data)
 

   memcpy(p_msch->cbw.command, &cmd_inquiry, p_msch->cbw.cmd_len);

 

-  TU_ASSERT_ERR ( msch_command_xfer(p_msch, p_data) );

+  TU_ASSERT_ERR ( msch_command_xfer(dev_addr, p_msch, p_data) );

 

   return TUSB_ERROR_NONE;

 }

@@ -175,7 +174,7 @@ tusb_error_t tusbh_msc_read_capacity10(uint8_t dev_addr, uint8_t lun, uint8_t *p
 

   memcpy(p_msch->cbw.command, &cmd_read_capacity10, p_msch->cbw.cmd_len);

 

-  TU_ASSERT_ERR ( msch_command_xfer(p_msch, p_data) );

+  TU_ASSERT_ERR ( msch_command_xfer(dev_addr, p_msch, p_data) );

 

   return TUSB_ERROR_NONE;

 }

@@ -200,7 +199,7 @@ tusb_error_t tuh_msc_request_sense(uint8_t dev_addr, uint8_t lun, uint8_t *p_dat
 

   memcpy(p_msch->cbw.command, &cmd_request_sense, p_msch->cbw.cmd_len);

 

-  TU_ASSERT_ERR ( msch_command_xfer(p_msch, p_data) );

+  TU_ASSERT_ERR ( msch_command_xfer(dev_addr, p_msch, p_data) );

 

   return TUSB_ERROR_NONE;

 }

@@ -226,8 +225,8 @@ tusb_error_t tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun,  msc_csw_t *
   memcpy(p_msch->cbw.command, &cmd_test_unit_ready, p_msch->cbw.cmd_len);

 

   // TODO MSCH refractor test uinit ready

-  TU_ASSERT_ERR( hcd_pipe_xfer(p_msch->bulk_out, (uint8_t*) &p_msch->cbw, sizeof(msc_cbw_t), false) );

-  TU_ASSERT_ERR( hcd_pipe_xfer(p_msch->bulk_in , (uint8_t*) p_csw, sizeof(msc_csw_t), true) );

+  TU_ASSERT_ERR( hcd_pipe_xfer(dev_addr, p_msch->bulk_out, (uint8_t*) &p_msch->cbw, sizeof(msc_cbw_t), false) );

+  TU_ASSERT_ERR( hcd_pipe_xfer(dev_addr, p_msch->bulk_in , (uint8_t*) p_csw, sizeof(msc_csw_t), true) );

 

   return TUSB_ERROR_NONE;

 }

@@ -253,7 +252,7 @@ tusb_error_t  tuh_msc_read10(uint8_t dev_addr, uint8_t lun, void * p_buffer, uin
 

   memcpy(p_msch->cbw.command, &cmd_read10, p_msch->cbw.cmd_len);

 

-  TU_ASSERT_ERR ( msch_command_xfer(p_msch, p_buffer));

+  TU_ASSERT_ERR ( msch_command_xfer(dev_addr, p_msch, p_buffer));

 

   return TUSB_ERROR_NONE;

 }

@@ -279,7 +278,7 @@ tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffe
 

   memcpy(p_msch->cbw.command, &cmd_write10, p_msch->cbw.cmd_len);

 

-  TU_ASSERT_ERR ( msch_command_xfer(p_msch, (void*) p_buffer));

+  TU_ASSERT_ERR ( msch_command_xfer(dev_addr, p_msch, (void*) p_buffer));

 

   return TUSB_ERROR_NONE;

 }

@@ -293,47 +292,52 @@ void msch_init(void)
   msch_sem_hdl = osal_semaphore_create(&msch_sem_def);

 }

 

-bool msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)

+bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *itf_desc, uint16_t *p_length)

 {

-  if (! ( MSC_SUBCLASS_SCSI == p_interface_desc->bInterfaceSubClass &&

-          MSC_PROTOCOL_BOT  == p_interface_desc->bInterfaceProtocol ) )

-  {

-    return TUSB_ERROR_MSC_UNSUPPORTED_PROTOCOL;

-  }

+  TU_VERIFY (MSC_SUBCLASS_SCSI == itf_desc->bInterfaceSubClass &&

+             MSC_PROTOCOL_BOT  == itf_desc->bInterfaceProtocol);

+

+  msch_interface_t* p_msc = &msch_data[dev_addr-1];

 

   //------------- Open Data Pipe -------------//

-  tusb_desc_endpoint_t const *p_endpoint;

-  p_endpoint = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc );

+  tusb_desc_endpoint_t const * ep_desc = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*) itf_desc );

 

   for(uint32_t i=0; i<2; i++)

   {

-    TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType);

-    TU_ASSERT(TUSB_XFER_BULK == p_endpoint->bmAttributes.xfer);

+    TU_ASSERT(TUSB_DESC_ENDPOINT == ep_desc->bDescriptorType);

+    TU_ASSERT(TUSB_XFER_BULK == ep_desc->bmAttributes.xfer);

 

-    pipe_handle_t * p_pipe_hdl =  ( p_endpoint->bEndpointAddress &  TUSB_DIR_IN_MASK ) ?

-        &msch_data[dev_addr-1].bulk_in : &msch_data[dev_addr-1].bulk_out;

+    pipe_handle_t * p_pipe_hdl =  ( ep_desc->bEndpointAddress &  TUSB_DIR_IN_MASK ) ?

+        &p_msc->bulk_in : &p_msc->bulk_out;

 

-    (*p_pipe_hdl) = hcd_pipe_open(dev_addr, p_endpoint, TUSB_CLASS_MSC);

+    (*p_pipe_hdl) = hcd_pipe_open(dev_addr, ep_desc, TUSB_CLASS_MSC);

     TU_ASSERT( pipehandle_is_valid(*p_pipe_hdl) );

 

-    p_endpoint = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*)  p_endpoint );

+    if ( edpt_dir(ep_desc->bEndpointAddress) ==  TUSB_DIR_IN )

+    {

+      p_msc->ep_in = ep_desc->bEndpointAddress;

+    }else

+    {

+      p_msc->ep_out = ep_desc->bEndpointAddress;

+    }

+

+    ep_desc = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*)  ep_desc );

   }

 

-  msch_data[dev_addr-1].interface_number = p_interface_desc->bInterfaceNumber;

+  p_msc->itf_numr = itf_desc->bInterfaceNumber;

   (*p_length) += sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);

 

-

   //------------- Get Max Lun -------------//

   tusb_control_request_t request = {

         .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_INTERFACE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_IN },

         .bRequest = MSC_REQ_GET_MAX_LUN,

         .wValue = 0,

-        .wIndex = msch_data[dev_addr-1].interface_number,

+        .wIndex = p_msc->itf_numr,

         .wLength = 1

   };

   // TODO STALL means zero

   TU_ASSERT( usbh_control_xfer( dev_addr, &request, msch_buffer ) );

-  msch_data[dev_addr-1].max_lun = msch_buffer[0];

+  p_msc->max_lun = msch_buffer[0];

 

 #if 0

   //------------- Reset -------------//

@@ -341,7 +345,7 @@ bool msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interfac
         .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_INTERFACE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_OUT },

         .bRequest = MSC_REQ_RESET,

         .wValue = 0,

-        .wIndex = msch_data[dev_addr-1].interface_number,

+        .wIndex = p_msc->itf_numr,

         .wLength = 0

   };

   TU_ASSERT( usbh_control_xfer( dev_addr, &request, NULL ) );

@@ -352,8 +356,8 @@ bool msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interfac
   tusbh_msc_inquiry(dev_addr, 0, msch_buffer);

   TU_ASSERT( osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT) );

 

-  memcpy(msch_data[dev_addr-1].vendor_id , ((scsi_inquiry_resp_t*) msch_buffer)->vendor_id , 8);

-  memcpy(msch_data[dev_addr-1].product_id, ((scsi_inquiry_resp_t*) msch_buffer)->product_id, 16);

+  memcpy(p_msc->vendor_id , ((scsi_inquiry_resp_t*) msch_buffer)->vendor_id , 8);

+  memcpy(p_msc->product_id, ((scsi_inquiry_resp_t*) msch_buffer)->product_id, 16);

 

   //------------- SCSI Read Capacity 10 -------------//

   tusbh_msc_read_capacity10(dev_addr, 0, msch_buffer);

@@ -361,20 +365,20 @@ bool msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interfac
 

   // NOTE: my toshiba thumb-drive stall the first Read Capacity and require the sequence

   // Read Capacity --> Stalled --> Clear Stall --> Request Sense --> Read Capacity (2) to work

-  if ( hcd_pipe_is_stalled(msch_data[dev_addr-1].bulk_in) )

+  if ( hcd_pipe_is_stalled(dev_addr, p_msc->bulk_in) )

   {

     // clear stall TODO abstract clear stall function

     request = (tusb_control_request_t) {

       .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_ENDPOINT, .type = TUSB_REQ_TYPE_STANDARD, .direction = TUSB_DIR_OUT },

           .bRequest = TUSB_REQ_CLEAR_FEATURE,

           .wValue = 0,

-          .wIndex = hcd_pipe_get_endpoint_addr(msch_data[dev_addr-1].bulk_in), // FIXME use ep addr

+          .wIndex = p_msc->ep_in,

           .wLength = 0

     };

 

     TU_ASSERT(usbh_control_xfer( dev_addr, &request, NULL ));

 

-    hcd_pipe_clear_stall(msch_data[dev_addr-1].bulk_in);

+    hcd_pipe_clear_stall(dev_addr, p_msc->bulk_in);

     TU_ASSERT( osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT) ); // wait for SCSI status

 

     //------------- SCSI Request Sense -------------//

@@ -386,22 +390,24 @@ bool msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interfac
     TU_ASSERT(osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT));

   }

 

-  msch_data[dev_addr-1].last_lba   = __be2n( ((scsi_read_capacity10_resp_t*)msch_buffer)->last_lba );

-  msch_data[dev_addr-1].block_size = (uint16_t) __be2n( ((scsi_read_capacity10_resp_t*)msch_buffer)->block_size );

+  p_msc->last_lba   = __be2n( ((scsi_read_capacity10_resp_t*)msch_buffer)->last_lba );

+  p_msc->block_size = (uint16_t) __be2n( ((scsi_read_capacity10_resp_t*)msch_buffer)->block_size );

+

+  p_msc->is_initialized = true;

 

-  msch_data[dev_addr-1].is_initialized = true;

   tuh_msc_mounted_cb(dev_addr);

 

   return true;

 }

 

-void msch_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes)

+void msch_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)

 {

-  if ( pipehandle_is_equal(pipe_hdl, msch_data[pipe_hdl.dev_addr-1].bulk_in) )

+  msch_interface_t* p_msc = &msch_data[dev_addr-1];

+  if ( ep_addr == p_msc->ep_in )

   {

-    if (msch_data[pipe_hdl.dev_addr-1].is_initialized)

+    if (p_msc->is_initialized)

     {

-      tuh_msc_isr(pipe_hdl.dev_addr, event, xferred_bytes);

+      tuh_msc_isr(dev_addr, event, xferred_bytes);

     }else

     { // still initializing under open subtask

       osal_semaphore_post(msch_sem_hdl, true);

@@ -411,8 +417,8 @@ void msch_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_byte
 

 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);

+  (void) hcd_pipe_close(TUH_OPT_RHPORT, dev_addr, msch_data[dev_addr-1].bulk_in);

+  (void) hcd_pipe_close(TUH_OPT_RHPORT, dev_addr, msch_data[dev_addr-1].bulk_out);

 

   tu_memclr(&msch_data[dev_addr-1], sizeof(msch_interface_t));

   osal_semaphore_reset(msch_sem_hdl);

diff --git a/src/class/msc/msc_host.h b/src/class/msc/msc_host.h
index 5c5068eb3..a77b494ed 100644
--- a/src/class/msc/msc_host.h
+++ b/src/class/msc/msc_host.h
@@ -189,7 +189,10 @@ void tuh_msc_isr(uint8_t dev_addr, xfer_result_t event, uint32_t xferred_bytes);
 

 typedef struct {

   pipe_handle_t bulk_in, bulk_out;

-  uint8_t  interface_number;

+

+  uint8_t itf_numr;

+  uint8_t  ep_in;

+  uint8_t  ep_out;

 

   uint8_t  max_lun;

   uint16_t block_size;

@@ -204,8 +207,8 @@ typedef struct {
 }msch_interface_t;

 

 void msch_init(void);

-bool msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

-void msch_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes);

+bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *itf_desc, uint16_t *p_length);

+void msch_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);

 void msch_close(uint8_t dev_addr);

 

 #endif