able to build with host msc

10 files changed, 202 insertions, 78 deletions

diff --git a/examples/host/cdc_msc_hid/src/msc_app.c b/examples/host/cdc_msc_hid/src/msc_app.c
new file mode 100644
index 000000000..7235aeca7
--- /dev/null
+++ b/examples/host/cdc_msc_hid/src/msc_app.c
@@ -0,0 +1,125 @@
+/**************************************************************************/
+/*!
+ @file    msc_app.c
+ @author  hathach (tinyusb.org)
+
+ @section LICENSE
+
+ Software License Agreement (BSD License)
+
+ Copyright (c) 2018, hathach (tinyusb.org)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This file is part of the tinyusb stack.
+*/
+/**************************************************************************/
+
+#include "tusb.h"
+
+#if CFG_TUH_MSC
+
+//--------------------------------------------------------------------+
+// MACRO TYPEDEF CONSTANT ENUM DECLARATION
+//--------------------------------------------------------------------+
+
+
+//------------- IMPLEMENTATION -------------//
+void tuh_msc_mounted_cb(uint8_t dev_addr)
+{
+  puts("\na MassStorage device is mounted");
+
+//  //------------- Disk Information -------------//
+//  // SCSI VendorID[8] & ProductID[16] from Inquiry Command
+//  uint8_t const* p_vendor  = tuh_msc_get_vendor_name(dev_addr);
+//  uint8_t const* p_product = tuh_msc_get_product_name(dev_addr);
+//
+//  for(uint8_t i=0; i<8; i++) putchar(p_vendor[i]);
+//
+//  putchar(' ');
+//  for(uint8_t i=0; i<16; i++) putchar(p_product[i]);
+//  putchar('\n');
+//
+//  uint32_t last_lba, block_size;
+//  tuh_msc_get_capacity(dev_addr, &last_lba, &block_size);
+//  printf("Disk Size: %d MB\n", (last_lba+1)/ ((1024*1024)/block_size) );
+//  printf("LBA 0-0x%X  Block Size: %d\n", last_lba, block_size);
+//
+//  //------------- file system (only 1 LUN support) -------------//
+//  uint8_t phy_disk = dev_addr-1;
+//  disk_initialize(phy_disk);
+//
+//  if ( disk_is_ready(phy_disk) )
+//  {
+//    if ( f_mount(phy_disk, &fatfs[phy_disk]) != FR_OK )
+//    {
+//      puts("mount failed");
+//      return;
+//    }
+//
+//    puts("---------------------------------------------------------------------");
+//    puts("- MASSSTORAGE CLASS CLI IS A IMMATURE CODE. DISK-WRITING COMMANDS");
+//    puts("- SUCH AS cp(COPY), mkdir(MAKE DIRECTORY) ARE POTENTIAL TO DAMAGE");
+//    puts("- YOUR USB THUMBDRIVE. USING THOSE COMMANDS ARE AT YOUR OWN RISK.");
+//    puts("- THE AUTHOR HAS NO RESPONSIBILITY WITH YOUR DEVICE NOR ITS DATA");
+//    puts("---------------------------------------------------------------------");
+//
+//    f_chdrive(phy_disk); // change to newly mounted drive
+//    f_chdir("/"); // root as current dir
+//
+//    cli_init();
+//  }
+}
+
+void tuh_msc_unmounted_cb(uint8_t dev_addr)
+{
+  puts("\na MassStorage device is unmounted");
+
+//  uint8_t phy_disk = dev_addr-1;
+//
+//  f_mount(phy_disk, NULL); // unmount disk
+//  disk_deinitialize(phy_disk);
+//
+//  if ( phy_disk == f_get_current_drive() )
+//  { // active drive is unplugged --> change to other drive
+//    for(uint8_t i=0; i<CFG_TUSB_HOST_DEVICE_MAX; i++)
+//    {
+//      if ( disk_is_ready(i) )
+//      {
+//        f_chdrive(i);
+//        cli_init(); // refractor, rename
+//      }
+//    }
+//  }
+}
+
+// invoked ISR context
+void tuh_msc_isr(uint8_t dev_addr, xfer_result_t event, uint32_t xferred_bytes)
+{
+  (void) dev_addr;
+  (void) event;
+  (void) xferred_bytes;
+}
+
+#endif
diff --git a/examples/host/cdc_msc_hid/src/tusb_config.h b/examples/host/cdc_msc_hid/src/tusb_config.h
index ef0b55ef9..6c6540b66 100644
--- a/examples/host/cdc_msc_hid/src/tusb_config.h
+++ b/examples/host/cdc_msc_hid/src/tusb_config.h
@@ -88,7 +88,7 @@
 #define CFG_TUSB_HOST_HID_KEYBOARD      0
 #define CFG_TUSB_HOST_HID_MOUSE         0
 #define CFG_TUSB_HOST_HID_GENERIC       0 // (not yet supported)
