mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-20 18:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
hathach 2018-06-12 23:08:03 +07:00
parent fa2e043126
commit d6cb34ff22
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tinyusb/class/msc/msc_device.c
View File

@ -372,7 +372,6 @@ static void proc_read10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
msc_csw_t * p_csw = &p_msc->csw; msc_csw_t * p_csw = &p_msc->csw;
uint32_t lba = rdwr10_get_lba(p_cbw->command); uint32_t lba = rdwr10_get_lba(p_cbw->command);
uint16_t block_count = rdwr10_get_blockcount(p_cbw->command);
// remaining bytes capped at class buffer // remaining bytes capped at class buffer
int32_t nbytes = (int32_t) min32_of(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len); int32_t nbytes = (int32_t) min32_of(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len);
@ -402,10 +401,6 @@ static void proc_read10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
static void proc_write10_cmd(uint8_t rhport, mscd_interface_t* p_msc) static void proc_write10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
{ {
msc_cbw_t const * p_cbw = &p_msc->cbw; msc_cbw_t const * p_cbw = &p_msc->cbw;
msc_csw_t * p_csw = &p_msc->csw;
uint32_t lba = rdwr10_get_lba(p_cbw->command);
uint16_t block_count = rdwr10_get_blockcount(p_cbw->command);
// remaining bytes capped at class buffer // remaining bytes capped at class buffer
int32_t nbytes = (int32_t) min32_of(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len); int32_t nbytes = (int32_t) min32_of(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len);

17
tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c
View File

@ -224,20 +224,9 @@ static void normal_xact_start(uint8_t epnum, uint8_t dir)
{ {
if ( dir == TUSB_DIR_OUT ) if ( dir == TUSB_DIR_OUT )
{ {
// Errata : HW issue on nrf5284 sample, SIZE.EPOUT won't trigger ACK as spec // Overwrite size will allow hw to accept data
// use the back door interface as sdk for walk around NRF_USBD->SIZE.EPOUT[epnum] = 0;
if ( nrf_drv_usbd_errata_sizeepout_rw() ) __ISB(); __DSB();
{
*((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7C5 + 2*epnum;
*((volatile uint32_t *)(NRF_USBD_BASE + 0x804)) = 0;
(void) (((volatile uint32_t *)(NRF_USBD_BASE + 0x804)));
}
else
{
// Overwrite size will allow hw to accept data
NRF_USBD->SIZE.EPOUT[epnum] = 0;
__ISB(); __DSB();
}
}else }else
{ {
nom_xfer_t* xfer = get_td(epnum, dir); nom_xfer_t* xfer = get_td(epnum, dir);