Merge pull request #7 from tannewt/tinyusb_samd

Add SAMD support and simplify OS_NONE

3 files changed, 96 insertions, 59 deletions

diff --git a/src/class/msc/msc.h b/src/class/msc/msc.h
index 59df6bed6..e7c32b303 100644
--- a/src/class/msc/msc.h
+++ b/src/class/msc/msc.h
@@ -52,6 +52,10 @@
  extern "C" {

 #endif

 

+#pragma GCC diagnostic push

+#pragma GCC diagnostic ignored "-Wpacked"

+#pragma GCC diagnostic ignored "-Wattributes"

+

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

 // Mass Storage Class Constant

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

@@ -279,11 +283,13 @@ typedef struct ATTR_PACKED
 

 TU_VERIFY_STATIC( sizeof(scsi_mode_sense6_t) == 6, "size is not correct");

 

+// This is only a Mode parameter header(6).

 typedef struct ATTR_PACKED

 {

   uint8_t data_len;

   uint8_t medium_type;

-  uint8_t device_specific_para;

+  bool write_protected : 1;

+  uint8_t reserved : 7;

   uint8_t block_descriptor_len;

 } scsi_mode_sense6_resp_t;

 

@@ -390,6 +396,8 @@ typedef struct ATTR_PACKED
 TU_VERIFY_STATIC(sizeof(scsi_read10_t) == 10, "size is not correct");

 TU_VERIFY_STATIC(sizeof(scsi_write10_t) == 10, "size is not correct");

 

+#pragma GCC diagnostic pop

+

 #ifdef __cplusplus

  }

 #endif

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 5a047b016..32ad90102 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -47,6 +47,7 @@
 

 #include "common/tusb_common.h"

 #include "msc_device.h"

+#include "device/control.h"

 #include "device/usbd_pvt.h"

 

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

@@ -59,31 +60,7 @@ enum
   MSC_STAGE_STATUS

 };

 

-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

-

-  CFG_TUSB_MEM_ALIGN msc_csw_t csw;

-

-  uint8_t  itf_num;

-  uint8_t  ep_in;

-  uint8_t  ep_out;

-

-  // Bulk Only Transfer (BOT) Protocol

-  uint8_t  stage;

-  uint32_t total_len;

-  uint32_t xferred_len; // numbered of bytes transferred so far in the Data Stage

-

-  // Sense Response Data

-  uint8_t sense_key;

-  uint8_t add_sense_code;

-  uint8_t add_sense_qualifier;

-}mscd_interface_t;

-

-CFG_TUSB_ATTR_USBRAM CFG_TUSB_MEM_ALIGN static mscd_interface_t _mscd_itf;

+CFG_TUSB_ATTR_USBRAM CFG_TUSB_MEM_ALIGN mscd_interface_t _mscd_itf;

 CFG_TUSB_ATTR_USBRAM CFG_TUSB_MEM_ALIGN static uint8_t _mscd_buf[CFG_TUD_MSC_BUFSIZE];

 

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

@@ -170,28 +147,40 @@ tusb_error_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * p_desc_itf,
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request)

+tusb_error_t mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_request, uint16_t bytes_already_sent)

 {

-  OSAL_SUBTASK_BEGIN

-

   TU_ASSERT(p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_CLASS, TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT);

 

   if(MSC_REQ_RESET == p_request->bRequest)

   {

-    dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

+    // TODO: Actually reset.

   }

   else if (MSC_REQ_GET_MAX_LUN == p_request->bRequest)

   {

     // returned MAX LUN is minus 1 by specs

-    _usbd_ctrl_buf[0] = CFG_TUD_MSC_MAXLUN-1;

-    usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, _usbd_ctrl_buf, 1);

+    _shared_control_buffer[0] = CFG_TUD_MSC_MAXLUN-1;

+    dcd_edpt_xfer(rhport, TUSB_DIR_IN_MASK, _shared_control_buffer, 1);

   }else

   {

-    dcd_control_stall(rhport); // stall unsupported request

+    return TUSB_ERROR_FAILED; // stall unsupported request

   }

+  return TUSB_ERROR_NONE;

+}

+

+void mscd_control_request_complete(uint8_t rhport, tusb_control_request_t const * p_request)

+{

+  return;

+}

 

-  OSAL_SUBTASK_END

+// For backwards compatibility we support static block counts.

+#if defined(CFG_TUD_MSC_BLOCK_NUM) && defined(CFG_TUD_MSC_BLOCK_SZ)

+ATTR_WEAK bool tud_lun_capacity_cb(uint8_t lun, uint32_t* last_valid_sector, uint16_t* block_size) {

+    (void) lun;

+    *last_valid_sector = CFG_TUD_MSC_BLOCK_NUM-1;

+    *block_size = CFG_TUD_MSC_BLOCK_SZ;

+    return true;

 }

+#endif

 

 // return length of response (copied to buffer), -1 if it is not an built-in commands

 int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t bufsize)