-#define CFG_TUH_MSC               0
+#define CFG_TUH_MSC               1
 
 #define CFG_TUSB_HOST_DEVICE_MAX        (CFG_TUH_HUB ? 5 : 1) // normal hub has 4 ports
 
diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index 12bffdf2d..bb4d117e6 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -51,13 +51,14 @@
 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

 //--------------------------------------------------------------------+

-CFG_TUSB_MEM_SECTION STATIC_VAR msch_interface_t msch_data[CFG_TUSB_HOST_DEVICE_MAX];

+CFG_TUSB_MEM_SECTION static msch_interface_t msch_data[CFG_TUSB_HOST_DEVICE_MAX];

 

 //------------- Initalization Data -------------//

+static osal_semaphore_def_t msch_sem_def;

 static osal_semaphore_t msch_sem_hdl;

 

 // buffer used to read scsi information when mounted, largest response data currently is inquiry

-CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) STATIC_VAR uint8_t msch_buffer[sizeof(scsi_inquiry_data_t)];

+CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) static uint8_t msch_buffer[sizeof(scsi_inquiry_resp_t)];

 

 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

@@ -117,11 +118,11 @@ static tusb_error_t msch_command_xfer(msch_interface_t * p_msch, void* p_buffer)
     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.xfer_bytes) );

+      TU_ASSERT_ERR( hcd_pipe_queue_xfer(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.xfer_bytes, false) );

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

     }

   }

 

@@ -136,7 +137,7 @@ tusb_error_t tusbh_msc_inquiry(uint8_t dev_addr, uint8_t lun, uint8_t *p_data)
 

   //------------- Command Block Wrapper -------------//

   msc_cbw_add_signature(&p_msch->cbw, lun);

-  p_msch->cbw.xfer_bytes = sizeof(scsi_inquiry_data_t);

+  p_msch->cbw.total_bytes = sizeof(scsi_inquiry_resp_t);

   p_msch->cbw.dir        = TUSB_DIR_IN_MASK;

   p_msch->cbw.cmd_len    = sizeof(scsi_inquiry_t);

 

@@ -144,7 +145,7 @@ tusb_error_t tusbh_msc_inquiry(uint8_t dev_addr, uint8_t lun, uint8_t *p_data)
   scsi_inquiry_t cmd_inquiry =

   {

       .cmd_code     = SCSI_CMD_INQUIRY,

-      .alloc_length = sizeof(scsi_inquiry_data_t)

+      .alloc_length = sizeof(scsi_inquiry_resp_t)

   };

 

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

