andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

improving msc device driver

Browse Source
This commit is contained in:
hathach
2018-04-18 13:20:31 +07:00
parent a18f47353c
commit e872962b25
5 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
examples/obsolete/device/src/msc_device_app.c
View File

@@ -63,7 +63,7 @@ static scsi_read_capacity10_data_t const mscd_read_capacity10_data =
.block_size = ENDIAN_BE(DISK_BLOCK_SIZE)
};
scsi_sense_fixed_data_t mscd_sense_data =
static scsi_sense_fixed_data_t mscd_sense_data =
{
.response_code = 0x70,
.sense_key = 0, // no errors
@@ -99,47 +99,62 @@ void msc_app_umount(uint8_t rhport)
}
msc_csw_status_t tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t scsi_cmd[16], void const ** pp_buffer, uint16_t* p_length)
msc_csw_status_t tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t scsi_cmd[16], void* buffer, uint16_t* p_len)
{
// read10 & write10 has their own callback and MUST not be handled here
void* bufptr = NULL;
uint16_t buflen = 0;
switch (scsi_cmd[0])
{
case SCSI_CMD_INQUIRY:
(*pp_buffer) = &mscd_inquiry_data;
(*p_length) = sizeof(scsi_inquiry_data_t);
bufptr = &mscd_inquiry_data;
buflen = sizeof(scsi_inquiry_data_t);
break;
case SCSI_CMD_READ_CAPACITY_10:
(*pp_buffer) = &mscd_read_capacity10_data;
(*p_length) = sizeof(scsi_read_capacity10_data_t);
bufptr = &mscd_read_capacity10_data;
buflen = sizeof(scsi_read_capacity10_data_t);
break;
case SCSI_CMD_REQUEST_SENSE:
(*pp_buffer) = &mscd_sense_data;
(*p_length) = sizeof(scsi_sense_fixed_data_t);
bufptr = &mscd_sense_data;
buflen = sizeof(scsi_sense_fixed_data_t);
break;
case SCSI_CMD_READ_FORMAT_CAPACITY:
(*pp_buffer) = &mscd_format_capacity_data;
(*p_length) = sizeof(scsi_read_format_capacity_data_t);
bufptr = &mscd_format_capacity_data;
buflen = sizeof(scsi_read_format_capacity_data_t);
break;
case SCSI_CMD_MODE_SENSE_6:
(*pp_buffer) = &msc_dev_mode_para;
(*p_length) = sizeof(msc_dev_mode_para);
bufptr = &msc_dev_mode_para;
buflen = sizeof(msc_dev_mode_para);
break;
case SCSI_CMD_TEST_UNIT_READY:
(*pp_buffer) = NULL;
(*p_length) = 0;
bufptr = NULL;
buflen= 0;
break;
case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:
(*pp_buffer) = NULL;
(*p_length) = 0;
bufptr = NULL;
buflen= 0;
break;
default: return MSC_CSW_STATUS_FAILED;
default:
(*p_len) = 0;
return MSC_CSW_STATUS_FAILED;
}
if ( bufptr && buflen )
{
// Response len must not larger than expected from host
TU_ASSERT( (*p_len) >= buflen, MSC_CSW_STATUS_FAILED);
memcpy(buffer, bufptr, buflen);
(*p_len) = buflen;
}
//------------- clear sense data if it is not request sense command -------------//

2
examples/obsolete/device/src/msc_device_app.h
View File

@@ -75,8 +75,6 @@ void msc_app_task(void* param);
void msc_app_mount(uint8_t rhport);
void msc_app_umount(uint8_t rhport);
extern scsi_sense_fixed_data_t mscd_sense_data;
#else
#define msc_app_init()

4
examples/obsolete/device/src/tusb_config.h
View File

@@ -57,8 +57,8 @@
#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
#define CFG_TUD_HID_KEYBOARD 1
#define CFG_TUD_HID_MOUSE 1
#define CFG_TUD_HID_KEYBOARD 0
#define CFG_TUD_HID_MOUSE 0
#define CFG_TUD_HID_GENERIC 0 // not supported yet
#define CFG_TUD_MSC 1
#define CFG_TUD_CDC 1