diff options
| author | Ha Thach <[email protected]> | 2021-09-07 18:06:40 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-09-07 18:06:40 +0700 |
| commit | 582e5dbac53aa2ac7c24249712081833986b3f27 (patch) | |
| tree | 0a4a1c6676cea9efb048945c270dee9ee74ed0e0 | |
| parent | 78f88cf5c4380f5a6c7a86397c48a7302ee36b47 (diff) | |
| parent | 785cdf67f0e03a456fd2dfad7b769b094f7e07ce (diff) | |
Merge pull request #1075 from hathach/fix-cxd56-msc
Fix cxd56 msc
| -rw-r--r-- | examples/make.mk | 2 | ||||
| -rw-r--r-- | hw/bsp/spresense/board.mk | 3 | ||||
| -rw-r--r-- | src/class/msc/msc_device.c | 15 |
3 files changed, 17 insertions, 3 deletions
diff --git a/examples/make.mk b/examples/make.mk index 9daf60e35..c894d35f4 100644 --- a/examples/make.mk +++ b/examples/make.mk @@ -65,10 +65,12 @@ MKDIR = mkdir ifeq ($(CMDEXE),1) CP = copy RM = del + PYTHON = python else SED = sed CP = cp RM = rm + PYTHON = python3 endif #-------------- Source files and compiler flags -------------- diff --git a/hw/bsp/spresense/board.mk b/hw/bsp/spresense/board.mk index a46c42bd6..ba291e817 100644 --- a/hw/bsp/spresense/board.mk +++ b/hw/bsp/spresense/board.mk @@ -70,4 +70,5 @@ $(BUILD)/$(PROJECT).spk: $(MKSPK) # flash flash: $(BUILD)/$(PROJECT).spk - @$(TOP)/hw/mcu/sony/cxd56/tools/flash_writer.py -s -c $(SERIAL) -d -b 115200 -n $< + @echo FLASH $< + @$(PYTHON) $(TOP)/hw/mcu/sony/cxd56/tools/flash_writer.py -s -c $(SERIAL) -d -b 115200 -n $< diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c index 71875b014..0fd592129 100644 --- a/src/class/msc/msc_device.c +++ b/src/class/msc/msc_device.c @@ -601,16 +601,27 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t // skip status if epin is currently stalled, will do it when received Clear Stall request if ( !usbd_edpt_stalled(rhport, p_msc->ep_in) ) { - if ( (p_msc->total_len > p_msc->xferred_len) && is_data_in(p_cbw->dir) ) + if ( (p_cbw->total_bytes > p_msc->xferred_len) && is_data_in(p_cbw->dir) ) { // 6.7 The 13 Cases: case 5 (Hi > Di): STALL before status - TU_LOG(MSC_DEBUG, " SCSI case 5 (Hi > Di): %lu > %lu\r\n", p_msc->total_len, p_msc->xferred_len); + TU_LOG(MSC_DEBUG, " SCSI case 5 (Hi > Di): %lu > %lu\r\n", p_cbw->total_bytes, p_msc->xferred_len); usbd_edpt_stall(rhport, p_msc->ep_in); }else { TU_ASSERT( send_csw(rhport, p_msc) ); } } + + #if TU_CHECK_MCU(CXD56) + // WORKAROUND: cxd56 has its own nuttx usb stack which does not forward Set/ClearFeature(Endpoint) to DCD. + // There is no way for us to know when EP is un-stall, therefore we will unconditionally un-stall here and + // hope everything will work + if ( usbd_edpt_stalled(rhport, p_msc->ep_in) ) + { + usbd_edpt_clear_stall(rhport, p_msc->ep_in); + send_csw(rhport, p_msc); + } + #endif } return true; |