diff options
| -rw-r--r-- | demos/bsp/boards/printf_retarget.c | 2 | ||||
| -rw-r--r-- | demos/host/src/msc_app.c | 10 | ||||
| -rw-r--r-- | tinyusb/class/msc_host.c | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/demos/bsp/boards/printf_retarget.c b/demos/bsp/boards/printf_retarget.c index 33a071274..8c66b765b 100644 --- a/demos/bsp/boards/printf_retarget.c +++ b/demos/bsp/boards/printf_retarget.c @@ -83,8 +83,6 @@ int __sys_write (int iFileHandle, char *pcBuffer, int iLength) #elif CFG_PRINTF_TARGET == PRINTF_TARGET_SWO #error author does not know how to retarget SWO with lpcxpresso/red-suite -#else - #error Thach, did you forget something #endif } diff --git a/demos/host/src/msc_app.c b/demos/host/src/msc_app.c index 0f37842e0..5c3881826 100644 --- a/demos/host/src/msc_app.c +++ b/demos/host/src/msc_app.c @@ -95,11 +95,11 @@ void tusbh_msc_mounted_cb(uint8_t dev_addr) return; } - puts("---------------------------------------------------------------------"); - puts("- MASSSTORAGE CLASS CLI IS A NON-MATURE CODE. DISK-WRITING COMMANDS -"); - puts("- SUCH AS cp(COPY), mkdir(MAKE DIRECTORY) ARE POTENTIAL TO DAMAGE -"); - puts("- YOUR USB THUMBDRIVE. USING THOSE COMMANDS ARE AT YOUR OWN RISK. -"); - puts("- THE AUTHOR HAS NO RESPONSIBILITY WITH YOUR DEVICE NOR ITS DATA -"); + puts("-------------------------------------------------------------------"); + puts("- MASSSTORAGE CLASS CLI IS A IMMATURE CODE. DISK-WRITING COMMANDS -"); + puts("- SUCH AS cp(COPY), mkdir(MAKE DIRECTORY) ARE POTENTIAL TO DAMAGE -"); + puts("- YOUR USB THUMBDRIVE. USING THOSE COMMANDS ARE AT YOUR OWN RISK. -"); + puts("- THE AUTHOR HAS NO RESPONSIBILITY WITH YOUR DEVICE NOR ITS DATA -"); puts("---------------------------------------------------------------------"); f_chdrive(dev_addr-1); // change to newly mounted drive diff --git a/tinyusb/class/msc_host.c b/tinyusb/class/msc_host.c index 26beeae13..af85606cf 100644 --- a/tinyusb/class/msc_host.c +++ b/tinyusb/class/msc_host.c @@ -380,7 +380,7 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con ); hcd_pipe_clear_stall(msch_data[dev_addr-1].bulk_in); - osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT, &error); + osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT, &error); // wait for SCSI status SUBTASK_ASSERT_STATUS(error); //------------- SCSI Request Sense -------------// @@ -397,8 +397,6 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con msch_data[dev_addr-1].last_lba = __be2le( ((scsi_read_capacity10_data_t*)msch_buffer)->last_lba ); msch_data[dev_addr-1].block_size = (uint16_t) __be2le( ((scsi_read_capacity10_data_t*)msch_buffer)->block_size ); - osal_semaphore_wait(msch_sem_hdl, SCSI_XFER_TIMEOUT, &error); - msch_data[dev_addr-1].is_initialized = true; tusbh_msc_mounted_cb(dev_addr); |