clean up helper func

2 files changed, 7 insertions, 9 deletions

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 3335ad9b3..830ce85b7 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -62,9 +62,9 @@ enum
 typedef struct {

   CFG_TUSB_MEM_ALIGN msc_cbw_t  cbw;

 

-#if defined (__ICCARM__) && (CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX)

-  uint8_t padding1[64-sizeof(msc_cbw_t)]; // IAR cannot align struct's member

-#endif

+//#if defined (__ICCARM__) && (CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX)

+//  uint8_t padding1[64-sizeof(msc_cbw_t)]; // IAR cannot align struct's member

+//#endif

 

   CFG_TUSB_MEM_ALIGN msc_csw_t csw;

 

@@ -141,12 +141,12 @@ bool tud_msc_set_sense(uint8_t lun, uint8_t sense_key, uint8_t add_sense_code, u
 //--------------------------------------------------------------------+

 void mscd_init(void)

 {

-  memclr_(&_mscd_itf, sizeof(mscd_interface_t));

+  tu_memclr(&_mscd_itf, sizeof(mscd_interface_t));

 }

 

 void mscd_reset(uint8_t rhport)

 {

-  memclr_(&_mscd_itf, sizeof(mscd_interface_t));

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

@@ -302,7 +302,6 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
   {

     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;

 

@@ -332,7 +331,6 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
         // 1. Zero : Invoke app callback, skip DATA and move to STATUS stage

         // 2. OUT  : queue transfer (invoke app callback after done)

         // 3. IN   : invoke app callback to get response

-

         if ( p_cbw->xfer_bytes == 0)

         {

           int32_t const cb_result = tud_msc_scsi_cb(p_cbw->lun, p_cbw->command, NULL, 0);

diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index 7e6396389..9250b8df7 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -288,7 +288,7 @@ tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffe
 //--------------------------------------------------------------------+

 void msch_init(void)

 {

-  memclr_(msch_data, sizeof(msch_interface_t)*CFG_TUSB_HOST_DEVICE_MAX);

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

   msch_sem_hdl = osal_semaphore_create(1, 0);

 }

 

@@ -416,7 +416,7 @@ 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));

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

   osal_semaphore_reset(msch_sem_hdl);

 

   tuh_msc_unmounted_cb(dev_addr); // invoke Application Callback