djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

house keeping

Browse Source
This commit is contained in:
hathach 2018-07-27 17:22:21 +07:00
parent e86f7d0b88
commit 21339c4155
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tinyusb

@ -1 +1 @@
Subproject commit 72b600c393e543361b073abee3da823d41383660 Subproject commit cf6c534c1974f4efeb5c136697d1f1028e6aa34a

25
ports/nrf/usb/usb_msc_flash.c
View File

@ -57,24 +57,29 @@
// - READ_CAPACITY10, READ_FORMAT_CAPACITY, INQUIRY, MODE_SENSE6, REQUEST_SENSE // - READ_CAPACITY10, READ_FORMAT_CAPACITY, INQUIRY, MODE_SENSE6, REQUEST_SENSE
// - READ10 and WRITE10 has their own callbacks // - READ10 and WRITE10 has their own callbacks
int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize) { int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize) {
void const* resp = NULL; void const* response = NULL;
uint16_t len = 0; uint16_t resplen = 0;
switch ( scsi_cmd[0] ) { switch ( scsi_cmd[0] ) {
case SCSI_CMD_TEST_UNIT_READY: case SCSI_CMD_TEST_UNIT_READY:
// Command that host uses to check our readiness before sending other commands // Command that host uses to check our readiness before sending other commands
len = 0; resplen = 0;
break; break;
case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL: case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:
// Host is about to read/write etc ... better not to disconnect disk // Host is about to read/write etc ... better not to disconnect disk
len = 0; resplen = 0;
break; break;
case SCSI_CMD_START_STOP_UNIT: case SCSI_CMD_START_STOP_UNIT:
// Host try to eject/safe remove/poweroff us. We could safely disconnect with disk storage, or go into lower power // Host try to eject/safe remove/poweroff 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 /* scsi_start_stop_unit_t const * start_stop = (scsi_start_stop_unit_t const *) scsi_cmd;
len = 0; // Start bit = 0 : low power mode, if load_eject = 1 : unmount disk storage as well
// Start bit = 1 : Ready mode, if load_eject = 1 : mount disk storage
start_stop->start;
start_stop->load_eject;
*/
resplen = 0;
break; break;
// negative means error -> tusb could stall and/or response with failed status // negative means error -> tusb could stall and/or response with failed status
@ -82,14 +87,14 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer,
} }
// return len must not larger than bufsize // return len must not larger than bufsize
if ( len > bufsize ) len = bufsize; if ( resplen > bufsize ) resplen = bufsize;
// copy response to stack's buffer if any // copy response to stack's buffer if any
if ( resp && len ) { if ( response && resplen ) {
memcpy(buffer, resp, len); memcpy(buffer, response, resplen);
} }
return len; return resplen;
} }
// Callback invoked when received READ10 command. // Callback invoked when received READ10 command.