@@ -160,7 +161,7 @@ tusb_error_t tusbh_msc_read_capacity10(uint8_t dev_addr, uint8_t lun, uint8_t *p
 

   //------------- Command Block Wrapper -------------//

   msc_cbw_add_signature(&p_msch->cbw, lun);

-  p_msch->cbw.xfer_bytes = sizeof(scsi_read_capacity10_data_t);

+  p_msch->cbw.total_bytes = sizeof(scsi_read_capacity10_resp_t);

   p_msch->cbw.dir        = TUSB_DIR_IN_MASK;

   p_msch->cbw.cmd_len    = sizeof(scsi_read_capacity10_t);

 

@@ -186,7 +187,7 @@ tusb_error_t tuh_msc_request_sense(uint8_t dev_addr, uint8_t lun, uint8_t *p_dat
   msch_interface_t* p_msch = &msch_data[dev_addr-1];

 

   //------------- Command Block Wrapper -------------//

-  p_msch->cbw.xfer_bytes = 18;

+  p_msch->cbw.total_bytes = 18;

   p_msch->cbw.dir        = TUSB_DIR_IN_MASK;

   p_msch->cbw.cmd_len    = sizeof(scsi_request_sense_t);

 

@@ -211,7 +212,7 @@ tusb_error_t tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun,  msc_csw_t *
   //------------- Command Block Wrapper -------------//

   msc_cbw_add_signature(&p_msch->cbw, lun);

 

-  p_msch->cbw.xfer_bytes = 0; // Number of bytes

+  p_msch->cbw.total_bytes = 0; // Number of bytes

   p_msch->cbw.dir        = TUSB_DIR_OUT;

   p_msch->cbw.cmd_len    = sizeof(scsi_test_unit_ready_t);

 

@@ -238,7 +239,7 @@ tusb_error_t  tuh_msc_read10(uint8_t dev_addr, uint8_t lun, void * p_buffer, uin
   //------------- Command Block Wrapper -------------//

   msc_cbw_add_signature(&p_msch->cbw, lun);

 

-  p_msch->cbw.xfer_bytes = p_msch->block_size*block_count; // Number of bytes

+  p_msch->cbw.total_bytes = p_msch->block_size*block_count; // Number of bytes

   p_msch->cbw.dir        = TUSB_DIR_IN_MASK;

   p_msch->cbw.cmd_len    = sizeof(scsi_read10_t);

 

@@ -247,7 +248,7 @@ tusb_error_t  tuh_msc_read10(uint8_t dev_addr, uint8_t lun, void * p_buffer, uin
   {

       .cmd_code    = SCSI_CMD_READ_10,

       .lba         = __n2be(lba),

-      .block_count = u16_le2be(block_count)

+      .block_count = tu_u16_le2be(block_count)

   };

 

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

@@ -264,7 +265,7 @@ tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffe
   //------------- Command Block Wrapper -------------//

   msc_cbw_add_signature(&p_msch->cbw, lun);

 

-  p_msch->cbw.xfer_bytes = p_msch->block_size*block_count; // Number of bytes

+  p_msch->cbw.total_bytes = p_msch->block_size*block_count; // Number of bytes

   p_msch->cbw.dir        = TUSB_DIR_OUT;

   p_msch->cbw.cmd_len    = sizeof(scsi_write10_t);

 

@@ -273,7 +274,7 @@ tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffe
   {

       .cmd_code    = SCSI_CMD_WRITE_10,

       .lba         = __n2be(lba),

-      .block_count = u16_le2be(block_count)

+      .block_count = tu_u16_le2be(block_count)

   };

 

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

@@ -289,15 +290,13 @@ tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffe
 void msch_init(void)

 {

   tu_memclr(msch_data, sizeof(msch_interface_t)*CFG_TUSB_HOST_DEVICE_MAX);

-  msch_sem_hdl = osal_semaphore_create(1, 0);

+  msch_sem_hdl = osal_semaphore_create(&msch_sem_def);

 }

 

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

+bool msch_open_subtask(uint8_t dev_addr, tusb_desc_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 ) )

   {

@@ -310,14 +309,14 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
 

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

   {

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

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

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

+    TU_ASSERT(TUSB_XFER_BULK == p_endpoint->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;

 

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

-    STASK_ASSERT( pipehandle_is_valid(*p_pipe_hdl) );

+    TU_ASSERT( pipehandle_is_valid(*p_pipe_hdl) );

 

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

   }

@@ -327,74 +326,73 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
 

 

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

-  STASK_INVOKE(

-    usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_INTERFACE),

-                               MSC_REQ_GET_MAX_LUN, 0, msch_data[dev_addr-1].interface_number,

-                               1, msch_buffer ),

-    error

-  );

-

-  STASK_ASSERT( TUSB_ERROR_NONE == error /* && TODO STALL means zero */);

+  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,

+        .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];

 

 #if 0

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

-  STASK_INVOKE(

-    usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_INTERFACE),

-                               MSC_REQ_RESET, 0, msch_data[dev_addr-1].interface_number,

-                               0, NULL ),

-    error

-  );

