fix nrf52 example build error

2 files changed, 37 insertions, 153 deletions

diff --git a/examples/device/nrf52840/src/msc_device_app.c b/examples/device/nrf52840/src/msc_device_app.c
index 5fc3f20f8..46c161e95 100644
--- a/examples/device/nrf52840/src/msc_device_app.c
+++ b/examples/device/nrf52840/src/msc_device_app.c
@@ -98,62 +98,70 @@ void msc_app_umount(uint8_t rhport)
 
 }
 
-bool tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t scsi_cmd[16], void* buffer, uint16_t* p_len)
+int32_t tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize)
 {
   // read10 & write10 has their own callback and MUST not be handled here
 
-  void* bufptr = NULL;
-  uint16_t buflen = 0;
+  void const* ptr = NULL;
+  uint16_t len = 0;
+
+  // most scsi handled is input
+  bool in_xfer = true;
 
   switch (scsi_cmd[0])
   {
     case SCSI_CMD_INQUIRY:
-      bufptr = &mscd_inquiry_data;
-      buflen = sizeof(scsi_inquiry_data_t);
+      ptr = &mscd_inquiry_data;
+      len = sizeof(scsi_inquiry_data_t);
     break;
 
     case SCSI_CMD_READ_CAPACITY_10:
-      bufptr = &mscd_read_capacity10_data;
-      buflen = sizeof(scsi_read_capacity10_data_t);
+      ptr = &mscd_read_capacity10_data;
+      len = sizeof(scsi_read_capacity10_data_t);
     break;
 
     case SCSI_CMD_REQUEST_SENSE:
-      bufptr = &mscd_sense_data;
-      buflen = sizeof(scsi_sense_fixed_data_t);
+      ptr = &mscd_sense_data;
+      len = sizeof(scsi_sense_fixed_data_t);
     break;
 
     case SCSI_CMD_READ_FORMAT_CAPACITY:
-      bufptr = &mscd_format_capacity_data;
-      buflen = sizeof(scsi_read_format_capacity_data_t);
+      ptr = &mscd_format_capacity_data;
+      len = sizeof(scsi_read_format_capacity_data_t);
     break;
 
     case SCSI_CMD_MODE_SENSE_6:
-      bufptr = &msc_dev_mode_para;
-      buflen = sizeof(msc_dev_mode_para);
+      ptr = &msc_dev_mode_para;
+      len = sizeof(msc_dev_mode_para);
     break;
 
     case SCSI_CMD_TEST_UNIT_READY:
-      bufptr = NULL;
-      buflen= 0;
+      ptr = NULL;
+      len = 0;
     break;
 
     case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:
-      bufptr = NULL;
-      buflen= 0;
+      ptr = NULL;
+      len = 0;
     break;
 
     default:
-      (*p_len) = 0;
-      return false;
+      // negative is error -> Data stage is STALL, status = failed
+      return -1;
   }
 
-  if ( bufptr && buflen )
-  {
-    // Response len must not larger than expected from host
-    TU_ASSERT( (*p_len) >= buflen );
+  // return len must not larger than bufsize
+  TU_ASSERT( bufsize >= len );
 
-    memcpy(buffer, bufptr, buflen);
-    (*p_len) = buflen;
+  if ( ptr && len )
+  {
+    if(in_xfer)
+    {
+      memcpy(buffer, ptr, len);
+    }else
+    {
+      // SCSI output
+    }
   }
 
   //------------- clear sense data if it is not request sense command -------------//
@@ -164,7 +172,7 @@ bool tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t scsi_cmd[16], void* b
     mscd_sense_data.additional_sense_qualifier = 0;
   }
 
-  return true;
+  return len;
 }
 
 //--------------------------------------------------------------------+
