kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up host msc

This commit is contained in:
hathach 2021-02-23 12:20:30 +07:00
parent cea31c346d
commit 386a386345
2 changed files with 56 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/class/msc/msc_host.c
View File

@ -99,11 +99,12 @@ bool tuh_msc_is_busy(uint8_t dev_addr)
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// PUBLIC API: SCSI COMMAND // PUBLIC API: SCSI COMMAND
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
static inline void msc_cbw_add_signature(msc_cbw_t *p_cbw, uint8_t lun) static inline void cbw_init(msc_cbw_t *cbw, uint8_t lun)
{ {
p_cbw->signature = MSC_CBW_SIGNATURE; tu_memclr(cbw, sizeof(msc_cbw_t));
p_cbw->tag = 0x54555342; // TUSB cbw->signature = MSC_CBW_SIGNATURE;
p_cbw->lun = lun; cbw->tag = 0x54555342; // TUSB
cbw->lun = lun;
} }
bool tuh_msc_scsi_command(uint8_t dev_addr, msc_cbw_t const* cbw, void* data, tuh_msc_complete_cb_t complete_cb) bool tuh_msc_scsi_command(uint8_t dev_addr, msc_cbw_t const* cbw, void* data, tuh_msc_complete_cb_t complete_cb)
@ -126,11 +127,11 @@ bool tuh_msc_scsi_command(uint8_t dev_addr, msc_cbw_t const* cbw, void* data, tu
bool tuh_msc_read_capacity(uint8_t dev_addr, uint8_t lun, scsi_read_capacity10_resp_t* response, tuh_msc_complete_cb_t complete_cb) bool tuh_msc_read_capacity(uint8_t dev_addr, uint8_t lun, scsi_read_capacity10_resp_t* response, tuh_msc_complete_cb_t complete_cb)
{ {
msch_interface_t* p_msc = get_itf(dev_addr); msch_interface_t* p_msc = get_itf(dev_addr);
if ( !p_msc->mounted ) return false; TU_VERIFY(p_msc->mounted);
msc_cbw_t cbw = { 0 }; msc_cbw_t cbw;
cbw_init(&cbw, lun);
msc_cbw_add_signature(&cbw, lun);
cbw.total_bytes = sizeof(scsi_read_capacity10_resp_t); cbw.total_bytes = sizeof(scsi_read_capacity10_resp_t);
cbw.dir = TUSB_DIR_IN_MASK; cbw.dir = TUSB_DIR_IN_MASK;
cbw.cmd_len = sizeof(scsi_read_capacity10_t); cbw.cmd_len = sizeof(scsi_read_capacity10_t);
@ -141,9 +142,9 @@ bool tuh_msc_read_capacity(uint8_t dev_addr, uint8_t lun, scsi_read_capacity10_r
bool tuh_msc_inquiry(uint8_t dev_addr, uint8_t lun, scsi_inquiry_resp_t* response, tuh_msc_complete_cb_t complete_cb) bool tuh_msc_inquiry(uint8_t dev_addr, uint8_t lun, scsi_inquiry_resp_t* response, tuh_msc_complete_cb_t complete_cb)
{ {
msc_cbw_t cbw = { 0 }; msc_cbw_t cbw;
cbw_init(&cbw, lun);
msc_cbw_add_signature(&cbw, lun);
cbw.total_bytes = sizeof(scsi_inquiry_resp_t); cbw.total_bytes = sizeof(scsi_inquiry_resp_t);
cbw.dir = TUSB_DIR_IN_MASK; cbw.dir = TUSB_DIR_IN_MASK;
cbw.cmd_len = sizeof(scsi_inquiry_t); cbw.cmd_len = sizeof(scsi_inquiry_t);
@ -160,8 +161,8 @@ bool tuh_msc_inquiry(uint8_t dev_addr, uint8_t lun, scsi_inquiry_resp_t* respons
bool tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, tuh_msc_complete_cb_t complete_cb) bool tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, tuh_msc_complete_cb_t complete_cb)
{ {
msc_cbw_t cbw = { 0 }; msc_cbw_t cbw;
msc_cbw_add_signature(&cbw, lun); cbw_init(&cbw, lun);
cbw.total_bytes = 0; // Number of bytes cbw.total_bytes = 0; // Number of bytes
cbw.dir = TUSB_DIR_OUT; cbw.dir = TUSB_DIR_OUT;
@ -174,8 +175,8 @@ bool tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, tuh_msc_complete_cb_
bool tuh_msc_request_sense(uint8_t dev_addr, uint8_t lun, void *resposne, tuh_msc_complete_cb_t complete_cb) bool tuh_msc_request_sense(uint8_t dev_addr, uint8_t lun, void *resposne, tuh_msc_complete_cb_t complete_cb)
{ {
msc_cbw_t cbw = { 0 }; msc_cbw_t cbw;
msc_cbw_add_signature(&cbw, lun); cbw_init(&cbw, lun);
cbw.total_bytes = 18; // TODO sense response cbw.total_bytes = 18; // TODO sense response
cbw.dir = TUSB_DIR_IN_MASK; cbw.dir = TUSB_DIR_IN_MASK;
@ -192,58 +193,52 @@ bool tuh_msc_request_sense(uint8_t dev_addr, uint8_t lun, void *resposne, tuh_ms
return tuh_msc_scsi_command(dev_addr, &cbw, resposne, complete_cb); return tuh_msc_scsi_command(dev_addr, &cbw, resposne, complete_cb);
} }
bool tuh_msc_read10(uint8_t dev_addr, uint8_t lun, void * p_buffer, uint32_t lba, uint16_t block_count, tuh_msc_complete_cb_t complete_cb) bool tuh_msc_read10(uint8_t dev_addr, uint8_t lun, void * buffer, uint32_t lba, uint16_t block_count, tuh_msc_complete_cb_t complete_cb)
{ {
msch_interface_t* p_msc = get_itf(dev_addr); msch_interface_t* p_msc = get_itf(dev_addr);
if ( !p_msc->mounted ){ return false;}; TU_VERIFY(p_msc->mounted);
msc_cbw_t cbw = { 0 }; msc_cbw_t cbw;
cbw_init(&cbw, lun);
//------------- Command Block Wrapper -------------// cbw.total_bytes = 512*block_count; // Number of bytes TODO get block size from READ CAPACITY 10
msc_cbw_add_signature(&cbw, lun);
cbw.total_bytes = 512*block_count; // Number of bytes
cbw.dir = TUSB_DIR_IN_MASK; cbw.dir = TUSB_DIR_IN_MASK;
cbw.cmd_len = sizeof(scsi_read10_t); cbw.cmd_len = sizeof(scsi_read10_t);
//------------- SCSI command -------------//
scsi_read10_t cmd_read10 = scsi_read10_t cmd_read10 =
{ {
.cmd_code = SCSI_CMD_READ_10, .cmd_code = SCSI_CMD_READ_10,
.lba = tu_htonl(lba), .lba = tu_htonl(lba),
.block_count = tu_htons(block_count) .block_count = tu_htons(block_count)
}; };
memcpy(cbw.command, &cmd_read10, cbw.cmd_len); memcpy(cbw.command, &cmd_read10, cbw.cmd_len);
return tuh_msc_scsi_command(dev_addr, &cbw, p_buffer, complete_cb); return tuh_msc_scsi_command(dev_addr, &cbw, buffer, complete_cb);
} }
bool tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void * p_buffer, uint32_t lba, uint16_t block_count, tuh_msc_complete_cb_t complete_cb) bool tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * buffer, uint32_t lba, uint16_t block_count, tuh_msc_complete_cb_t complete_cb)
{ {
msch_interface_t* p_msc = get_itf(dev_addr); msch_interface_t* p_msc = get_itf(dev_addr);
if ( !p_msc->mounted ){ return false;}; TU_VERIFY(p_msc->mounted);
msc_cbw_t cbw = { 0 };
//------------- Command Block Wrapper -------------//
msc_cbw_add_signature(&cbw, lun);
cbw.total_bytes = 512*block_count; // Number of bytes
cbw.dir = TUSB_DIR_OUT;
cbw.cmd_len = sizeof(scsi_write10_t);
//------------- SCSI command -------------// msc_cbw_t cbw;
scsi_write10_t cmd_write10 = cbw_init(&cbw, lun);
{
.cmd_code = SCSI_CMD_WRITE_10, cbw.total_bytes = 512*block_count; // Number of bytes TODO get block size from READ CAPACITY 10
.lba = tu_htonl(lba), cbw.dir = TUSB_DIR_OUT;
.block_count = tu_htons(block_count) cbw.cmd_len = sizeof(scsi_write10_t);
};
scsi_write10_t cmd_write10 =
memcpy(cbw.command, &cmd_write10, cbw.cmd_len); {
.cmd_code = SCSI_CMD_WRITE_10,
return tuh_msc_scsi_command(dev_addr, &cbw, p_buffer, complete_cb); .lba = tu_htonl(lba),
.block_count = tu_htons(block_count)
};
memcpy(cbw.command, &cmd_write10, cbw.cmd_len);
return tuh_msc_scsi_command(dev_addr, &cbw, (void*) buffer, complete_cb);
} }
#if 0 #if 0

36
src/class/msc/msc_host.h
View File

@ -58,43 +58,33 @@ bool tuh_msc_is_busy(uint8_t dev_addr);
uint8_t tuh_msc_get_maxlun(uint8_t dev_addr); uint8_t tuh_msc_get_maxlun(uint8_t dev_addr);
// Perform a full SCSI command (cbw, data, csw) in non-blocking manner. // Perform a full SCSI command (cbw, data, csw) in non-blocking manner.
// `complete_cb` callback is invoked when SCSI op is complete. // Complete callback is invoked when SCSI op is complete.
// return true if success, false if there is already pending operation. // return true if success, false if there is already pending operation.
bool tuh_msc_scsi_command(uint8_t dev_addr, msc_cbw_t const* cbw, void* data, tuh_msc_complete_cb_t complete_cb); bool tuh_msc_scsi_command(uint8_t dev_addr, msc_cbw_t const* cbw, void* data, tuh_msc_complete_cb_t complete_cb);
// Perform SCSI Inquiry command // Perform SCSI Inquiry command
// Complete callback is invoked when SCSI op is complete.
bool tuh_msc_inquiry(uint8_t dev_addr, uint8_t lun, scsi_inquiry_resp_t* response, tuh_msc_complete_cb_t complete_cb); bool tuh_msc_inquiry(uint8_t dev_addr, uint8_t lun, scsi_inquiry_resp_t* response, tuh_msc_complete_cb_t complete_cb);
// Perform SCSI Test Unit Ready command // Perform SCSI Test Unit Ready command
// Complete callback is invoked when SCSI op is complete.
bool tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, tuh_msc_complete_cb_t complete_cb); bool tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, tuh_msc_complete_cb_t complete_cb);
// Perform SCSI Request Sense (10) command // Perform SCSI Request Sense 10 command
// Complete callback is invoked when SCSI op is complete.
bool tuh_msc_request_sense(uint8_t dev_addr, uint8_t lun, void *resposne, tuh_msc_complete_cb_t complete_cb); bool tuh_msc_request_sense(uint8_t dev_addr, uint8_t lun, void *resposne, tuh_msc_complete_cb_t complete_cb);
// Perform SCSI Read Capacity (10) command // Perform SCSI Read Capacity 10 command
// Complete callback is invoked when SCSI op is complete.
bool tuh_msc_read_capacity(uint8_t dev_addr, uint8_t lun, scsi_read_capacity10_resp_t* response, tuh_msc_complete_cb_t complete_cb); bool tuh_msc_read_capacity(uint8_t dev_addr, uint8_t lun, scsi_read_capacity10_resp_t* response, tuh_msc_complete_cb_t complete_cb);
/** \brief Perform SCSI READ 10 command to read data from MassStorage device // Perform SCSI Read 10 command. Read n blocks starting from LBA to buffer
* \param[in] dev_addr device address // Complete callback is invoked when SCSI op is complete.
* \param[in] lun Targeted Logical Unit bool tuh_msc_read10(uint8_t dev_addr, uint8_t lun, void * buffer, uint32_t lba, uint16_t block_count, tuh_msc_complete_cb_t complete_cb);
* \param[out] p_buffer Buffer used to store data read from device. Must be accessible by USB controller (see \ref CFG_TUSB_MEM_SECTION)
* \param[in] lba Starting Logical Block Address to be read
* \param[in] block_count Number of Block to be read
* \retval true on success
* \note This function is non-blocking and returns immediately. The result of USB transfer will be reported by \ref complete_cb callback function
*/
bool tuh_msc_read10(uint8_t dev_addr, uint8_t lun, void * p_buffer, uint32_t lba, uint16_t block_count, tuh_msc_complete_cb_t complete_cb);
/** \brief Perform SCSI WRITE 10 command to write data to MassStorage device // Perform SCSI Write 10 command. Write n blocks starting from LBA to device
* \param[in] dev_addr device address // Complete callback is invoked when SCSI op is complete.
* \param[in] lun Targeted Logical Unit bool tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * buffer, uint32_t lba, uint16_t block_count, tuh_msc_complete_cb_t complete_cb);
* \param[in] p_buffer Buffer containing data. Must be accessible by USB controller (see \ref CFG_TUSB_MEM_SECTION)
* \param[in] lba Starting Logical Block Address to be written
* \param[in] block_count Number of Block to be written
* \retval true on success
* \note This function is non-blocking and returns immediately. The result of USB transfer will be reported by \ref complete_cb callback function
*/
bool tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void * p_buffer, uint32_t lba, uint16_t block_count, tuh_msc_complete_cb_t complete_cb);
//------------- Application Callback -------------// //------------- Application Callback -------------//