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

fix rp2040 chapter 9 TD 9.6 test

This commit is contained in:
hathach 2021-08-31 17:41:08 +07:00
parent d047b28aa2
commit ab0c3e8dd0
No known key found for this signature in database
GPG Key ID: 2FA891220FBFD581
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/class/msc/msc_device.c
View File

@ -323,10 +323,14 @@ bool mscd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t
if ( p_msc->stage == MSC_STAGE_CMD ) if ( p_msc->stage == MSC_STAGE_CMD )
{ {
// part of reset recovery (probably due to invalid CBW) -> prepare for new command // part of reset recovery (probably due to invalid CBW) -> prepare for new command
// Note: skip if already queued previously
if ( usbd_edpt_ready(rhport, p_msc->ep_out) )
{
TU_ASSERT( prepare_cbw(rhport, p_msc) ); TU_ASSERT( prepare_cbw(rhport, p_msc) );
} }
} }
} }
}
return true; return true;
} }

6
src/portable/raspberrypi/rp2040/dcd_rp2040.c
View File

@ -389,16 +389,14 @@ void dcd_remote_wakeup(uint8_t rhport)
// disconnect by disabling internal pull-up resistor on D+/D- // disconnect by disabling internal pull-up resistor on D+/D-
void dcd_disconnect(uint8_t rhport) void dcd_disconnect(uint8_t rhport)
{ {
pico_info("dcd_disconnect %d\n", rhport); (void) rhport;
assert(rhport == 0);
usb_hw_clear->sie_ctrl = USB_SIE_CTRL_PULLUP_EN_BITS; usb_hw_clear->sie_ctrl = USB_SIE_CTRL_PULLUP_EN_BITS;
} }
// connect by enabling internal pull-up resistor on D+/D- // connect by enabling internal pull-up resistor on D+/D-
void dcd_connect(uint8_t rhport) void dcd_connect(uint8_t rhport)
{ {
pico_info("dcd_connect %d\n", rhport); (void) rhport;
assert(rhport == 0);
usb_hw_set->sie_ctrl = USB_SIE_CTRL_PULLUP_EN_BITS; usb_hw_set->sie_ctrl = USB_SIE_CTRL_PULLUP_EN_BITS;
} }