diff --git a/examples/device/nrf52840/src/msc_device_ramdisk.c b/examples/device/nrf52840/src/msc_device_ramdisk.c
index eb617ea56..f50b03f1e 100644
--- a/examples/device/nrf52840/src/msc_device_ramdisk.c
+++ b/examples/device/nrf52840/src/msc_device_ramdisk.c
@@ -91,14 +91,15 @@ uint8_t msc_device_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =
 //--------------------------------------------------------------------+
 // IMPLEMENTATION
 //--------------------------------------------------------------------+
-uint32_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 rhport, uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)
 {
   uint8_t* addr = msc_device_ramdisk[lba] + offset;
   memcpy(buffer, addr, bufsize);
 
   return bufsize;
 }
-uint32_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 rhport, uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)
 {
   uint8_t* addr = msc_device_ramdisk[lba] + offset;
   memcpy(addr, buffer, bufsize);
@@ -110,129 +111,4 @@ uint32_t tud_msc_write10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint32_t
 // HELPER
 //--------------------------------------------------------------------+
 
-#if 0 // no need to use fat12 helper
-typedef ATTR_PACKED_STRUCT(struct) {
-  //------------- common -------------//
-  uint8_t  jump_code[3]            ; ///< Assembly instruction to jump to boot code.
-  uint8_t  oem_name[8]             ; ///< OEM Name in ASCII.
-  uint16_t byte_per_sector         ; ///< Bytes per sector. Allowed values include 512, 1024, 2048, and 4096.
-  uint8_t  sector_per_cluster      ; ///< Sectors per cluster (data unit). Allowed values are powers of 2, but the cluster size must be 32KB or smaller.
-  uint16_t reserved_sectors        ; ///< Size in sectors of the reserved area.
-  uint8_t  fat_num                 ; ///< Number of FATs. Typically two for redundancy, but according to Microsoft it can be one for some small storage devices.
-  uint16_t fat12_root_entry_num    ; ///< Maximum number of files in the root directory for FAT12 and FAT16. This is 0 for FAT32 and typically 512 for FAT16.
-  uint16_t fat12_sector_num_16     ; ///< 16-bit number of sectors in file system. If the number of sectors is larger than can be represented in this 2-byte value, a 4-byte value exists later in the data structure and this should be 0.
-  uint8_t  media_type              ; ///< 0xf8 should be used for fixed disks and 0xf0 for removable.
-  uint16_t sector_per_fat          ; ///< 16-bit size in sectors of each FAT for FAT12 and FAT16. For FAT32, this field is 0.
-  uint16_t sector_per_track        ; ///< Sectors per track of storage device.
-  uint16_t head_num                ; ///< Number of heads in storage device.
-  uint32_t hidden_sectors          ; ///< Number of sectors before the start of partition.
-  uint32_t sector_num_32           ; ///< 32-bit value of number of sectors in file system. Either this value or the 16-bit value above must be 0.
-
-  //------------- FAT32 -------------//
-  uint8_t  drive_number            ; ///< Physical drive number (0x00 for (first) removable media, 0x80 for (first) fixed disk
-  uint8_t  reserved                ;
-  uint8_t  extended_boot_signature ; ///< should be 0x29
-  uint32_t volume_serial_number    ; ///< Volume serial number, which some versions of Windows will calculate based on the creation date and time.
-  uint8_t  volume_label[11]        ;
-  uint8_t  filesystem_type[8]      ; ///< File system type label in ASCII, padded with blank (0x20). Standard values include "FAT," "FAT12," and "FAT16," but nothing is required.
-  uint8_t  reserved2[448]          ;
-  uint16_t fat_signature           ; ///< Signature value (0xAA55).
-}fat12_boot_sector_t;
-
-STATIC_ASSERT(sizeof(fat12_boot_sector_t) == 512, "size is not correct");
-
-typedef ATTR_PACKED_STRUCT(struct) {
-  uint8_t name[11];
-
-  ATTR_PACKED_STRUCT(struct){
-    uint8_t readonly       : 1;
-    uint8_t hidden         : 1;
-    uint8_t system         : 1;
-    uint8_t volume_label   : 1;
-    uint8_t directory      : 1;
-    uint8_t archive        : 1;
-  } attr; // Long File Name = 0x0f
-
-  uint8_t reserved;
-  uint8_t created_time_tenths_of_seconds;
-  uint16_t created_time;
-  uint16_t created_date;
-  uint16_t accessed_date;
-  uint16_t cluster_high;
-  uint16_t written_time;
-  uint16_t written_date;
-  uint16_t cluster_low;
-  uint32_t file_size;
-}fat_directory_t;
-
-STATIC_ASSERT(sizeof(fat_directory_t) == 32, "size is not correct");
-
-void fat12_fs_init(uint8_t msc_device_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE])
-{
-  uint8_t const readme_contents[] =
-"This is tinyusb's MassStorage Class demo.\r\n\r\n\
-If you find any bugs or get any questions, feel free to file an\r\n\
-issue at https://github.com/hathach/tinyusb";
-
-  //------------- Boot Sector -------------//
-  fat12_boot_sector_t* p_boot_fat = (fat12_boot_sector_t* ) msc_device_ramdisk[0];
-  memclr_(p_boot_fat, sizeof(fat12_boot_sector_t));
-
-  memcpy(p_boot_fat->jump_code, "\xEB\x3C\x90", 3);
-  memcpy(p_boot_fat->oem_name, "MSDOS5.0", 8);
-  p_boot_fat->byte_per_sector         = DISK_BLOCK_SIZE;
-  p_boot_fat->sector_per_cluster      = 1;
-  p_boot_fat->reserved_sectors        = 1;
-  p_boot_fat->fat_num                 = 1;
-  p_boot_fat->fat12_root_entry_num    = 16;
-  p_boot_fat->fat12_sector_num_16     = DISK_BLOCK_NUM;
-  p_boot_fat->media_type              = 0xf8; // fixed disk
-  p_boot_fat->sector_per_fat          = 1;
-  p_boot_fat->sector_per_track        = 1;
-  p_boot_fat->head_num                = 1;
-  p_boot_fat->hidden_sectors          = 0;
-
-  p_boot_fat->drive_number            = 0x80;
-  p_boot_fat->extended_boot_signature = 0x29;
-  p_boot_fat->volume_serial_number    = 0x1234;
-  memcpy(p_boot_fat->volume_label   , "tinyusb msc", 11);
-  memcpy(p_boot_fat->filesystem_type,  "FAT12   ", 8);
-  p_boot_fat->fat_signature           = 0xAA55;
-
-  //------------- FAT12 Table (first 2 entries are F8FF, third entry is cluster end of readme file-------------//
-  memcpy(msc_device_ramdisk[1], "\xF8\xFF\xFF\xFF\x0F", 5);
-
-  //------------- Root Directory -------------//
-  fat_directory_t* p_entry = (fat_directory_t*) msc_device_ramdisk[2];
-
-  // first entry is volume label
-  (*p_entry) = (fat_directory_t)
-  {
-    .name = "TINYUSB MSC",
-    .attr.volume_label = 1,
-  };
-
-  p_entry += 1; // advance to second entry, second entry is readme file
-  (*p_entry) = (fat_directory_t)
-  {
-    .name = "README  TXT",
-
-    .created_time = 0x6D52,
-    .written_time = 0x6D52,
-
-    .created_date = 0x4365,
-    .accessed_date = 0x4365,
-    .written_date = 0x4365,
-
-    .cluster_high = 0,
-    .cluster_low = 2,
-    .file_size = sizeof(readme_contents)-1 // exculde NULL
-  }; // first entry is volume label
-
-  //------------- Readme Content -------------//
-  memcpy(msc_device_ramdisk[3], readme_contents, sizeof(readme_contents)-1);
-
-}
-#endif
-
 #endif