diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-06 14:22:04 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-06 14:22:04 +0000 |
| commit | c830fcb0e1d42c1300ebe78a8b33924054b63a87 (patch) | |
| tree | 04a8b7a112fce02523c3ba78b11e8b9db3eb3164 /Demos/Host/LowLevel/PrinterHost | |
| parent | 384848253274a7afa74e463a56e1257cf3b8924e (diff) | |
| download | lufa-c830fcb0e1d42c1300ebe78a8b33924054b63a87.tar.gz lufa-c830fcb0e1d42c1300ebe78a8b33924054b63a87.tar.bz2 lufa-c830fcb0e1d42c1300ebe78a8b33924054b63a87.zip | |
Make Endpoint control transfers more reliable; early-abort when an incomplete packet is sent from the host (indicating end of transfer), add check for control reads to ensure that no more than wLength bytes are read from the interface.
Condense sequential printf_P/puts_P calls to single printf_P calls for size and clarity.
Diffstat (limited to 'Demos/Host/LowLevel/PrinterHost')
| -rw-r--r-- | Demos/Host/LowLevel/PrinterHost/PrinterHost.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c index bd84f19eb..b2b4059e9 100644 --- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c +++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c @@ -101,8 +101,8 @@ void EVENT_USB_Host_HostError(uint8_t ErrorCode) {
USB_ShutDown();
- puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
- printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
+ printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
+ " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;);
@@ -113,10 +113,10 @@ void EVENT_USB_Host_HostError(uint8_t ErrorCode) */
void EVENT_USB_Host_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode)
{
- puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));
- printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
- printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
- printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);
+ printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"
+ " -- Error Code %d\r\n"
+ " -- Sub Error Code %d\r\n"
+ " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
@@ -157,8 +157,8 @@ void USB_Printer_Host(void) /* 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(ESC_FG_RED "Control Error (Set Configuration).\r\n"));
- printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+ printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"
+ " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
/* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
@@ -183,8 +183,8 @@ void USB_Printer_Host(void) if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
{
- puts_P(PSTR(ESC_FG_RED "Control Error (Set Interface).\r\n"));
- printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+ printf_P(PSTR(ESC_FG_RED "Control Error (Set Interface).\r\n"
+ " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
/* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
@@ -200,8 +200,8 @@ void USB_Printer_Host(void) char DeviceIDString[256];
if ((ErrorCode = Printer_GetDeviceID(DeviceIDString, sizeof(DeviceIDString))) != HOST_SENDCONTROL_Successful)
{
- puts_P(PSTR(ESC_FG_RED "Control Error (Get DeviceID).\r\n"));
- printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+ printf_P(PSTR(ESC_FG_RED "Control Error (Get DeviceID).\r\n"
+ " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
/* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
@@ -231,8 +231,8 @@ void USB_Printer_Host(void) if ((ErrorCode = Printer_SendData(&TestPageData)) != PIPE_RWSTREAM_NoError)
{
- puts_P(PSTR(ESC_FG_RED "Error Sending Test Page.\r\n"));
- printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+ printf_P(PSTR(ESC_FG_RED "Error Sending Test Page.\r\n"
+ " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
/* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|