git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7430 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2014-10-26 13:01:33 +00:00
parent 6eab72aacf
commit 82e9c928eb
2 changed files with 3 additions and 4 deletions

View File

@ -624,7 +624,8 @@ static void usb_lld_serve_interrupt(USBDriver *usbp) {
stm32_otg_t *otgp = usbp->otg; stm32_otg_t *otgp = usbp->otg;
uint32_t sts, src; uint32_t sts, src;
sts = otgp->GINTSTS & otgp->GINTMSK; sts = otgp->GINTSTS;
sts &= otgp->GINTMSK;
otgp->GINTSTS = sts; otgp->GINTSTS = sts;
/* Reset interrupt handling.*/ /* Reset interrupt handling.*/
@ -1346,8 +1347,6 @@ msg_t usb_lld_pump(void *p) {
} }
osalSysLock(); osalSysLock();
} }
osalSysUnlock();
return 0;
} }
#endif /* HAL_USE_USB */ #endif /* HAL_USE_USB */

View File

@ -442,7 +442,7 @@ static msg_t Thread1(void *arg) {
(void)arg; (void)arg;
chRegSetThreadName("blinker"); chRegSetThreadName("blinker");
while (TRUE) { while (true) {
systime_t time; systime_t time;
time = serusbcfg.usbp->state == USB_ACTIVE ? 250 : 500; time = serusbcfg.usbp->state == USB_ACTIVE ? 250 : 500;