jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stmfx07: usb: Enable ctrl_out only after done rcvd.

Browse Source 
This fixes the problem where the first four bytes were skipped in
the fifo.
This commit is contained in:
Jochen Hoenicke 2016-07-12 00:38:23 +02:00 committed by Karl Palsson
parent 94f92d54d6
commit 0c1ff686ad
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/usb/usb_fx07_common.c
View File

@ -247,11 +247,6 @@ uint16_t stm32fx07_ep_read_packet(usbd_device *usbd_dev, uint8_t addr,
memcpy(buf32, &extra, i); memcpy(buf32, &extra, i);
} }
REBASE(OTG_DOEPTSIZ(addr)) = usbd_dev->doeptsiz[addr];
REBASE(OTG_DOEPCTL(addr)) |= OTG_DOEPCTL0_EPENA |
(usbd_dev->force_nak[addr] ?
OTG_DOEPCTL0_SNAK : OTG_DOEPCTL0_CNAK);
return len; return len;
} }
@ -315,12 +310,21 @@ void stm32fx07_poll(usbd_device *usbd_dev)
/* Receive FIFO non-empty. */ /* Receive FIFO non-empty. */
uint32_t rxstsp = REBASE(OTG_GRXSTSP); uint32_t rxstsp = REBASE(OTG_GRXSTSP);
uint32_t pktsts = rxstsp & OTG_GRXSTSP_PKTSTS_MASK; uint32_t pktsts = rxstsp & OTG_GRXSTSP_PKTSTS_MASK;
uint8_t ep = rxstsp & OTG_GRXSTSP_EPNUM_MASK;
if (pktsts == OTG_GRXSTSP_PKTSTS_OUT_COMP
|| pktsts == OTG_GRXSTSP_PKTSTS_SETUP_COMP) {
REBASE(OTG_DOEPTSIZ(ep)) = usbd_dev->doeptsiz[ep];
REBASE(OTG_DOEPCTL(ep)) |= OTG_DOEPCTL0_EPENA |
(usbd_dev->force_nak[ep] ?
OTG_DOEPCTL0_SNAK : OTG_DOEPCTL0_CNAK);
return;
}
if ((pktsts != OTG_GRXSTSP_PKTSTS_OUT) && if ((pktsts != OTG_GRXSTSP_PKTSTS_OUT) &&
(pktsts != OTG_GRXSTSP_PKTSTS_SETUP)) { (pktsts != OTG_GRXSTSP_PKTSTS_SETUP)) {
return; return;
} }
uint8_t ep = rxstsp & OTG_GRXSTSP_EPNUM_MASK;
uint8_t type; uint8_t type;
if (pktsts == OTG_GRXSTSP_PKTSTS_SETUP) { if (pktsts == OTG_GRXSTSP_PKTSTS_SETUP) {
type = USB_TRANSACTION_SETUP; type = USB_TRANSACTION_SETUP;
@ -339,15 +343,6 @@ void stm32fx07_poll(usbd_device *usbd_dev)
/* Save packet size for stm32f107_ep_read_packet(). */ /* Save packet size for stm32f107_ep_read_packet(). */
usbd_dev->rxbcnt = (rxstsp & OTG_GRXSTSP_BCNT_MASK) >> 4; usbd_dev->rxbcnt = (rxstsp & OTG_GRXSTSP_BCNT_MASK) >> 4;
/*
* FIXME: Why is a delay needed here?
* This appears to fix a problem where the first 4 bytes
* of the DATA OUT stage of a control transaction are lost.
*/
for (i = 0; i < 1000; i++) {
__asm__("nop");
}
if (usbd_dev->user_callback_ctr[ep][type]) { if (usbd_dev->user_callback_ctr[ep][type]) {
usbd_dev->user_callback_ctr[ep][type] (usbd_dev, ep); usbd_dev->user_callback_ctr[ep][type] (usbd_dev, ep);
} }