eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add INTERRUPT_CONTROL_ENDPOINT compile time option support for the UC3 devices.

This commit is contained in:
Dean Camera 2011-07-25 09:56:21 +00:00
parent 5c274d106b
commit d5e874d348
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c
View File

@ -121,6 +121,10 @@ ISR(USB_GEN_vect)
ENDPOINT_DIR_OUT, USB_Device_ControlEndpointSize, ENDPOINT_DIR_OUT, USB_Device_ControlEndpointSize,
ENDPOINT_BANK_SINGLE); ENDPOINT_BANK_SINGLE);
#if defined(INTERRUPT_CONTROL_ENDPOINT)
USB_INT_Enable(USB_INT_RXSTPI);
#endif
EVENT_USB_Device_Reset(); EVENT_USB_Device_Reset();
} }
#endif #endif
@ -200,3 +204,22 @@ ISR(USB_GEN_vect)
} }
#endif #endif
} }
#if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE)
ISR(USB_COM_vect, ISR_BLOCK)
{
uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
USB_INT_Disable(USB_INT_RXSTPI);
GlobalInterruptEnable();
USB_Device_ProcessControlRequest();
Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
USB_INT_Enable(USB_INT_RXSTPI);
Endpoint_SelectEndpoint(PrevSelectedEndpoint);
}
#endif

27
LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
View File

@ -43,6 +43,7 @@
/* Includes: */ /* Includes: */
#include "../../../../Common/Common.h" #include "../../../../Common/Common.h"
#include "../Endpoint.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
@ -68,14 +69,15 @@
USB_INT_SUSPI = 3, USB_INT_SUSPI = 3,
USB_INT_EORSTI = 4, USB_INT_EORSTI = 4,
USB_INT_SOFI = 5, USB_INT_SOFI = 5,
USB_INT_RXSTPI = 6,
#endif #endif
#if (defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)) #if (defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__))
USB_INT_HSOFI = 6, USB_INT_HSOFI = 7,
USB_INT_DCONNI = 7, USB_INT_DCONNI = 8,
USB_INT_DDISCI = 8, USB_INT_DDISCI = 9,
USB_INT_RSTI = 9, USB_INT_RSTI = 10,
USB_INT_BCERRI = 10, USB_INT_BCERRI = 11,
USB_INT_VBERRI = 11, USB_INT_VBERRI = 12,
#endif #endif
}; };
@ -106,6 +108,9 @@
case USB_INT_SOFI: case USB_INT_SOFI:
AVR32_USBB.UDINTESET.sofes = true; AVR32_USBB.UDINTESET.sofes = true;
break; break;
case USB_INT_RXSTPI:
(&AVR32_USBB.UECON0SET)[USB_SelectedEndpoint].rxstpes = true;
break;
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
case USB_INT_HSOFI: case USB_INT_HSOFI:
@ -156,6 +161,9 @@
case USB_INT_SOFI: case USB_INT_SOFI:
AVR32_USBB.UDINTECLR.sofec = true; AVR32_USBB.UDINTECLR.sofec = true;
break; break;
case USB_INT_RXSTPI:
(&AVR32_USBB.UECON0CLR)[USB_SelectedEndpoint].rxstpec = true;
break;
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
case USB_INT_HSOFI: case USB_INT_HSOFI:
@ -212,6 +220,9 @@
AVR32_USBB.UDINTCLR.sofc = true; AVR32_USBB.UDINTCLR.sofc = true;
(void)AVR32_USBB.UDINTCLR; (void)AVR32_USBB.UDINTCLR;
break; break;
case USB_INT_RXSTPI:
(&AVR32_USBB.UESTA0CLR)[USB_SelectedEndpoint].rxstpic = true;
break;
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
case USB_INT_HSOFI: case USB_INT_HSOFI:
@ -262,6 +273,8 @@
return AVR32_USBB.UDINTE.eorste; return AVR32_USBB.UDINTE.eorste;
case USB_INT_SOFI: case USB_INT_SOFI:
return AVR32_USBB.UDINTE.sofe; return AVR32_USBB.UDINTE.sofe;
case USB_INT_RXSTPI:
return (&AVR32_USBB.UECON0)[USB_SelectedEndpoint].rxstpe;
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
case USB_INT_HSOFI: case USB_INT_HSOFI:
@ -302,6 +315,8 @@
return AVR32_USBB.UDINT.eorst; return AVR32_USBB.UDINT.eorst;
case USB_INT_SOFI: case USB_INT_SOFI:
return AVR32_USBB.UDINT.sof; return AVR32_USBB.UDINT.sof;
case USB_INT_RXSTPI:
return (&AVR32_USBB.UESTA0)[USB_SelectedEndpoint].rxstpi;
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
case USB_INT_HSOFI: case USB_INT_HSOFI: