clean up device msc API

2 files changed, 14 insertions, 17 deletions

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index d9b4c76a8..e92021176 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -216,7 +216,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
 

         if ( p_cbw->xfer_bytes == 0)

         {

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

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

 

           p_csw->status   = (cb_result == 0) ? MSC_CSW_STATUS_PASSED : MSC_CSW_STATUS_FAILED;

           p_msc->data_len = 0;

@@ -281,7 +281,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
           }

           else

           {

-            cb_result = tud_msc_scsi_cb(rhport, p_cbw->lun, p_cbw->command, _mscd_buf, p_msc->data_len);

+            cb_result = tud_msc_scsi_cb(p_cbw->lun, p_cbw->command, _mscd_buf, p_msc->data_len);

           }

 

           if ( cb_result > 0 )

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

         if ( SCSI_CMD_WRITE_10 != p_cbw->command[0] )

         {

-          p_csw->status = (tud_msc_scsi_cb(rhport, p_cbw->lun, p_cbw->command, _mscd_buf, p_msc->data_len) >= 0 ) ? MSC_CSW_STATUS_PASSED : MSC_CSW_STATUS_FAILED;

+          p_csw->status = (tud_msc_scsi_cb(p_cbw->lun, p_cbw->command, _mscd_buf, p_msc->data_len) >= 0 ) ? MSC_CSW_STATUS_PASSED : MSC_CSW_STATUS_FAILED;

         }

         else

         {

@@ -327,7 +327,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
           uint32_t const lba = rdwr10_get_lba(p_cbw->command) + (p_msc->xferred_len / block_sz);

 

           // Application can consume smaller bytes

-          int32_t nbytes = tud_msc_write10_cb(rhport, p_cbw->lun, lba, p_msc->xferred_len % block_sz, _mscd_buf, xferred_bytes);

+          int32_t nbytes = tud_msc_write10_cb(p_cbw->lun, lba, p_msc->xferred_len % block_sz, _mscd_buf, xferred_bytes);

 

           if ( nbytes < 0 )

           {

@@ -398,15 +398,15 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
     // Invoke complete callback if defined

     if ( SCSI_CMD_READ_10 == p_cbw->command[0])

     {

-      if ( tud_msc_read10_complete_cb ) tud_msc_read10_complete_cb(rhport, p_cbw->lun);

+      if ( tud_msc_read10_complete_cb ) tud_msc_read10_complete_cb(p_cbw->lun);

     }

     else if ( SCSI_CMD_WRITE_10 == p_cbw->command[0] )

     {

-      if ( tud_msc_write10_complete_cb ) tud_msc_write10_complete_cb(rhport, p_cbw->lun);

+      if ( tud_msc_write10_complete_cb ) tud_msc_write10_complete_cb(p_cbw->lun);

     }

     else

     {

-      if ( tud_msc_scsi_complete_cb ) tud_msc_scsi_complete_cb(rhport, p_cbw->lun, p_cbw->command);

+      if ( tud_msc_scsi_complete_cb ) tud_msc_scsi_complete_cb(p_cbw->lun, p_cbw->command);

     }

 

     // Move to default CMD stage after sending status

@@ -438,7 +438,7 @@ static void proc_read10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
   int32_t nbytes = (int32_t) min32_of(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len);

 

   // Application can consume smaller bytes

-  nbytes = tud_msc_read10_cb (rhport, p_cbw->lun, lba, p_msc->xferred_len % block_sz, _mscd_buf, (uint32_t) nbytes);

+  nbytes = tud_msc_read10_cb(p_cbw->lun, lba, p_msc->xferred_len % block_sz, _mscd_buf, (uint32_t) nbytes);

 

   if ( nbytes < 0 )

   {

diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index fbfe7ef14..60144cc55 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -102,7 +102,6 @@ bool tud_msc_ready(void);
 // APPLICATION CALLBACK API (WEAK is optional)

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

 /** \brief Callback invoked when received \ref SCSI_CMD_READ_10 command

- * \param[in]		\rhport     Root hub port

  * \param[in]		lun         Targeted Logical Unit

  *                          Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]		lba         Starting Logical Block Address to be read

@@ -126,10 +125,9 @@ bool tud_msc_ready(void);
  *              \n\n Although this callback is called by tinyusb device task (non-isr context), however as all the classes share

  *              the same task (to save resource), any delay in this callback will cause delay in response on other classes.

  */

-int32_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize);

+int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize);

 

 /** \brief 			Callback invoked when received \ref SCSI_CMD_WRITE_10 command

- * \param[in]		rhport	    Root hub port

  * \param[in]		lun         Targeted Logical Unit

  *                          Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]		lba         Starting Logical Block Address to be write

@@ -152,11 +150,10 @@ int32_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint32_t o
  *              \n\n Although this callback is called by tinyusb device task (non-isr context), however as all the classes share

  *              the same task (to save resource), any delay in this callback will cause delay in response on other classes.

  */

-int32_t tud_msc_write10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize);

+int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize);

 

 

 /** \brief 			Callback invoked when received an SCSI command other than \ref SCSI_CMD_WRITE_10 and \ref SCSI_CMD_READ_10

- * \param[in]		rhport	    Root hub port

  * \param[in]		lun         Targeted Logical Unit

  * \param[in]		scsi_cmd    SCSI command contents, application should examine this command block to know which command host requested

  * \param[out]  buffer      Buffer for SCSI Data Stage.

@@ -168,12 +165,12 @@ int32_t tud_msc_write10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint32_t
  *                          endpoint and return failed status in command status wrapper phase.

  * \retval      otherwise   Actual bytes processed, must not be more than \a \b bufsize. Can be zero for no-data command.

  */

-int32_t tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize);

+int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize);

 

 /*------------- Optional callbacks : Could be used by application to free up resources -------------*/

-ATTR_WEAK void tud_msc_read10_complete_cb(uint8_t rhport, uint8_t lun);

-ATTR_WEAK void tud_msc_write10_complete_cb(uint8_t rhport, uint8_t lun);

-ATTR_WEAK void tud_msc_scsi_complete_cb(uint8_t rhport, uint8_t lun, uint8_t const scsi_cmd[16]);

+ATTR_WEAK void tud_msc_read10_complete_cb(uint8_t lun);

+ATTR_WEAK void tud_msc_write10_complete_cb(uint8_t lun);

+ATTR_WEAK void tud_msc_scsi_complete_cb(uint8_t lun, uint8_t const scsi_cmd[16]);

 

 /** @} */

 /** @} */