Merge pull request #21 from hathach/devlocal

Devlocal

11 files changed, 86 insertions, 87 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index d477a0d23..7ec7a1eb2 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -229,16 +229,14 @@ void cdcd_reset(uint8_t rhport)
   }

 }

 

-tusb_error_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length)

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

 {

-  if ( CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL != p_interface_desc->bInterfaceSubClass) return TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS;

+  // Only support ACM subclass

+  TU_ASSERT ( CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL == itf_desc->bInterfaceSubClass);

 

   // Only support AT commands, no protocol and vendor specific commands.

-  if ( !(tu_within(CDC_COMM_PROTOCOL_NONE, p_interface_desc->bInterfaceProtocol, CDC_COMM_PROTOCOL_ATCOMMAND_CDMA) ||

-         p_interface_desc->bInterfaceProtocol == 0xff ) )

-  {

-    return TUSB_ERROR_CDC_UNSUPPORTED_PROTOCOL;

-  }

+  TU_ASSERT(tu_within(CDC_COMM_PROTOCOL_NONE, itf_desc->bInterfaceProtocol, CDC_COMM_PROTOCOL_ATCOMMAND_CDMA) ||

+            itf_desc->bInterfaceProtocol == 0xff);

 

   // Find available interface

   cdcd_interface_t * p_cdc = NULL;

@@ -250,49 +248,51 @@ tusb_error_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface
       break;

     }

   }

+  TU_ASSERT(p_cdc);

 

   //------------- Control Interface -------------//

-  p_cdc->itf_num  = p_interface_desc->bInterfaceNumber;

+  p_cdc->itf_num = itf_desc->bInterfaceNumber;

 

-  uint8_t const * p_desc = descriptor_next ( (uint8_t const *) p_interface_desc );

+  uint8_t const * p_desc = tu_desc_next( itf_desc );

   (*p_length) = sizeof(tusb_desc_interface_t);

 

   // Communication Functional Descriptors

-  while( TUSB_DESC_CLASS_SPECIFIC == p_desc[DESC_OFFSET_TYPE] )

+  while ( TUSB_DESC_CLASS_SPECIFIC == tu_desc_type(p_desc) )

   {

-    (*p_length) += p_desc[DESC_OFFSET_LEN];

-    p_desc = descriptor_next(p_desc);

+    (*p_length) += tu_desc_len(p_desc);

+    p_desc = tu_desc_next(p_desc);

   }

 

-  if ( TUSB_DESC_ENDPOINT == p_desc[DESC_OFFSET_TYPE])

