Skip to content

Fix isochronous out endpoints only receiving data on odd frames (on the STM32f411 mcu) #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theawsomeavr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix isochronous out endpoints only receiving data on odd frames (on the STM32f411 mcu) #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion src/usbd_stm32f429_otgfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,15 @@ static void enable(bool enable) {
OTG->DIEPTXF0_HNPTXFSIZ = RX_FIFO_SZ | (0x10 << 16);
/* unmask EP interrupts */
OTGD->DIEPMSK = USB_OTG_DIEPMSK_XFRCM;
OTGD->DOEPMSK = USB_OTG_DOEPMSK_XFRCM;
/* unmask core interrupts */
OTG->GINTMSK = USB_OTG_GINTMSK_USBRST | USB_OTG_GINTMSK_ENUMDNEM |
#if !defined(USBD_SOF_DISABLED)
USB_OTG_GINTMSK_SOFM |
#endif
USB_OTG_GINTMSK_USBSUSPM | USB_OTG_GINTMSK_WUIM |
USB_OTG_GINTMSK_IEPINT | USB_OTG_GINTMSK_RXFLVLM;
USB_OTG_GINTMSK_IEPINT | USB_OTG_GINTMSK_RXFLVLM |
USB_OTG_GINTMSK_OEPINT;
/* clear pending interrupts */
OTG->GINTSTS = 0xFFFFFFFF;
/* unmask global interrupt */
Expand Down Expand Up @@ -424,6 +426,29 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
} else if (_t & USB_OTG_GINTSTS_WKUINT) {
OTG->GINTSTS = USB_OTG_GINTSTS_WKUINT;
evt = usbd_evt_wkup;
} else if(_t & USB_OTG_GINTSTS_OEPINT){
for(int cur_ep = 0; cur_ep < MAX_EP; cur_ep++){
USB_OTG_OUTEndpointTypeDef* epo = EPOUT(cur_ep);
if (epo->DOEPINT & USB_OTG_DOEPINT_XFRC) {
epo->DOEPINT = USB_OTG_DOEPINT_XFRC;

uint8_t ep_is_isochr =
_FLD2VAL(USB_OTG_DOEPCTL_EPTYP, epo->DOEPCTL) == USB_EPTYPE_ISOCHRONUS;

// Since isochronous endpoints can only receive data on the
// specified odd or even frame num, after each reception we must
// configure the EONUM field
if (ep_is_isochr) {
uint8_t odd_now = _FLD2VAL(USB_OTG_DSTS_FNSOF, OTGD->DSTS) & 1u;
if (odd_now) {
epo->DOEPCTL |= USB_OTG_DOEPCTL_SD0PID_SEVNFRM;
} else {
epo->DOEPCTL |= USB_OTG_DOEPCTL_SODDFRM;
}
}
}
}
continue;
} else {
/* no more supported events */
return;
Expand Down