rename some scsi command struct, add SCSI_CMD_MODE_SENSE_6 to built-in support command

2 files changed, 31 insertions, 16 deletions

diff --git a/src/class/msc/msc.h b/src/class/msc/msc.h
index fe90e6684..ab8f066b3 100644
--- a/src/class/msc/msc.h
+++ b/src/class/msc/msc.h
@@ -230,9 +230,9 @@ typedef struct ATTR_PACKED
   uint8_t vendor_id[8]  ; ///< 8 bytes of ASCII data identifying the vendor of the product.

   uint8_t product_id[16]; ///< 16 bytes of ASCII data defined by the vendor.

   uint8_t product_rev[4]; ///< 4 bytes of ASCII data defined by the vendor.

-} scsi_inquiry_data_t;

+} scsi_inquiry_resp_t;

 

-VERIFY_STATIC(sizeof(scsi_inquiry_data_t) == 36, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_inquiry_resp_t) == 36, "size is not correct");

 

 

 typedef struct ATTR_PACKED

@@ -257,9 +257,9 @@ typedef struct ATTR_PACKED
 

   uint8_t  sense_key_specific[3]; ///< sense key specific valid bit is bit 7 of key[0], aka MSB in Big Endian layout

 

-} scsi_sense_fixed_data_t;

+} scsi_sense_fixed_resp_t;

 

-VERIFY_STATIC(sizeof(scsi_sense_fixed_data_t) == 18, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_sense_fixed_resp_t) == 18, "size is not correct");

 

 typedef struct ATTR_PACKED

 {

@@ -275,19 +275,19 @@ typedef struct ATTR_PACKED
   uint8_t subpage_code;

   uint8_t alloc_length;

   uint8_t control;

-} scsi_mode_sense_6_t;

+} scsi_mode_sense6_t;

 

-VERIFY_STATIC( sizeof(scsi_mode_sense_6_t) == 6, "size is not correct");

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

 

 typedef struct ATTR_PACKED

 {

-  uint8_t mode_data_length;

+  uint8_t data_len;

   uint8_t medium_type;

   uint8_t device_specific_para;

-  uint8_t block_descriptor_length;

-} scsi_mode_parameters_t;

+  uint8_t block_descriptor_len;

+} scsi_mode_sense6_resp_t;

 

-VERIFY_STATIC( sizeof(scsi_mode_parameters_t) == 4, "size is not correct");

+VERIFY_STATIC( sizeof(scsi_mode_sense6_resp_t) == 4, "size is not correct");

 

 typedef struct ATTR_PACKED

 {

@@ -372,9 +372,9 @@ VERIFY_STATIC(sizeof(scsi_read_capacity10_t) == 10, "size is not correct");
 typedef struct {

   uint32_t last_lba   ; ///< The last Logical Block Address of the device

   uint32_t block_size ; ///< Block size in bytes

-} scsi_read_capacity10_data_t;

+} scsi_read_capacity10_resp_t;

 

-VERIFY_STATIC(sizeof(scsi_read_capacity10_data_t) == 8, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_read_capacity10_resp_t) == 8, "size is not correct");

 

 /// SCSI Read 10 Command

 typedef struct ATTR_PACKED

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 9f037a73c..27762805c 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -202,7 +202,7 @@ 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_data_t read_capa10 =

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

@@ -230,7 +230,7 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
 

     case SCSI_CMD_INQUIRY:

     {

-      scsi_inquiry_data_t inquiry_rsp =

+      scsi_inquiry_resp_t inquiry_rsp =

       {

           .is_removable         = 1,

           .version              = 2,

@@ -249,15 +249,30 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
     }

     break;

 

+    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

+      };

+

+      ret = sizeof(mode_resp);

+      memcpy(buffer, &mode_resp, ret);

+    }

+    break;

+

     case SCSI_CMD_REQUEST_SENSE:

     {

-      scsi_sense_fixed_data_t sense_rsp =

+      scsi_sense_fixed_resp_t sense_rsp =

       {

           .response_code = 0x70,

           .valid         = 1

       };

 

-      sense_rsp.add_sense_len = sizeof(scsi_sense_fixed_data_t) - 8;

+      sense_rsp.add_sense_len = sizeof(scsi_sense_fixed_resp_t) - 8;

 

       sense_rsp.sense_key           = _mscd_itf.sense_key;

       sense_rsp.add_sense_code      = _mscd_itf.add_sense_code;