-  { // notification endpoint if any

-    TU_ASSERT( dcd_edpt_open(rhport, (tusb_desc_endpoint_t const *) p_desc), TUSB_ERROR_DCD_OPEN_PIPE_FAILED);

+  if ( TUSB_DESC_ENDPOINT == tu_desc_type(p_desc) )

+  {

+    // notification endpoint if any

+    TU_ASSERT( dcd_edpt_open(rhport, (tusb_desc_endpoint_t const *) p_desc) );

 

     p_cdc->ep_notif = ((tusb_desc_endpoint_t const *) p_desc)->bEndpointAddress;

 

     (*p_length) += p_desc[DESC_OFFSET_LEN];

-    p_desc = descriptor_next(p_desc);

+    p_desc = tu_desc_next(p_desc);

   }

 

   //------------- Data Interface (if any) -------------//

   if ( (TUSB_DESC_INTERFACE == p_desc[DESC_OFFSET_TYPE]) &&

        (TUSB_CLASS_CDC_DATA == ((tusb_desc_interface_t const *) p_desc)->bInterfaceClass) )

   {

-    // next to endpoint descritpor

-    (*p_length) += p_desc[DESC_OFFSET_LEN];

-    p_desc = descriptor_next(p_desc);

+    // next to endpoint descriptor

+    (*p_length) += tu_desc_len(p_desc);

+    p_desc = tu_desc_next(p_desc);

 

     // Open endpoint pair with usbd helper

     tusb_desc_endpoint_t const *p_desc_ep = (tusb_desc_endpoint_t const *) p_desc;

-    TU_ASSERT_ERR( usbd_open_edpt_pair(rhport, p_desc_ep, TUSB_XFER_BULK, &p_cdc->ep_out, &p_cdc->ep_in) );

+    TU_ASSERT( usbd_open_edpt_pair(rhport, p_desc_ep, TUSB_XFER_BULK, &p_cdc->ep_out, &p_cdc->ep_in) );

 

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

   }

 

   // Prepare for incoming data

-  TU_ASSERT( dcd_edpt_xfer(rhport, p_cdc->ep_out, p_cdc->epout_buf, CFG_TUD_CDC_EPSIZE), TUSB_ERROR_DCD_EDPT_XFER);

+  TU_ASSERT( dcd_edpt_xfer(rhport, p_cdc->ep_out, p_cdc->epout_buf, CFG_TUD_CDC_EPSIZE) );

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 // Invoked when class request DATA stage is finished.

@@ -346,9 +346,10 @@ bool cdcd_control_request(uint8_t rhport, tusb_control_request_t const * request
       //        This signal corresponds to V.24 signal 105 and RS-232 signal RTS (Request to Send)

       p_cdc->line_state = (uint8_t) request->wValue;

 

+      usbd_control_status(rhport, request);

+

       // Invoke callback

       if ( tud_cdc_line_state_cb) tud_cdc_line_state_cb(itf, BIT_TEST_(request->wValue, 0), BIT_TEST_(request->wValue, 1));

-      usbd_control_status(rhport, request);

     break;

 

     default: return false; // stall unsupported request

@@ -357,7 +358,7 @@ bool cdcd_control_request(uint8_t rhport, tusb_control_request_t const * request
   return true;

 }

 

-tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes)

+bool cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes)

 {

   (void) result;

 

@@ -382,13 +383,13 @@ tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result,
     // invoke receive callback (if there is still data)

     if (tud_cdc_rx_cb && tu_fifo_count(&p_cdc->rx_ff) ) tud_cdc_rx_cb(itf);

 

-    // prepare for next

-    TU_ASSERT( dcd_edpt_xfer(rhport, p_cdc->ep_out, p_cdc->epout_buf, CFG_TUD_CDC_EPSIZE), TUSB_ERROR_DCD_EDPT_XFER );

+    // prepare for incoming data

+    TU_ASSERT( dcd_edpt_xfer(rhport, p_cdc->ep_out, p_cdc->epout_buf, CFG_TUD_CDC_EPSIZE) );

   }

 

   // nothing to do with in and notif endpoint

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 #endif

diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 0a17aa916..5ee649c4b 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -112,12 +112,12 @@ ATTR_WEAK void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* p_li
 //--------------------------------------------------------------------+

 #ifdef _TINY_USB_SOURCE_FILE_

 

-void         cdcd_init               (void);

-tusb_error_t cdcd_open               (uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

+void cdcd_init               (void);

+bool cdcd_open               (uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

 bool cdcd_control_request (uint8_t rhport, tusb_control_request_t const * p_request);

 bool cdcd_control_request_complete (uint8_t rhport, tusb_control_request_t const * p_request);

-tusb_error_t cdcd_xfer_cb            (uint8_t rhport, uint8_t edpt_addr, xfer_result_t result, uint32_t xferred_bytes);

-void         cdcd_reset              (uint8_t rhport);

+bool cdcd_xfer_cb            (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes);

+void cdcd_reset              (uint8_t rhport);

 

 #endif

 

diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index 159a13990..d6767d0a7 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -146,7 +146,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
   uint8_t const * p_desc;

   cdch_data_t * p_cdc;

 

-  p_desc = descriptor_next ( (uint8_t const *) itf_desc );

+  p_desc = tu_desc_next(itf_desc);

   p_cdc  = &cdch_data[dev_addr-1];

 

   p_cdc->itf_num   = itf_desc->bInterfaceNumber;

@@ -165,7 +165,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
     }

 

     (*p_length) += p_desc[DESC_OFFSET_LEN];

-    p_desc = descriptor_next(p_desc);

+    p_desc = tu_desc_next(p_desc);

   }

 

   if ( TUSB_DESC_ENDPOINT == p_desc[DESC_OFFSET_TYPE])

