\r
#include "GenericHID.h"\r
\r
-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName, "LUFA GenHID App");\r
-BUTTLOADTAG(BuildTime, __TIME__);\r
-BUTTLOADTAG(BuildDate, __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r
/* Scheduler Task List */\r
TASK_LIST\r
{\r
- #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
- { Task: USB_USBTask , TaskStatus: TASK_STOP },\r
- #endif\r
- \r
- #if !defined(INTERRUPT_DATA_ENDPOINT)\r
- { Task: USB_HID_Report , TaskStatus: TASK_STOP },\r
- #endif\r
+ { .Task = USB_USBTask , .TaskStatus = TASK_STOP },\r
+ { .Task = USB_HID_Report , .TaskStatus = TASK_STOP },\r
};\r
\r
/** Static buffer to hold the last received report from the host, so that it can be echoed back in the next sent report */\r
Scheduler_Start();\r
}\r
\r
-/** Event handler for the USB_Reset event. This fires when the USB interface is reset by the USB host, before the\r
- * enumeration process begins, and enables the control endpoint interrupt so that control requests can be handled\r
- * asynchronously when they arrive rather than when the control endpoint is polled manually.\r
- */\r
-EVENT_HANDLER(USB_Reset)\r
-{\r
- #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
- /* Select the control endpoint */\r
- Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
-\r
- /* Enable the endpoint SETUP interrupt ISR for the control endpoint */\r
- USB_INT_Enable(ENDPOINT_INT_SETUP);\r
- #endif\r
-}\r
-\r
/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
* starts the library USB task to begin the enumeration and USB management process.\r
*/\r
-EVENT_HANDLER(USB_Connect)\r
+void EVENT_USB_Connect(void)\r
{\r
+ /* Start USB management task */\r
+ Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
+\r
/* Indicate USB enumerating */\r
UpdateStatus(Status_USBEnumerating);\r
}\r
/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
* the status LEDs and stops the USB management task.\r
*/\r
-EVENT_HANDLER(USB_Disconnect)\r
+void EVENT_USB_Disconnect(void)\r
{\r
+ /* Stop running HID reporting and USB management tasks */\r
+ Scheduler_SetTaskMode(USB_HID_Report, TASK_STOP);\r
+ Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
+\r
/* Indicate USB not ready */\r
UpdateStatus(Status_USBNotReady);\r
}\r
/** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration\r
* of the USB device after enumeration, and configures the generic HID device endpoints.\r
*/\r
-EVENT_HANDLER(USB_ConfigurationChanged)\r
+void EVENT_USB_ConfigurationChanged(void)\r
{\r
/* Setup Generic IN Report Endpoint */\r
Endpoint_ConfigureEndpoint(GENERIC_IN_EPNUM, EP_TYPE_INTERRUPT,\r
ENDPOINT_DIR_IN, GENERIC_EPSIZE,\r
ENDPOINT_BANK_SINGLE);\r
\r
- #if defined(INTERRUPT_DATA_ENDPOINT)\r
- /* Enable the endpoint IN interrupt ISR for the report endpoint */\r
- USB_INT_Enable(ENDPOINT_INT_IN);\r
- #endif\r
-\r
/* Setup Generic OUT Report Endpoint */\r
Endpoint_ConfigureEndpoint(GENERIC_OUT_EPNUM, EP_TYPE_INTERRUPT,\r
ENDPOINT_DIR_OUT, GENERIC_EPSIZE,\r
ENDPOINT_BANK_SINGLE);\r
\r
- #if defined(INTERRUPT_DATA_ENDPOINT)\r
- /* Enable the endpoint OUT interrupt ISR for the report endpoint */\r
- USB_INT_Enable(ENDPOINT_INT_OUT);\r
- #endif\r
-\r
/* Indicate USB connected and ready */\r
UpdateStatus(Status_USBReady);\r
}\r
* control requests that are not handled internally by the USB library (including the HID commands, which are\r
* all issued via the control endpoint), so that they can be handled appropriately for the application.\r
*/\r
-EVENT_HANDLER(USB_UnhandledControlPacket)\r
+void EVENT_USB_UnhandledControlPacket(void)\r
{\r
/* Handle HID Class specific requests */\r
- switch (bRequest)\r
+ switch (USB_ControlRequest.bRequest)\r
{\r
case REQ_GetReport:\r
- if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
+ if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
{\r
- Endpoint_ClearSetupReceived();\r
- \r
uint8_t GenericData[GENERIC_REPORT_SIZE];\r
- \r
+\r
+ Endpoint_ClearSETUP();\r
+ \r
CreateGenericHIDReport(GenericData);\r
\r
/* Write the report data to the control endpoint */\r
Endpoint_Write_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
\r
/* Finalize the stream transfer to send the last packet or clear the host abort */\r
- Endpoint_ClearSetupOUT();\r
+ Endpoint_ClearOUT();\r
}\r
\r
break;\r
case REQ_SetReport:\r
- if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
+ if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
{\r
- Endpoint_ClearSetupReceived();\r
+ uint8_t GenericData[GENERIC_REPORT_SIZE];\r
+\r
+ Endpoint_ClearSETUP();\r
\r
/* Wait until the generic report has been sent by the host */\r
- while (!(Endpoint_IsSetupOUTReceived()));\r
-\r
- uint8_t GenericData[GENERIC_REPORT_SIZE];\r
+ while (!(Endpoint_IsOUTReceived()));\r
\r
- Endpoint_Read_Control_Stream(&GenericData, sizeof(GenericData));\r
+ Endpoint_Read_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
\r
ProcessGenericHIDReport(GenericData);\r
\r
/* Clear the endpoint data */\r
- Endpoint_ClearSetupOUT();\r
+ Endpoint_ClearOUT();\r
\r
/* Wait until the host is ready to receive the request confirmation */\r
- while (!(Endpoint_IsSetupINReady()));\r
+ while (!(Endpoint_IsINReady()));\r
\r
/* Handshake the request by sending an empty IN packet */\r
- Endpoint_ClearSetupIN();\r
+ Endpoint_ClearIN();\r
}\r
\r
break;\r
DataArray[i] = LastReceived[i];\r
}\r
\r
-#if !defined(INTERRUPT_DATA_ENDPOINT)\r
TASK(USB_HID_Report)\r
{\r
/* Check if the USB system is connected to a host */\r
{\r
Endpoint_SelectEndpoint(GENERIC_OUT_EPNUM);\r
\r
- if (Endpoint_ReadWriteAllowed())\r
+ /* Check to see if a packet has been sent from the host */\r
+ if (Endpoint_IsOUTReceived())\r
{\r
- /* Create a tempoary buffer to hold the read in report from the host */\r
- uint8_t GenericData[GENERIC_REPORT_SIZE];\r
- \r
- /* Read Generic Report Data */\r
- Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData));\r
- \r
- /* Process Generic Report Data */\r
- ProcessGenericHIDReport(GenericData);\r
+ /* Check to see if the packet contains data */\r
+ if (Endpoint_IsReadWriteAllowed())\r
+ {\r
+ /* Create a temporary buffer to hold the read in report from the host */\r
+ uint8_t GenericData[GENERIC_REPORT_SIZE];\r
+ \r
+ /* Read Generic Report Data */\r
+ Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData));\r
+ \r
+ /* Process Generic Report Data */\r
+ ProcessGenericHIDReport(GenericData);\r
+ }\r
\r
/* Finalize the stream transfer to send the last packet */\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearOUT();\r
} \r
\r
Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);\r
\r
- if (Endpoint_ReadWriteAllowed())\r
+ /* Check to see if the host is ready to accept another packet */\r
+ if (Endpoint_IsINReady())\r
{\r
- /* Create a tempoary buffer to hold the report to send to the host */\r
+ /* Create a temporary buffer to hold the report to send to the host */\r
uint8_t GenericData[GENERIC_REPORT_SIZE];\r
\r
/* Create Generic Report Data */\r
Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
\r
/* Finalize the stream transfer to send the last packet */\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearIN();\r
}\r
}\r
}\r
-#endif\r
-\r
-/** ISR for the general Pipe/Endpoint interrupt vector. This ISR fires when an endpoint's status changes (such as\r
- * a packet has been received) on an endpoint with its corresponding ISR enabling bits set. This is used to send\r
- * HID packets to the host each time the HID interrupt endpoints polling period elapses, as managed by the USB\r
- * controller.\r
- */\r
-ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
-{\r
- /* Save previously selected endpoint before selecting a new endpoint */\r
- uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
-\r
- #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
- /* Check if the control endpoint has received a request */\r
- if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))\r
- {\r
- /* Clear the endpoint interrupt */\r
- Endpoint_ClearEndpointInterrupt(ENDPOINT_CONTROLEP);\r
-\r
- /* Process the control request */\r
- USB_USBTask();\r
-\r
- /* Handshake the endpoint setup interrupt - must be after the call to USB_USBTask() */\r
- USB_INT_Clear(ENDPOINT_INT_SETUP);\r
- }\r
- #endif\r
-\r
- #if defined(INTERRUPT_DATA_ENDPOINT)\r
- /* Check if Generic IN endpoint has interrupted */\r
- if (Endpoint_HasEndpointInterrupted(GENERIC_IN_EPNUM))\r
- {\r
- /* Select the Generic IN Report Endpoint */\r
- Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);\r
-\r
- /* Clear the endpoint IN interrupt flag */\r
- USB_INT_Clear(ENDPOINT_INT_IN);\r
-\r
- /* Clear the Generic IN Report endpoint interrupt and select the endpoint */\r
- Endpoint_ClearEndpointInterrupt(GENERIC_IN_EPNUM);\r
-\r
- /* Create a temporary buffer to hold the report to send to the host */\r
- uint8_t GenericData[GENERIC_REPORT_SIZE];\r
- \r
- /* Create Generic Report Data */\r
- CreateGenericHIDReport(GenericData);\r
-\r
- /* Write Generic Report Data */\r
- Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
-\r
- /* Finalize the stream transfer to send the last packet */\r
- Endpoint_ClearCurrentBank();\r
- }\r
-\r
- /* Check if Generic OUT endpoint has interrupted */\r
- if (Endpoint_HasEndpointInterrupted(GENERIC_OUT_EPNUM))\r
- {\r
- /* Select the Generic OUT Report Endpoint */\r
- Endpoint_SelectEndpoint(GENERIC_OUT_EPNUM);\r
-\r
- /* Clear the endpoint OUT Interrupt flag */\r
- USB_INT_Clear(ENDPOINT_INT_OUT);\r
-\r
- /* Clear the Generic OUT Report endpoint interrupt and select the endpoint */\r
- Endpoint_ClearEndpointInterrupt(GENERIC_OUT_EPNUM);\r
-\r
- /* Create a temporary buffer to hold the read in report from the host */\r
- uint8_t GenericData[GENERIC_REPORT_SIZE];\r
- \r
- /* Read Generic Report Data */\r
- Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData));\r
- \r
- /* Process Generic Report Data */\r
- ProcessGenericHIDReport(GenericData);\r
-\r
- /* Finalize the stream transfer to send the last packet */\r
- Endpoint_ClearCurrentBank();\r
- }\r
- #endif\r
-\r
- /* Restore previously selected endpoint */\r
- Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r
-}\r
projects / pub / USBasp.git / blobdiff