ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add explicit guards to all device mode tasks to ensure the device is connected and configured before running the task, to prevent any user tasks from locking up the main USB task if the device has not been properly configured.

Browse source
This commit is contained in:
Dean Camera 2009-07-21 02:48:41 +00:00
parent bf50959b80
commit 67f390fe74
19 changed files with 245 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Demos/Host/ClassDriver/CDCHost/CDCHost.c
View file

@ -62,7 +62,7 @@ int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_FG_CYAN "CDC Host Demo running.\r\n"));
puts_P(PSTR(ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
@ -72,8 +72,11 @@ int main(void)
{
case HOST_STATE_Addressed:
if (!(CDC_Host_ConfigurePipes(&VirtualSerial_CDC_Interface)))
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
{
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
}
USB_HostState = HOST_STATE_Configured;
break;
case HOST_STATE_Configured:
@ -135,8 +138,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
{
USB_ShutDown();
puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" ESC_FG_WHITE));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;);

2
Demos/Host/LowLevel/PrinterHost/PrinterHost.c
View file

@ -226,7 +226,7 @@ void USB_Printer_Host(void)
Printer_Data_t TestPageData =
{
"\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X",
"\033%-12345X\033E" "LUFA PCL Test Page" "\033E\033%-12345X",
(sizeof(TestPageData.Data) - 1)
};