@@ -177,7 +177,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
     p_cdc->ep_notif = ep_desc->bEndpointAddress;

 

     (*p_length) += p_desc[DESC_OFFSET_LEN];

-    p_desc = descriptor_next(p_desc);

+    p_desc = tu_desc_next(p_desc);

   }

 

   //------------- Data Interface (if any) -------------//

@@ -185,7 +185,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
        (TUSB_CLASS_CDC_DATA == ((tusb_desc_interface_t const *) p_desc)->bInterfaceClass) )

   {

     (*p_length) += p_desc[DESC_OFFSET_LEN];

-    p_desc = descriptor_next(p_desc);

+    p_desc = tu_desc_next(p_desc);

 

     // data endpoints expected to be in pairs

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

@@ -196,7 +196,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
 

       TU_ASSERT(hcd_edpt_open(rhport, dev_addr, ep_desc));

 

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

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

       {

         p_cdc->ep_in = ep_desc->bEndpointAddress;

       }else

@@ -205,7 +205,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
       }

 

       (*p_length) += p_desc[DESC_OFFSET_LEN];

-      p_desc = descriptor_next( p_desc );

+      p_desc = tu_desc_next( p_desc );

     }

   }

 

diff --git a/src/class/custom/custom_device.c b/src/class/custom/custom_device.c
index 194963c17..129d405a4 100644
--- a/src/class/custom/custom_device.c
+++ b/src/class/custom/custom_device.c
@@ -71,22 +71,22 @@ void cusd_init(void)
   tu_varclr(&_cusd_itf);
 }
 
-tusb_error_t cusd_open(uint8_t rhport, tusb_desc_interface_t const * p_desc_itf, uint16_t *p_len)
+bool cusd_open(uint8_t rhport, tusb_desc_interface_t const * p_desc_itf, uint16_t *p_len)
 {
   cusd_interface_t* p_itf = &_cusd_itf;
 
   // Open endpoint pair with usbd helper
-  tusb_desc_endpoint_t const *p_desc_ep = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*) p_desc_itf );
-  TU_ASSERT_ERR( usbd_open_edpt_pair(rhport, p_desc_ep, TUSB_XFER_BULK, &p_itf->ep_out, &p_itf->ep_in) );
+  tusb_desc_endpoint_t const *p_desc_ep = (tusb_desc_endpoint_t const *) tu_desc_next(p_desc_itf);
+  TU_ASSERT( usbd_open_edpt_pair(rhport, p_desc_ep, TUSB_XFER_BULK, &p_itf->ep_out, &p_itf->ep_in) );
 
   p_itf->itf_num = p_desc_itf->bInterfaceNumber;
 
   (*p_len) = sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);
 
   // TODO Prepare for incoming data
-//  TU_ASSERT( dcd_edpt_xfer(rhport, p_itf->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)), TUSB_ERROR_DCD_EDPT_XFER );
+//  TU_ASSERT( dcd_edpt_xfer(rhport, p_itf->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)) );
 
-  return TUSB_ERROR_NONE;
+  return true;
 }
 
 bool cusd_control_request(uint8_t rhport, tusb_control_request_t const * p_request)
@@ -94,9 +94,9 @@ bool cusd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
   return false;
 }
 
-tusb_error_t cusd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, xfer_result_t event, uint32_t xferred_bytes)
+bool cusd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)
 {
-  return TUSB_ERROR_NONE;
+  return true;
 }
 
 void cusd_reset(uint8_t rhport)