+  request = (tusb_control_request_t) {

+        .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,

+        .wLength = 0

+  };

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

 #endif

 

   enum { SCSI_XFER_TIMEOUT = 2000 };

   //------------- SCSI Inquiry -------------//

   tusbh_msc_inquiry(dev_addr, 0, msch_buffer);

-  osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT, &error);

-  STASK_ASSERT_ERR(error);

+  TU_ASSERT( osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT) );

 

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

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

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

 

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

   tusbh_msc_read_capacity10(dev_addr, 0, msch_buffer);

-  osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT, &error);

-  STASK_ASSERT_ERR(error);

+  TU_ASSERT( osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT));

 

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

-  { // clear stall TODO abstract clear stall function

-    STASK_INVOKE(

-      usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_ENDPOINT),

-                                 TUSB_REQ_CLEAR_FEATURE, 0, hcd_pipe_get_endpoint_addr(msch_data[dev_addr-1].bulk_in),

-                                 0, NULL ),

-      error

-    );

-    STASK_ASSERT_ERR(error);

+  {

+    // 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),

+          .wLength = 0

+    };

+

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

 

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

-    osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT, &error); // wait for SCSI status

-    STASK_ASSERT_ERR(error);

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

 

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

     (void) tuh_msc_request_sense(dev_addr, 0, msch_buffer);

-    osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT, &error);

-    STASK_ASSERT_ERR(error);

+    TU_ASSERT(osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT));

 

     //------------- Re-read SCSI Read Capactity -------------//

     tusbh_msc_read_capacity10(dev_addr, 0, msch_buffer);

-    osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT, &error);

-    STASK_ASSERT_ERR(error);

+    TU_ASSERT(osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT));

   }

 

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

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

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

 

   msch_data[dev_addr-1].is_initialized = true;

   tuh_msc_mounted_cb(dev_addr);

-

-  OSAL_SUBTASK_END

 }

 

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

@@ -406,7 +404,7 @@ void msch_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_byte
       tuh_msc_isr(pipe_hdl.dev_addr, event, xferred_bytes);

     }else

     { // still initializing under open subtask

-      osal_semaphore_post(msch_sem_hdl);

+      osal_semaphore_post(msch_sem_hdl, true);

     }

   }

 }

diff --git a/src/class/msc/msc_host.h b/src/class/msc/msc_host.h
index a408bbeaf..5c5068eb3 100644
--- a/src/class/msc/msc_host.h
+++ b/src/class/msc/msc_host.h
@@ -203,10 +203,11 @@ typedef struct {
   msc_csw_t csw;

 }msch_interface_t;

 

-void         msch_init(void);

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

-void         msch_close(uint8_t dev_addr);

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

+void msch_close(uint8_t dev_addr);

+

 #endif

 

 #ifdef __cplusplus

diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index d30b68a64..c9947a19c 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -294,7 +294,7 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])

+bool  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])

 {

   ehci_qhd_t * const p_qhd = get_control_qhd(dev_addr);

 

@@ -332,7 +332,7 @@ tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t con
 

   p_qhd->qtd_overlay.next.address = (uint32_t) p_setup;

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr)

diff --git a/src/host/hcd.h b/src/host/hcd.h
index efdfb920d..3e3b966d0 100644
--- a/src/host/hcd.h
+++ b/src/host/hcd.h
@@ -128,7 +128,7 @@ void hcd_event_handler(hcd_event_t const* event, bool in_isr);
 //--------------------------------------------------------------------+

 // TODO control xfer should be used via usbh layer

 tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size) ATTR_WARN_UNUSED_RESULT;

-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;

+bool  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;

 tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;

 

 pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_desc_endpoint_t const * endpoint_desc, uint8_t class_code) ATTR_WARN_UNUSED_RESULT;

diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index 91d9b6243..cef0d5dae 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -291,7 +291,7 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])

