From a9ada8ea5ee3cc7d130c489da1a30c9e68c586b9 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Wed, 18 Apr 2018 17:12:58 +0700
Subject: [PATCH] add msc device optional callbacks

- tud_msc_read10_complete_cb()
- tud_msc_write10_complete_cb()
- tud_msc_scsi_complete_cb()
---
 tinyusb/class/msc/msc_device.c | 21 ++++++++++++++-------
 tinyusb/class/msc/msc_device.h | 12 ++++++++----
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c
index 67c4533c..0e5b8621 100644
--- a/tinyusb/class/msc/msc_device.c
+++ b/tinyusb/class/msc/msc_device.c
@@ -83,7 +83,7 @@ CFG_TUSB_ATTR_USBRAM CFG_TUSB_MEM_ALIGN STATIC_VAR mscd_interface_t mscd_data;
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
-static bool read10_write10_data_xfer(uint8_t rhport, mscd_interface_t* p_msc);
+static void read10_write10_data_xfer(uint8_t rhport, mscd_interface_t* p_msc);
 
 //--------------------------------------------------------------------+
 // USBD-CLASS API
@@ -267,6 +267,18 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
 
   if ( p_msc->stage == MSC_STAGE_STATUS )
   {
+    // 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);
+    }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);
+    }else
+    {
+      if ( tud_msc_scsi_complete_cb ) tud_msc_scsi_complete_cb(rhport, p_cbw->lun, p_cbw->command);
+    }
+
     // Move to default CMD stage after sending status
     p_msc->stage         = MSC_STAGE_CMD;
 
@@ -279,8 +291,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
   return TUSB_ERROR_NONE;
 }
 
-// return true if data phase is complete, false if not yet complete
-static bool read10_write10_data_xfer(uint8_t rhport, mscd_interface_t* p_msc)
+static void read10_write10_data_xfer(uint8_t rhport, mscd_interface_t* p_msc)
 {
   msc_cbw_t* const p_cbw = &p_msc->cbw;
   msc_csw_t* const p_csw = &p_msc->csw;
@@ -320,14 +331,10 @@ static bool read10_write10_data_xfer(uint8_t rhport, mscd_interface_t* p_msc)
     p_csw->status       = MSC_CSW_STATUS_FAILED;
 
     dcd_edpt_stall(rhport, ep_data);
-
-    return true;
   }else
   {
     TU_ASSERT( dcd_edpt_xfer(rhport, ep_data, p_buffer, xfer_block * block_size) );
   }
-
-  return true;
 }
 
 #endif
diff --git a/tinyusb/class/msc/msc_device.h b/tinyusb/class/msc/msc_device.h
index 03beaf7a..246e7f16 100644
--- a/tinyusb/class/msc/msc_device.h
+++ b/tinyusb/class/msc/msc_device.h
@@ -39,7 +39,7 @@
 #ifndef _TUSB_MSC_DEVICE_H_
 #define _TUSB_MSC_DEVICE_H_
 
-#include <common/tusb_common.h>
+#include "common/tusb_common.h"
 #include "device/usbd.h"
 #include "msc.h"
 
@@ -58,7 +58,7 @@
 //--------------------------------------------------------------------+
 
 //--------------------------------------------------------------------+
-// APPLICATION CALLBACK API
+// APPLICATION CALLBACK API (WEAK is optional)
 //--------------------------------------------------------------------+
 /** \brief Callback invoked when received \ref SCSI_CMD_READ_10 command
  * \param[in]		\rhport     Root hub port
@@ -80,8 +80,6 @@
  */
 uint16_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint16_t block_count, void** pp_buffer);
 
-//void     tud_msc_read10_cmpl_cb(uint8_t rhport, uint8_t lun);
-
 /** \brief 			Callback invoked when received \ref SCSI_CMD_WRITE_10 command
  * \param[in]		rhport	    Root hub port
  * \param[in]		lun         Targeted Logical Unit
@@ -102,6 +100,7 @@ uint16_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint16_t
  */
 uint16_t tud_msc_write10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint16_t block_count, void** pp_buffer);
 
+
 /** \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
@@ -115,6 +114,11 @@ uint16_t tud_msc_write10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint16_t
  */
 bool tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t scsi_cmd[16], void* buffer, uint16_t* p_len);
 
+/*------------- 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 scsi_cmd[16]);
+
 /** @} */
 /** @} */