\r
#include "KeyboardHost.h"\r
\r
-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName, "LUFA KBD Host 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
- { Task: USB_USBTask , TaskStatus: TASK_STOP },\r
- { Task: USB_Keyboard_Host , TaskStatus: TASK_STOP },\r
+ { .Task = USB_USBTask , .TaskStatus = TASK_STOP },\r
+ { .Task = USB_Keyboard_Host , .TaskStatus = TASK_STOP },\r
};\r
\r
\r
/* Initialize USB Subsystem */\r
USB_Init();\r
\r
- /* Startup message */\r
+ /* Start-up message */\r
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
"Keyboard Host Demo running.\r\n" ESC_INVERSE_OFF));\r
\r
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
* starts the library USB task to begin the enumeration and USB management process.\r
*/\r
-EVENT_HANDLER(USB_DeviceAttached)\r
+void EVENT_USB_DeviceAttached(void)\r
{\r
puts_P(PSTR("Device Attached.\r\n"));\r
UpdateStatus(Status_USBEnumerating);\r
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
* stops the library USB task management process.\r
*/\r
-EVENT_HANDLER(USB_DeviceUnattached)\r
+void EVENT_USB_DeviceUnattached(void)\r
{\r
/* Stop Keyboard and USB management task */\r
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
* enumerated by the host and is now ready to be used by the application.\r
*/\r
-EVENT_HANDLER(USB_DeviceEnumerationComplete)\r
+void EVENT_USB_DeviceEnumerationComplete(void)\r
{\r
/* Start Keyboard Host task */\r
Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_RUN);\r
}\r
\r
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r
-EVENT_HANDLER(USB_HostError)\r
+void EVENT_USB_HostError(const uint8_t ErrorCode)\r
{\r
USB_ShutDown();\r
\r
for(;;);\r
}\r
\r
-/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occured while\r
+/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
* enumerating an attached USB device.\r
*/\r
-EVENT_HANDLER(USB_DeviceEnumerationFailed)\r
+void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r
{\r
puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
/* Select keyboard data pipe */\r
Pipe_SelectPipe(KEYBOARD_DATAPIPE); \r
\r
- #if !defined(INTERRUPT_DATA_PIPE)\r
/* Unfreeze keyboard data pipe */\r
Pipe_Unfreeze();\r
- #endif\r
\r
- /* Ensure pipe contains data and is ready to be read before continuing */\r
- if (!(Pipe_ReadWriteAllowed()))\r
+ /* Check to see if a packet has been received */\r
+ if (!(Pipe_IsINReceived()))\r
{\r
- #if !defined(INTERRUPT_DATA_PIPE)\r
- /* Refreeze keyboard data pipe */\r
+ /* Refreeze HID data IN pipe */\r
Pipe_Freeze();\r
- #endif\r
-\r
+ \r
return;\r
}\r
\r
- /* Read in keyboard report data */\r
- Pipe_Read_Stream_LE(&KeyboardReport, sizeof(KeyboardReport));\r
- \r
- /* Clear the IN endpoint, ready for next data packet */\r
- Pipe_ClearCurrentBank();\r
-\r
- /* Indicate if the modifier byte is non-zero (special key such as shift is being pressed) */\r
- LEDs_ChangeLEDs(LEDS_LED1, (KeyboardReport.Modifier) ? LEDS_LED1 : 0);\r
- \r
- /* Check if a key has been pressed */\r
- if (KeyboardReport.KeyCode)\r
+ /* Ensure pipe contains data before trying to read from it */\r
+ if (Pipe_IsReadWriteAllowed())\r
{\r
- /* Toggle status LED to indicate keypress */\r
- if (LEDs_GetLEDs() & LEDS_LED2)\r
- LEDs_TurnOffLEDs(LEDS_LED2);\r
- else\r
- LEDs_TurnOnLEDs(LEDS_LED2);\r
- \r
- char PressedKey = 0;\r
-\r
- /* Retrieve pressed key character if alphanumeric */\r
- if ((KeyboardReport.KeyCode >= 0x04) && (KeyboardReport.KeyCode <= 0x1D))\r
- PressedKey = (KeyboardReport.KeyCode - 0x04) + 'A';\r
- else if ((KeyboardReport.KeyCode >= 0x1E) && (KeyboardReport.KeyCode <= 0x27))\r
- PressedKey = (KeyboardReport.KeyCode - 0x1E) + '0';\r
- else if (KeyboardReport.KeyCode == 0x2C)\r
- PressedKey = ' '; \r
- else if (KeyboardReport.KeyCode == 0x28)\r
- PressedKey = '\n';\r
- \r
- /* Print the pressed key character out through the serial port if valid */\r
- if (PressedKey)\r
- putchar(PressedKey);\r
+ /* Read in keyboard report data */\r
+ Pipe_Read_Stream_LE(&KeyboardReport, sizeof(KeyboardReport));\r
+\r
+ /* Indicate if the modifier byte is non-zero (special key such as shift is being pressed) */\r
+ LEDs_ChangeLEDs(LEDS_LED1, (KeyboardReport.Modifier) ? LEDS_LED1 : 0);\r
+ \r
+ /* Check if a key has been pressed */\r
+ if (KeyboardReport.KeyCode)\r
+ {\r
+ /* Toggle status LED to indicate keypress */\r
+ if (LEDs_GetLEDs() & LEDS_LED2)\r
+ LEDs_TurnOffLEDs(LEDS_LED2);\r
+ else\r
+ LEDs_TurnOnLEDs(LEDS_LED2);\r
+ \r
+ char PressedKey = 0;\r
+\r
+ /* Retrieve pressed key character if alphanumeric */\r
+ if ((KeyboardReport.KeyCode >= 0x04) && (KeyboardReport.KeyCode <= 0x1D))\r
+ PressedKey = (KeyboardReport.KeyCode - 0x04) + 'A';\r
+ else if ((KeyboardReport.KeyCode >= 0x1E) && (KeyboardReport.KeyCode <= 0x27))\r
+ PressedKey = (KeyboardReport.KeyCode - 0x1E) + '0';\r
+ else if (KeyboardReport.KeyCode == 0x2C)\r
+ PressedKey = ' '; \r
+ else if (KeyboardReport.KeyCode == 0x28)\r
+ PressedKey = '\n';\r
+ \r
+ /* Print the pressed key character out through the serial port if valid */\r
+ if (PressedKey)\r
+ putchar(PressedKey);\r
+ }\r
}\r
- \r
- #if !defined(INTERRUPT_DATA_PIPE)\r
+ \r
+ /* Clear the IN endpoint, ready for next data packet */\r
+ Pipe_ClearIN();\r
+\r
/* Refreeze keyboard data pipe */\r
Pipe_Freeze();\r
- #endif\r
}\r
\r
/** Task to set the configuration of the attached device after it has been enumerated, and to read and process\r
{\r
case HOST_STATE_Addressed:\r
/* Standard request to set the device configuration to configuration 1 */\r
- USB_HostRequest = (USB_Host_Request_Header_t)\r
+ USB_ControlRequest = (USB_Request_Header_t)\r
{\r
- bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
- bRequest: REQ_SetConfiguration,\r
- wValue: 1,\r
- wIndex: 0,\r
- wLength: 0,\r
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
+ .bRequest = REQ_SetConfiguration,\r
+ .wValue = 1,\r
+ .wIndex = 0,\r
+ .wLength = 0,\r
};\r
\r
- /* Send the request, display error and wait for device detatch if request fails */\r
+ /* Select the control pipe for the request transfer */\r
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r
+ /* Send the request, display error and wait for device detach if request fails */\r
if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
{\r
puts_P(PSTR("Control Error (Set Configuration).\r\n"));\r
}\r
\r
/* HID class request to set the keyboard protocol to the Boot Protocol */\r
- USB_HostRequest = (USB_Host_Request_Header_t)\r
+ USB_ControlRequest = (USB_Request_Header_t)\r
{\r
- bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
- bRequest: REQ_SetProtocol,\r
- wValue: 0,\r
- wIndex: 0,\r
- wLength: 0,\r
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+ .bRequest = REQ_SetProtocol,\r
+ .wValue = 0,\r
+ .wIndex = 0,\r
+ .wLength = 0,\r
};\r
\r
- /* Send the request, display error and wait for device detatch if request fails */\r
+ /* Select the control pipe for the request transfer */\r
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r
+ /* Send the request, display error and wait for device detach if request fails */\r
if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
{\r
puts_P(PSTR("Control Error (Set Protocol).\r\n"));\r
break;\r
}\r
\r
- #if defined(INTERRUPT_DATA_PIPE) \r
- /* Select and unfreeze keyboard data pipe */\r
- Pipe_SelectPipe(KEYBOARD_DATAPIPE); \r
- Pipe_Unfreeze();\r
- #endif\r
-\r
puts_P(PSTR("Keyboard Enumerated.\r\n"));\r
\r
USB_HostState = HOST_STATE_Ready;\r
break;\r
- #if !defined(INTERRUPT_DATA_PIPE)\r
case HOST_STATE_Ready:\r
/* If a report has been received, read and process it */\r
ReadNextReport();\r
\r
break;\r
- #endif\r
}\r
}\r
-\r
-#if defined(INTERRUPT_DATA_PIPE)\r
-/** Interrupt handler for the Endpoint/Pipe interrupt vector. This interrupt fires each time an enabled\r
- * pipe interrupt occurs on a pipe which has had that interrupt enabled.\r
- */\r
-ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
-{\r
- /* Save previously selected pipe before selecting a new pipe */\r
- uint8_t PrevSelectedPipe = Pipe_GetCurrentPipe();\r
-\r
- /* Check to see if the keyboard data pipe has caused the interrupt */\r
- if (Pipe_HasPipeInterrupted(KEYBOARD_DATAPIPE))\r
- {\r
- /* Clear the pipe interrupt, and select the keyboard pipe */\r
- Pipe_ClearPipeInterrupt(KEYBOARD_DATAPIPE);\r
- Pipe_SelectPipe(KEYBOARD_DATAPIPE); \r
-\r
- /* Check to see if the pipe IN interrupt has fired */\r
- if (USB_INT_HasOccurred(PIPE_INT_IN) && USB_INT_IsEnabled(PIPE_INT_IN))\r
- {\r
- /* Clear interrupt flag */\r
- USB_INT_Clear(PIPE_INT_IN); \r
-\r
- /* Read and process the next report from the device */\r
- ReadNextReport();\r
- }\r
- \r
- /* Restore previously selected pipe */\r
- Pipe_SelectPipe(PrevSelectedPipe);\r
-}\r
-#endif\r
projects / pub / USBasp.git / blobdiff