diff --git a/src/class/custom/custom_device.h b/src/class/custom/custom_device.h
index 0a8f05e7d..aae06d503 100644
--- a/src/class/custom/custom_device.h
+++ b/src/class/custom/custom_device.h
@@ -63,10 +63,10 @@
 #ifdef _TINY_USB_SOURCE_FILE_
 
 void cusd_init(void);
-tusb_error_t cusd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);
+bool cusd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length);
 bool cusd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);
 bool cusd_control_request_complete (uint8_t rhport, tusb_control_request_t const * p_request);
-tusb_error_t cusd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, xfer_result_t event, uint32_t xferred_bytes);
+bool cusd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
 void cusd_reset(uint8_t rhport);
 #endif
 
diff --git a/src/class/custom/custom_host.c b/src/class/custom/custom_host.c
index e840a2829..894e641e8 100644
--- a/src/class/custom/custom_host.c
+++ b/src/class/custom/custom_host.c
@@ -111,7 +111,7 @@ tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
 {
   // FIXME quick hack to test lpc1k custom class with 2 bulk endpoints
   uint8_t const *p_desc = (uint8_t const *) p_interface_desc;
-  p_desc = descriptor_next(p_desc);
+  p_desc = tu_desc_next(p_desc);
 
   //------------- Bulk Endpoints Descriptor -------------//
   for(uint32_t i=0; i<2; i++)
@@ -124,7 +124,7 @@ tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
     *p_pipe_hdl = hcd_edpt_open(dev_addr, p_endpoint, TUSB_CLASS_VENDOR_SPECIFIC);
     TU_ASSERT ( pipehandle_is_valid(*p_pipe_hdl), TUSB_ERROR_HCD_OPEN_PIPE_FAILED );
 
-    p_desc = descriptor_next(p_desc);
+    p_desc = tu_desc_next(p_desc);
   }
 
   (*p_length) = sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);
diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index 6e2ea27db..bd49c157a 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -318,22 +318,22 @@ void hidd_reset(uint8_t rhport)
   #endif

 }

 

-tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, uint16_t *p_len)

+bool hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, uint16_t *p_len)

 {

   uint8_t const *p_desc = (uint8_t const *) desc_itf;

 

-  // TODO not support HID OUT Endpoint

-  TU_ASSERT(desc_itf->bNumEndpoints == 1, ERR_TUD_INVALID_DESCRIPTOR);

+  // TODO support HID OUT Endpoint

+  TU_ASSERT(desc_itf->bNumEndpoints == 1);

 

   //------------- HID descriptor -------------//

-  p_desc += p_desc[DESC_OFFSET_LEN];

+  p_desc = tu_desc_next(p_desc);

   tusb_hid_descriptor_hid_t const *desc_hid = (tusb_hid_descriptor_hid_t const *) p_desc;

-  TU_ASSERT(HID_DESC_TYPE_HID == desc_hid->bDescriptorType, ERR_TUD_INVALID_DESCRIPTOR);

+  TU_ASSERT(HID_DESC_TYPE_HID == desc_hid->bDescriptorType);

 

   //------------- Endpoint Descriptor -------------//

-  p_desc += p_desc[DESC_OFFSET_LEN];

+  p_desc = tu_desc_next(p_desc);

   tusb_desc_endpoint_t const *desc_edpt = (tusb_desc_endpoint_t const *) p_desc;

-  TU_ASSERT(TUSB_DESC_ENDPOINT == desc_edpt->bDescriptorType, ERR_TUD_INVALID_DESCRIPTOR);

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

 

   hidd_interface_t * p_hid = NULL;

 

@@ -374,7 +374,7 @@ tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, u
     }

     #endif

 

-    TU_ASSERT(p_hid, ERR_TUD_INVALID_DESCRIPTOR);

+    TU_ASSERT(p_hid);

     p_hid->boot_protocol = true; // default mode is BOOT

   }

   /*------------- Generic (multiple report) -------------*/

