ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1481 from mjrgh/patch-2 

Fix interrupt handler for endpoints > 2
pull/1503/head
Martin Kojtal 2016-01-15 07:41:28 +00:00
parent 919364e6e7 bd98d88202
commit 0b57f8a29a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/USBDevice/USBDevice/USBHAL_KL25Z.cpp
View File

@ -491,6 +491,7 @@ void USBHAL::usbisr(void) {
uint32_t num = (USB0->STAT >> 4) & 0x0F; uint32_t num = (USB0->STAT >> 4) & 0x0F;
uint32_t dir = (USB0->STAT >> 3) & 0x01; uint32_t dir = (USB0->STAT >> 3) & 0x01;
uint32_t ev_odd = (USB0->STAT >> 2) & 0x01; uint32_t ev_odd = (USB0->STAT >> 2) & 0x01;
int endpoint = (num << 1) | dir;
// setup packet // setup packet
if ((num == 0) && (TOK_PID((EP_BDT_IDX(num, dir, ev_odd))) == SETUP_TOKEN)) { if ((num == 0) && (TOK_PID((EP_BDT_IDX(num, dir, ev_odd))) == SETUP_TOKEN)) {
@ -507,9 +508,9 @@ void USBHAL::usbisr(void) {
if (num == 0) if (num == 0)
EP0out(); EP0out();
else { else {
epComplete |= (1 << EP(num)); epComplete |= EP(endpoint);
if ((instance->*(epCallback[EP(num) - 2]))()) { if ((instance->*(epCallback[endpoint - 2]))()) {
epComplete &= ~(1 << EP(num)); epComplete &= ~EP(endpoint);
} }
} }
} }
@ -524,9 +525,9 @@ void USBHAL::usbisr(void) {
} }
} }
else { else {
epComplete |= (1 << (EP(num) + 1)); epComplete |= EP(endpoint);
if ((instance->*(epCallback[EP(num) + 1 - 2]))()) { if ((instance->*(epCallback[endpoint - 2]))()) {
epComplete &= ~(1 << (EP(num) + 1)); epComplete &= ~EP(endpoint);
} }
} }
} }