Correct TeensyHID bootloader descriptors to use the correct revision code for the...

[pub/USBasp.git] / Demos / Host / LowLevel / PrinterHost / Lib / PrinterCommands.c

diff --git a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
index fefcbbf..be0d57b 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
@@ -30,7 +30,7 @@
 \r
 /** \file\r
  *\r
- *  Printer Device commands, to send/recieve data to and from an attached USB\r
+ *  Printer Device commands, to send/receive data to and from an attached USB\r
  *  printer, and to send and receive Printer Class control requests.\r
  */\r
 \r
@@ -77,21 +77,27 @@ uint8_t Printer_SendData(void* PrinterCommands, uint16_t CommandSize)
 uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize)\r
 {\r
        uint8_t  ErrorCode = HOST_SENDCONTROL_Successful;\r
-       uint16_t DeviceIDStringLength;\r
+       uint16_t DeviceIDStringLength = 0;\r
 \r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
-                       bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                       bRequest:      GET_DEVICE_ID,\r
-                       wValue:        0,\r
-                       wIndex:        0,\r
-                       wLength:       sizeof(DeviceIDStringLength),\r
+                       .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                       .bRequest      = REQ_GetDeviceID,\r
+                       .wValue        = 0,\r
+                       .wIndex        = 0,\r
+                       .wLength       = sizeof(DeviceIDStringLength),\r
                };\r
                \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r
        if ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r
+         \r
+       if (!(DeviceIDStringLength))\r
+       {\r
+               DeviceIDString[0] = 0x00;\r
+               return HOST_SENDCONTROL_Successful;\r
+       }\r
        \r
        DeviceIDStringLength = SwapEndian_16(DeviceIDStringLength);\r
 \r
@@ -123,7 +129,7 @@ uint8_t Printer_GetPortStatus(uint8_t* PortStatus)
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
                        bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                       bRequest:      GET_PORT_STATUS,\r
+                       bRequest:      REQ_GetPortStatus,\r
                        wValue:        0,\r
                        wIndex:        0,\r
                        wLength:       sizeof(uint8_t),\r
@@ -143,11 +149,11 @@ uint8_t Printer_SoftReset(void)
 {\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
-                       bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                       bRequest:      SOFT_RESET,\r
-                       wValue:        0,\r
-                       wIndex:        0,\r
-                       wLength:       0,\r
+                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                       .bRequest      = REQ_SoftReset,\r
+                       .wValue        = 0,\r
+                       .wIndex        = 0,\r
+                       .wLength       = 0,\r
                };\r
 \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r