@@ -386,12 +386,10 @@ tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, u
     p_hid->desc_report   = usbd_desc_set->hid_report.generic;

     p_hid->get_report_cb = tud_hid_generic_get_report_cb;

     p_hid->set_report_cb = tud_hid_generic_set_report_cb;

-

-    TU_ASSERT(p_hid, ERR_TUD_INVALID_DESCRIPTOR);

   }

 

-  TU_VERIFY(p_hid->desc_report, ERR_TUD_INVALID_DESCRIPTOR);

-  TU_ASSERT( dcd_edpt_open(rhport, desc_edpt), ERR_TUD_EDPT_OPEN_FAILED );

+  TU_ASSERT(p_hid->desc_report);

+  TU_ASSERT(dcd_edpt_open(rhport, desc_edpt));

 

   p_hid->itf_num   = desc_itf->bInterfaceNumber;

   p_hid->ep_in     = desc_edpt->bEndpointAddress;

@@ -399,7 +397,7 @@ tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, u
 

   *p_len = sizeof(tusb_desc_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + desc_itf->bNumEndpoints*sizeof(tusb_desc_endpoint_t);

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 // Handle class control request

@@ -510,10 +508,10 @@ bool hidd_control_request_complete(uint8_t rhport, tusb_control_request_t const
   return true;

 }

 

-tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, xfer_result_t event, uint32_t xferred_bytes)

+bool hidd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)

 {

   // nothing to do

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 

diff --git a/src/class/hid/hid_device.h b/src/class/hid/hid_device.h
index 7aff7f34d..885f33443 100644
--- a/src/class/hid/hid_device.h
+++ b/src/class/hid/hid_device.h
@@ -377,10 +377,10 @@ ATTR_WEAK void tud_hid_mouse_set_report_cb(uint8_t report_id, hid_report_type_t
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void hidd_init(void);

-tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

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

 bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_request);

 bool hidd_control_request_complete (uint8_t rhport, tusb_control_request_t const * p_request);

-tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, xfer_result_t event, uint32_t xferred_bytes);

+bool hidd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);

 void hidd_reset(uint8_t rhport);

 

 #endif

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 83c9990d8..d4d115bce 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -150,25 +150,25 @@ void mscd_reset(uint8_t rhport)
   tu_memclr(&_mscd_itf, sizeof(mscd_interface_t));

 }

 

-tusb_error_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * p_desc_itf, uint16_t *p_len)

+bool mscd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_len)

 {

   // only support SCSI's BOT protocol

-  TU_VERIFY( ( MSC_SUBCLASS_SCSI == p_desc_itf->bInterfaceSubClass &&

-            MSC_PROTOCOL_BOT  == p_desc_itf->bInterfaceProtocol ), TUSB_ERROR_MSC_UNSUPPORTED_PROTOCOL );

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

+            MSC_PROTOCOL_BOT  == itf_desc->bInterfaceProtocol);

 

   mscd_interface_t * p_msc = &_mscd_itf;

 

   // Open endpoint pair with usbd helper

-  tusb_desc_endpoint_t const *p_desc_ep = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*) p_desc_itf );

-  TU_ASSERT_ERR( usbd_open_edpt_pair(rhport, p_desc_ep, TUSB_XFER_BULK, &p_msc->ep_out, &p_msc->ep_in) );

+  tusb_desc_endpoint_t const *p_desc_ep = (tusb_desc_endpoint_t const *) tu_desc_next( itf_desc );

+  TU_ASSERT( usbd_open_edpt_pair(rhport, p_desc_ep, TUSB_XFER_BULK, &p_msc->ep_out, &p_msc->ep_in) );

 

-  p_msc->itf_num = p_desc_itf->bInterfaceNumber;

+  p_msc->itf_num = itf_desc->bInterfaceNumber;

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

 

-  //------------- Queue Endpoint OUT for Command Block Wrapper -------------//

-  TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)), TUSB_ERROR_DCD_EDPT_XFER );

+  // Prepare for Command Block Wrapper

+  TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)) );

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 // Handle class control request

