3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32: Configure and enable usbotg endpoint0 during setup 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-08-30 12:02:18 -04:00
parent 4a178824aa
commit 9335cc4804
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/stm32/usbotg.c
View File

@ -299,34 +299,11 @@ usb_request_bootloader(void)
* Setup and interrupts * Setup and interrupts
****************************************************************/ ****************************************************************/
// Configure interface after a USB reset event
static void
usb_reset(void)
{
// Flush Rx queue
OTG->GRSTCTL = USB_OTG_GRSTCTL_RXFFLSH;
while (OTG->GRSTCTL & USB_OTG_GRSTCTL_RXFFLSH)
;
// Configure and enable ep0
uint32_t mpsize_ep0 = 2;
USB_OTG_INEndpointTypeDef *epi = EPIN(0);
USB_OTG_OUTEndpointTypeDef *epo = EPOUT(0);
epi->DIEPCTL = mpsize_ep0 | USB_OTG_DIEPCTL_SNAK;
epo->DOEPTSIZ = (64 | (1 << USB_OTG_DOEPTSIZ_STUPCNT_Pos)
| (1 << USB_OTG_DOEPTSIZ_PKTCNT_Pos));
epo->DOEPCTL = mpsize_ep0 | USB_OTG_DOEPCTL_EPENA | USB_OTG_DOEPCTL_CNAK;
}
// Main irq handler // Main irq handler
void void
OTG_FS_IRQHandler(void) OTG_FS_IRQHandler(void)
{ {
uint32_t sts = OTG->GINTSTS; uint32_t sts = OTG->GINTSTS;
if (sts & USB_OTG_GINTSTS_USBRST) {
OTG->GINTSTS = USB_OTG_GINTSTS_USBRST;
usb_reset();
}
if (sts & USB_OTG_GINTSTS_RXFLVL) { if (sts & USB_OTG_GINTSTS_RXFLVL) {
// Received data - disable irq and notify endpoint // Received data - disable irq and notify endpoint
OTG->GINTMSK &= ~USB_OTG_GINTMSK_RXFLVLM; OTG->GINTMSK &= ~USB_OTG_GINTMSK_RXFLVLM;
@ -375,10 +352,18 @@ usb_init(void)
// Setup USB packet memory // Setup USB packet memory
fifo_configure(); fifo_configure();
// Configure and enable ep0
uint32_t mpsize_ep0 = 2;
USB_OTG_INEndpointTypeDef *epi = EPIN(0);
USB_OTG_OUTEndpointTypeDef *epo = EPOUT(0);
epi->DIEPCTL = mpsize_ep0 | USB_OTG_DIEPCTL_SNAK;
epo->DOEPTSIZ = (64 | (1 << USB_OTG_DOEPTSIZ_STUPCNT_Pos)
| (1 << USB_OTG_DOEPTSIZ_PKTCNT_Pos));
epo->DOEPCTL = mpsize_ep0 | USB_OTG_DOEPCTL_EPENA | USB_OTG_DOEPCTL_CNAK;
// Enable interrupts // Enable interrupts
OTGD->DAINTMSK = (1 << 0) | (1 << USB_CDC_EP_BULK_IN); OTGD->DAINTMSK = (1 << 0) | (1 << USB_CDC_EP_BULK_IN);
OTG->GINTMSK = (USB_OTG_GINTMSK_USBRST OTG->GINTMSK = USB_OTG_GINTMSK_RXFLVLM | USB_OTG_GINTMSK_IEPINT;
| USB_OTG_GINTMSK_RXFLVLM | USB_OTG_GINTMSK_IEPINT);
OTG->GAHBCFG = USB_OTG_GAHBCFG_GINT; OTG->GAHBCFG = USB_OTG_GAHBCFG_GINT;
armcm_enable_irq(OTG_FS_IRQHandler, OTG_FS_IRQn, 1); armcm_enable_irq(OTG_FS_IRQHandler, OTG_FS_IRQn, 1);