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

ST FSDEV:Remove setting the EP kind, as I think it was causing issues during enumeration (sometimes). Also move a membar.

This commit is contained in:
Nathan Conrad 2019-09-25 20:17:53 -04:00
parent 9a8d23e95e
commit 048e0448c0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
View File

@ -252,7 +252,9 @@ void dcd_init (uint8_t rhport)
void dcd_int_enable (uint8_t rhport) void dcd_int_enable (uint8_t rhport)
{ {
(void)rhport; (void)rhport;
// Member here forces write to RAM before allowing ISR to execute
__DSB();
__ISB();
#if CFG_TUSB_MCU == OPT_MCU_STM32F0 || CFG_TUSB_MCU == OPT_MCU_STM32L0 #if CFG_TUSB_MCU == OPT_MCU_STM32F0 || CFG_TUSB_MCU == OPT_MCU_STM32L0
NVIC_EnableIRQ(USB_IRQn); NVIC_EnableIRQ(USB_IRQn);
#elif CFG_TUSB_MCU == OPT_MCU_STM32F3 #elif CFG_TUSB_MCU == OPT_MCU_STM32F3
@ -276,10 +278,7 @@ void dcd_int_disable(uint8_t rhport)
#else #else
#error Unknown arch in USB driver #error Unknown arch in USB driver
#endif #endif
// I'm not convinced that memory synchronization is completely necessary, but // CMSIS has a membar after disabling interrupts
// it isn't a bad idea.
__DSB();
__ISB();
} }
// Receive Set Address request, mcu port must also include status IN response // Receive Set Address request, mcu port must also include status IN response
@ -440,10 +439,10 @@ static uint16_t dcd_ep_ctr_handler(void)
} }
/* Process Control Data OUT status Packet*/ /* Process Control Data OUT status Packet*/
if(EPindex == 0u && xfer->total_len == 0u) /*if(EPindex == 0u && xfer->total_len == 0u)
{ {
pcd_clear_ep_kind(USB,0); // Good, so allow non-zero length packets now. pcd_clear_ep_kind(USB,0); // Good, so allow non-zero length packets now.
} }*/
dcd_event_xfer_complete(0, EPindex, xfer->total_len, XFER_RESULT_SUCCESS, true); dcd_event_xfer_complete(0, EPindex, xfer->total_len, XFER_RESULT_SUCCESS, true);
pcd_set_ep_rx_cnt(USB, EPindex, CFG_TUD_ENDPOINT0_SIZE); pcd_set_ep_rx_cnt(USB, EPindex, CFG_TUD_ENDPOINT0_SIZE);
@ -627,7 +626,9 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc
} }
pcd_set_ep_address(USB, epnum, epnum); pcd_set_ep_address(USB, epnum, epnum);
pcd_clear_ep_kind(USB,0); // Be normal, for now, instead of only accepting zero-byte packets // Be normal, for now, instead of only accepting zero-byte packets (on control endpoint)
// or being double-buffered (bulk endpoints)
pcd_clear_ep_kind(USB,0);
if(dir == TUSB_DIR_IN) if(dir == TUSB_DIR_IN)
{ {
@ -688,7 +689,7 @@ bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t
if (epnum == 0 && buffer == NULL) if (epnum == 0 && buffer == NULL)
{ {
xfer->buffer = (uint8_t*)_setup_packet; xfer->buffer = (uint8_t*)_setup_packet;
pcd_set_ep_kind(USB,0); // Expect a zero-byte INPUT //pcd_set_ep_kind(USB,0); // Expect a zero-byte INPUT
} }
if(total_bytes > xfer->max_packet_size) if(total_bytes > xfer->max_packet_size)
{ {