@@ -329,7 +329,7 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
   return ret;

 }

 

-tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)

+bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)

 {

   mscd_interface_t* p_msc = &_mscd_itf;

   msc_cbw_t const * p_cbw = &p_msc->cbw;

@@ -340,10 +340,10 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event,
     case MSC_STAGE_CMD:

       //------------- new CBW received -------------//

       // Complete IN while waiting for CMD is usually Status of previous SCSI op, ignore it

-      if(ep_addr != p_msc->ep_out) return TUSB_ERROR_NONE;

+      if(ep_addr != p_msc->ep_out) return true;

 

       TU_ASSERT( event == XFER_RESULT_SUCCESS &&

-                 xferred_bytes == sizeof(msc_cbw_t) && p_cbw->signature == MSC_CBW_SIGNATURE, TUSB_ERROR_INVALID_PARA );

+                 xferred_bytes == sizeof(msc_cbw_t) && p_cbw->signature == MSC_CBW_SIGNATURE );

 

       p_csw->signature    = MSC_CSW_SIGNATURE;

       p_csw->tag          = p_cbw->tag;

@@ -388,7 +388,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event,
         else if ( !BIT_TEST_(p_cbw->dir, 7) )

         {

           // OUT transfer

-          TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_out, _mscd_buf, p_msc->total_len), TUSB_ERROR_DCD_EDPT_XFER );

+          TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_out, _mscd_buf, p_msc->total_len) );

         }

         else

         {

@@ -409,8 +409,8 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event,
             p_msc->total_len = (uint32_t) cb_result;

             p_csw->status = MSC_CSW_STATUS_PASSED;

 

-            TU_ASSERT( p_cbw->total_bytes >= p_msc->total_len, TUSB_ERROR_INVALID_PARA ); // cannot return more than host expect

-            TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_in, _mscd_buf, p_msc->total_len), TUSB_ERROR_DCD_EDPT_XFER );

+            TU_ASSERT( p_cbw->total_bytes >= p_msc->total_len ); // cannot return more than host expect

+            TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_in, _mscd_buf, p_msc->total_len) );

           }else

           {

             p_msc->total_len = 0;

@@ -474,7 +474,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event,
               // simulate an transfer complete with adjusted parameters --> this driver callback will fired again

               dcd_event_xfer_complete(rhport, p_msc->ep_out, xferred_bytes-nbytes, XFER_RESULT_SUCCESS, false);

 

-              return TUSB_ERROR_NONE; // skip the rest

+              return true; // skip the rest

             }

             else

             {

@@ -549,7 +549,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event,
     }

   }

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 /*------------------------------------------------------------------*/

diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index 4053679b8..c9e4139e9 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -171,10 +171,10 @@ ATTR_WEAK bool tud_msc_is_writable_cb(uint8_t lun);
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void mscd_init(void);

-tusb_error_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

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

 bool mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_request);

 bool mscd_control_request_complete (uint8_t rhport, tusb_control_request_t const * p_request);

-tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, xfer_result_t event, uint32_t xferred_bytes);

+bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);

 void mscd_reset(uint8_t rhport);

 

 #endif

diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index 2c9b2dec7..86669b279 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -300,7 +300,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
   msch_interface_t* p_msc = &msch_data[dev_addr-1];

 

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

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

+  tusb_desc_endpoint_t const * ep_desc = (tusb_desc_endpoint_t const *) tu_desc_next(itf_desc);

 

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

   {

@@ -309,7 +309,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
 

     TU_ASSERT(hcd_edpt_open(rhport, dev_addr, ep_desc));

 

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

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

     {

       p_msc->ep_in = ep_desc->bEndpointAddress;

     }else

@@ -317,7 +317,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
       p_msc->ep_out = ep_desc->bEndpointAddress;

     }

 

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

+    ep_desc = (tusb_desc_endpoint_t const *) tu_desc_next(ep_desc);

   }

 

   p_msc->itf_numr = itf_desc->bInterfaceNumber;