+bool  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])

 {

   ohci_ed_t* const p_ed = &ohci_data.control[dev_addr].ed;

 

@@ -331,7 +331,7 @@ tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t con
 

   OHCI_REG->command_status_bit.control_list_filled = 1;

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr)

diff --git a/src/host/usbh.c b/src/host/usbh.c
index ad0653cf4..6c3194fdd 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -199,7 +199,7 @@ bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8
   dev->control.request = *request;

   dev->control.pipe_status = 0;

 

-  TU_ASSERT_ERR(hcd_pipe_control_xfer(dev_addr, &dev->control.request, data), false);

+  TU_ASSERT(hcd_pipe_control_xfer(dev_addr, &dev->control.request, data));

   TU_ASSERT(osal_semaphore_wait(dev->control.sem_hdl, OSAL_TIMEOUT_NORMAL));

 

   osal_mutex_unlock(dev->control.mutex_hdl);

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 f39f25022..e17b2ba74 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
@@ -100,7 +100,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,
+  TEST_ASSERT( hcd_pipe_control_xfer(dev_addr,
                         &(tusb_control_request_t) {
                               .bmRequestType_bit = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQ_TYPE_STANDARD, .recipient = TUSB_REQ_RECIPIENT_DEVICE },
                               .bRequest = TUSB_REQ_SET_ADDRESS,
@@ -126,7 +126,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,
+  TEST_ASSERT( hcd_pipe_control_xfer(dev_addr,
                         &(tusb_control_request_t) {
                               .bmRequestType_bit = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQ_TYPE_STANDARD, .recipient = TUSB_REQ_RECIPIENT_DEVICE },
                               .bRequest = TUSB_REQ_SET_ADDRESS,
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 bcea7ac8c..ff1a2c0ac 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
@@ -149,7 +149,7 @@ void test_control_addr0_xfer_get_check_qhd_qtd_mapping(void)
   TEST_ASSERT_STATUS( hcd_pipe_control_open(dev_addr, control_max_packet_size) );
 
   //------------- Code Under TEST -------------//
-  TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
+  TEST_ASSERT( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
 
   p_setup  = &ehci_data.addr0_qtd[0];
   p_data   = &ehci_data.addr0_qtd[1];
@@ -171,7 +171,7 @@ void test_control_addr0_xfer_get_check_qhd_qtd_mapping(void)
 void test_control_xfer_get(void)
 {
   //------------- Code Under TEST -------------//
-  TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
+  TEST_ASSERT( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
 
   TEST_ASSERT_EQUAL_HEX( p_setup, p_control_qhd->qtd_overlay.next.address );
   TEST_ASSERT_EQUAL_HEX( p_setup  , p_control_qhd->p_qtd_list_head);
@@ -206,7 +206,7 @@ void test_control_xfer_get(void)
 void test_control_xfer_set(void)
 {
   //------------- Code Under TEST -------------//
-  TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_set_dev_addr, xfer_data) );
+  TEST_ASSERT( hcd_pipe_control_xfer(dev_addr, &request_set_dev_addr, xfer_data) );
 
   TEST_ASSERT_EQUAL_HEX( p_setup, p_control_qhd->qtd_overlay.next.address );
   TEST_ASSERT_EQUAL_HEX( p_setup  , p_control_qhd->p_qtd_list_head);
@@ -226,7 +226,7 @@ void test_control_xfer_set(void)
 
 void test_control_xfer_complete_isr(void)
 {
-  TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
+  TEST_ASSERT( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
 
   usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, XFER_RESULT_SUCCESS, 18);
 
@@ -245,7 +245,7 @@ void test_control_xfer_complete_isr(void)
 
 void test_control_xfer_error_isr(void)
 {
-  TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
+  TEST_ASSERT( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
 
   usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, XFER_RESULT_FAILED, 0);
 
@@ -264,7 +264,7 @@ void test_control_xfer_error_isr(void)
 
 void test_control_xfer_error_stall(void)
 {
-  TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
+  TEST_ASSERT( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
 
   usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, XFER_RESULT_STALLED, 0);