X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f1199200e167a737a4676378da184387e543830c..39d07c3da045a3d739f9977101f8a81f0b8ff0e1:/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c index 2b9bb2b0b..734ef2a57 100644 --- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c +++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c @@ -36,19 +36,28 @@ #include "KeyboardHost.h" -/* Scheduler Task List */ -TASK_LIST -{ - { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, - { .Task = USB_Keyboard_Host , .TaskStatus = TASK_STOP }, -}; - - /** Main program entry point. This routine configures the hardware required by the application, then * starts the scheduler to run the application tasks. */ int main(void) { + SetupHardware(); + + puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY + "Keyboard HID Host Demo running.\r\n" ESC_INVERSE_OFF)); + + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); + + for (;;) + { + Keyboard_HID_Task(); + USB_USBTask(); + } +} + +/** Configures the board hardware and chip peripherals for the demo's functionality. */ +void SetupHardware(void) +{ /* Disable watchdog if enabled by bootloader/fuses */ MCUSR &= ~(1 << WDRF); wdt_disable(); @@ -59,22 +68,7 @@ int main(void) /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ USB_Init(); - - /* Start-up message */ - puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY - "Keyboard Host Demo running.\r\n" ESC_INVERSE_OFF)); - - /* Scheduling - routine never returns, so put this last in the main function */ - Scheduler_Start(); } /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and @@ -83,10 +77,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and @@ -94,12 +85,8 @@ void EVENT_USB_DeviceAttached(void) */ void EVENT_USB_DeviceUnattached(void) { - /* Stop Keyboard and USB management task */ - Scheduler_SetTaskMode(USB_USBTask, TASK_STOP); - Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_STOP); - puts_P(PSTR("Device Unattached.\r\n")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully @@ -107,11 +94,7 @@ void EVENT_USB_DeviceUnattached(void) */ void EVENT_USB_DeviceEnumerationComplete(void) { - /* Start Keyboard Host task */ - Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ @@ -122,7 +105,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode) puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); for(;;); } @@ -136,38 +119,7 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); - UpdateStatus(Status_EnumerationError); -} - -/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to - * log to a serial port, or anything else that is suitable for status updates. - * - * \param CurrentStatus Current status of the system, from the KeyboardHost_StatusCodes_t enum - */ -void UpdateStatus(uint8_t CurrentStatus) -{ - uint8_t LEDMask = LEDS_NO_LEDS; - - /* Set the LED mask to the appropriate LED mask based on the given status code */ - switch (CurrentStatus) - { - case Status_USBNotReady: - LEDMask = (LEDS_LED1); - break; - case Status_USBEnumerating: - LEDMask = (LEDS_LED1 | LEDS_LED2); - break; - case Status_USBReady: - LEDMask = (LEDS_LED2); - break; - case Status_EnumerationError: - case Status_HardwareError: - LEDMask = (LEDS_LED1 | LEDS_LED3); - break; - } - - /* Set the board LEDs to the new LED mask */ - LEDs_SetAllLEDs(LEDMask); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } /** Reads in and processes the next report from the attached device, displaying the report @@ -238,43 +190,13 @@ void ReadNextReport(void) /** Task to set the configuration of the attached device after it has been enumerated, and to read and process * HID reports from the device and display the results onto the board LEDs. */ -TASK(USB_Keyboard_Host) +void Keyboard_HID_Task(void) { uint8_t ErrorCode; switch (USB_HostState) { case HOST_STATE_Addressed: - /* Standard request to set the device configuration to configuration 1 */ - USB_ControlRequest = (USB_Request_Header_t) - { - .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - .bRequest = REQ_SetConfiguration, - .wValue = 1, - .wIndex = 0, - .wLength = 0, - }; - - /* Select the control pipe for the request transfer */ - Pipe_SelectPipe(PIPE_CONTROLPIPE); - - /* Send the request, display error and wait for device detach if request fails */ - if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful) - { - puts_P(PSTR("Control Error (Set Configuration).\r\n")); - printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); - - /* Indicate error status */ - UpdateStatus(Status_EnumerationError); - - /* Wait until USB device disconnected */ - while (USB_IsConnected); - break; - } - - USB_HostState = HOST_STATE_Configured; - break; - case HOST_STATE_Configured: puts_P(PSTR("Getting Config Data.\r\n")); /* Get and process the configuration descriptor data */ @@ -288,13 +210,30 @@ TASK(USB_Keyboard_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); break; } + /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */ + if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful) + { + puts_P(PSTR("Control Error (Set Configuration).\r\n")); + printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); + + /* Indicate error status */ + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); + + /* Wait until USB device disconnected */ + while (USB_IsConnected); + break; + } + + USB_HostState = HOST_STATE_Configured; + break; + case HOST_STATE_Configured: /* HID class request to set the keyboard protocol to the Boot Protocol */ USB_ControlRequest = (USB_Request_Header_t) { @@ -315,7 +254,7 @@ TASK(USB_Keyboard_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected);