riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nrf52: Add suspend/resume detection to usbdev

Browse Source
This commit is contained in:
Koen Zandberg 2019-06-14 13:07:34 +02:00
parent 49144008e3
commit ee39222b2e
No known key found for this signature in database
GPG Key ID: 0895A893E6D2985B
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cpu/nrf52/periph/usbdev.c
View File

@ -275,7 +275,9 @@ static void _init(usbdev_t *dev)
usbdev->sstate = NRFUSB_SETUP_READY; usbdev->sstate = NRFUSB_SETUP_READY;
/* Enable a set of interrupts */ /* Enable a set of interrupts */
usbdev->device->INTEN = USBD_INTEN_USBRESET_Msk | USBD_INTEN_EPDATA_Msk; usbdev->device->INTEN = USBD_INTEN_USBRESET_Msk |
USBD_INTEN_EPDATA_Msk |
USBD_INTEN_USBEVENT_Msk;
NVIC_EnableIRQ(USBD_IRQn); NVIC_EnableIRQ(USBD_IRQn);
} }
@ -539,6 +541,19 @@ static void _esr(usbdev_t *dev)
usbdev->usbdev.cb(&usbdev->usbdev, USBDEV_EVENT_RESET); usbdev->usbdev.cb(&usbdev->usbdev, USBDEV_EVENT_RESET);
usbdev->device->INTENSET = USBD_INTENSET_USBRESET_Msk; usbdev->device->INTENSET = USBD_INTENSET_USBRESET_Msk;
} }
else if (usbdev->device->EVENTS_USBEVENT) {
uint32_t events = usbdev->device->EVENTCAUSE;
if (events & USBD_EVENTCAUSE_SUSPEND_Msk) {
usbdev->usbdev.cb(&usbdev->usbdev, USBDEV_EVENT_SUSPEND);
}
if (events & USBD_EVENTCAUSE_RESUME_Msk) {
usbdev->usbdev.cb(&usbdev->usbdev, USBDEV_EVENT_RESUME);
}
usbdev->device->EVENTS_USBEVENT = 0;
/* Clear eventcause register */
usbdev->device->EVENTCAUSE = 0x0f01;
usbdev->device->INTENSET = USBD_INTENSET_USBEVENT_Msk;
}
} }
static signed _ep0_esr(usbdev_ep_t *ep) static signed _ep0_esr(usbdev_ep_t *ep)
@ -616,6 +631,11 @@ void isr_usbd(void)
usbdev->device->INTENCLR = USBD_INTENCLR_USBRESET_Msk; usbdev->device->INTENCLR = USBD_INTENCLR_USBRESET_Msk;
usbdev->usbdev.cb(&usbdev->usbdev, USBDEV_EVENT_ESR); usbdev->usbdev.cb(&usbdev->usbdev, USBDEV_EVENT_ESR);
} }
else if (usbdev->device->EVENTS_USBEVENT &&
(usbdev->device->INTEN & USBD_INTEN_USBEVENT_Msk)) {
usbdev->device->INTENCLR = USBD_INTENCLR_USBEVENT_Msk;
usbdev->usbdev.cb(&usbdev->usbdev, USBDEV_EVENT_ESR);
}
else { else {
/* Endpoint specific isr handling*/ /* Endpoint specific isr handling*/
/* Endpoint 0 SETUP data received requests */ /* Endpoint 0 SETUP data received requests */