diff options
| author | hathach <[email protected]> | 2018-07-25 22:51:43 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-07-25 22:51:43 +0700 |
| commit | 226a4f8816ce265e4d90d9586699d70879fd3517 (patch) | |
| tree | 1ea520b5a99138e1f3cd00844d10c0e09ebe637f /examples | |
| parent | 93db46292a2e9446c8d5be53279dcc6c91613755 (diff) | |
clean up device msc
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/device/nrf52840/src/msc_device_app.c | 18 | ||||
| -rw-r--r-- | examples/obsolete/device/src/msc_device_app.c | 6 |
2 files changed, 13 insertions, 11 deletions
diff --git a/examples/device/nrf52840/src/msc_device_app.c b/examples/device/nrf52840/src/msc_device_app.c index 1dfce5e16..75d33d722 100644 --- a/examples/device/nrf52840/src/msc_device_app.c +++ b/examples/device/nrf52840/src/msc_device_app.c @@ -49,8 +49,10 @@ scsi_sense_fixed_data_t mscd_sense_data = { .response_code = 0x70, + .valid = 1, + .sense_key = 0, // no errors - .additional_sense_len = sizeof(scsi_sense_fixed_data_t) - 8 + .add_sense_len = sizeof(scsi_sense_fixed_data_t) - 8 }; static scsi_mode_parameters_t const msc_dev_mode_para = @@ -106,11 +108,11 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, len = 0; break; - case SCSI_CMD_START_STOP_UNIT: - // Host try to eject/safe remove/powerof us. We could safely disconnect with disk storage, or go into lower power - // scsi_start_stop_unit_t const * cmd_start_stop = (scsi_start_stop_unit_t const *) scsi_cmd - len = 0; - break; +// case SCSI_CMD_START_STOP_UNIT: +// // Host try to eject/safe remove/powerof us. We could safely disconnect with disk storage, or go into lower power +// // scsi_start_stop_unit_t const * cmd_start_stop = (scsi_start_stop_unit_t const *) scsi_cmd +// len = 0; +// break; default: // negative is error -> Data stage is STALL, status = failed @@ -135,8 +137,8 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, if ( SCSI_CMD_REQUEST_SENSE != scsi_cmd[0] ) { mscd_sense_data.sense_key = SCSI_SENSEKEY_NONE; - mscd_sense_data.additional_sense_code = 0; - mscd_sense_data.additional_sense_qualifier = 0; + mscd_sense_data.add_sense_code = 0; + mscd_sense_data.add_sense_qualifier = 0; } return len; diff --git a/examples/obsolete/device/src/msc_device_app.c b/examples/obsolete/device/src/msc_device_app.c index 572c90efd..0831d4444 100644 --- a/examples/obsolete/device/src/msc_device_app.c +++ b/examples/obsolete/device/src/msc_device_app.c @@ -67,7 +67,7 @@ static scsi_sense_fixed_data_t mscd_sense_data = { .response_code = 0x70, .sense_key = 0, // no errors - .additional_sense_len = sizeof(scsi_sense_fixed_data_t) - 8 + .add_sense_len = sizeof(scsi_sense_fixed_data_t) - 8 }; static scsi_read_format_capacity_data_t const mscd_format_capacity_data = @@ -169,8 +169,8 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, if ( SCSI_CMD_REQUEST_SENSE != scsi_cmd[0] ) { mscd_sense_data.sense_key = SCSI_SENSEKEY_NONE; - mscd_sense_data.additional_sense_code = 0; - mscd_sense_data.additional_sense_qualifier = 0; + mscd_sense_data.add_sense_code = 0; + mscd_sense_data.add_sense_qualifier = 0; } return len; |