@@ -202,11 +191,13 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
   {

     case SCSI_CMD_READ_CAPACITY_10:

     {

-      scsi_read_capacity10_resp_t read_capa10 =

-      {

-          .last_lba   = ENDIAN_BE(CFG_TUD_MSC_BLOCK_NUM-1), // read capacity

-          .block_size = ENDIAN_BE(CFG_TUD_MSC_BLOCK_SZ)

-      };

+      scsi_read_capacity10_resp_t read_capa10;

+

+      uint32_t last_valid_sector;

+      uint16_t block_size;

+      tud_lun_capacity_cb(p_cbw->lun, &last_valid_sector, &block_size);

+      read_capa10.last_lba = ENDIAN_BE(last_valid_sector); // read capacity

+      read_capa10.block_size = ENDIAN_BE(block_size);

 

       ret = sizeof(read_capa10);

       memcpy(buffer, &read_capa10, ret);

@@ -218,11 +209,17 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
       scsi_read_format_capacity_data_t read_fmt_capa =

       {

           .list_length     = 8,

-          .block_num       = ENDIAN_BE(CFG_TUD_MSC_BLOCK_NUM),  // write capacity

+          .block_num       = 0,

           .descriptor_type = 2,                                 // formatted media

-          .block_size_u16  = ENDIAN_BE16(CFG_TUD_MSC_BLOCK_SZ)

+          .block_size_u16  = 0

       };

 

+      uint32_t last_valid_sector;

+      uint16_t block_size;

+      tud_lun_capacity_cb(p_cbw->lun, &last_valid_sector, &block_size);

+      read_fmt_capa.block_num = ENDIAN_BE(last_valid_sector+1);

+      read_fmt_capa.block_size_u16 = ENDIAN_BE16(block_size);

+

       ret = sizeof(read_fmt_capa);

       memcpy(buffer, &read_fmt_capa, ret);

     }

@@ -251,13 +248,21 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
 

     case SCSI_CMD_MODE_SENSE_6:

     {

-      scsi_mode_sense6_resp_t const mode_resp = {

-        .data_len = 3,

-        .medium_type = 0,

-        .device_specific_para = 0,

-        .block_descriptor_len = 0    // no block descriptor are included

+      scsi_mode_sense6_resp_t mode_resp =

+      {

+          .data_len = 3,

+          .medium_type = 0,

+          .write_protected = false,

+          .reserved = 0,

+          .block_descriptor_len = 0  // no block descriptor are included

       };

 

+      bool writable = true;

+      if (tud_msc_is_writable_cb) {

+          writable = tud_msc_is_writable_cb(p_cbw->lun);

+      }

+      mode_resp.write_protected = !writable;

+

       ret = sizeof(mode_resp);

       memcpy(buffer, &mode_resp, ret);

     }

@@ -291,7 +296,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, tusb_event_t event, uint32_t xferred_bytes)

+tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, uint8_t event, uint32_t xferred_bytes)

 {

   mscd_interface_t* p_msc = &_mscd_itf;

   msc_cbw_t const * p_cbw = &p_msc->cbw;

@@ -425,7 +430,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
           }else

           {

             // Application consume less than what we got (including zero)

-            if ( nbytes < xferred_bytes )

+            if ( nbytes < (int32_t) xferred_bytes )

             {

               if ( nbytes > 0 )

               {

diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index 8403dfed9..ac3eade22 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -55,14 +55,6 @@ TU_VERIFY_STATIC(CFG_TUD_MSC_BUFSIZE < UINT16_MAX, "Size is not correct");
   #error MSC Device: Incorrect setting of MAX LUN

 #endif

 

-#ifndef CFG_TUD_MSC_BLOCK_NUM

-  #error CFG_TUD_MSC_BLOCK_NUM must be defined

-#endif

-

-#ifndef CFG_TUD_MSC_BLOCK_SZ

-  #error CFG_TUD_MSC_BLOCK_SZ must be defined

-#endif

-

 #ifndef CFG_TUD_MSC_BUFSIZE

   #error CFG_TUD_MSC_BUFSIZE must be defined, value of CFG_TUD_MSC_BLOCK_SZ should work well, the more the better

 #endif

@@ -89,6 +81,32 @@ TU_VERIFY_STATIC(CFG_TUD_MSC_BUFSIZE < UINT16_MAX, "Size is not correct");
  extern "C" {

 #endif

 

+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

+

+  CFG_TUSB_MEM_ALIGN msc_csw_t csw;

+

+  uint8_t  itf_num;

+  uint8_t  ep_in;

+  uint8_t  ep_out;

+

+  // Bulk Only Transfer (BOT) Protocol

+  uint8_t  stage;

+  uint32_t total_len;

+  uint32_t xferred_len; // numbered of bytes transferred so far in the Data Stage

+

+  // Sense Response Data

+  uint8_t sense_key;

+  uint8_t add_sense_code;

+  uint8_t add_sense_qualifier;

+}mscd_interface_t;

+

+extern mscd_interface_t _mscd_itf;

+

 /** \addtogroup ClassDriver_MSC

  *  @{

  * \defgroup MSC_Device Device

@@ -138,7 +156,7 @@ int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buf
  * \retval      negative    Indicate error writing disk I/O. Tinyusb will \b STALL the corresponding

  *                          endpoint and return failed status in command status wrapper phase.

  */

-int32_t tud_msc_write10_cb (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, uint8_t* buffer, uint32_t bufsize);

 

 /**

  * Callback invoked when received an SCSI command not in built-in list below.

@@ -164,6 +182,12 @@ 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]);

 

+// Hook to make a mass storage device read-only.

+ATTR_WEAK bool tud_msc_is_writable_cb(uint8_t lun);

+

+// Override for dynamic LUN sizes.

+ATTR_WEAK bool tud_lun_capacity_cb(uint8_t lun, uint32_t* last_valid_sector, uint16_t* block_size);

+

 /** @} */

 /** @} */

 

@@ -174,7 +198,8 @@ ATTR_WEAK void tud_msc_scsi_complete_cb(uint8_t lun, uint8_t const scsi_cmd[16])
 

 void mscd_init(void);

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

-tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

+tusb_error_t mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_request, uint16_t bytes_already_sent);

+void 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, tusb_event_t event, uint32_t xferred_bytes);

 void mscd_reset(uint8_t rhport);

 

@@ -185,4 +210,3 @@ void mscd_reset(uint8_t rhport);
 #endif

 

 #endif /* _TUSB_MSC_DEVICE_H_ */

-