Commit for the 090810 release.

[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 6ed7fa9..cb051cd 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
@@ -54,7 +54,11 @@ uint8_t Printer_SendData(Printer_Data_t* PrinterCommands)
          return ErrorCode;\r
 \r
        Pipe_ClearOUT();\r
          return ErrorCode;\r
 \r
        Pipe_ClearOUT();\r

-       while (!(Pipe_IsOUTReady()));\r
+       while (!(Pipe_IsOUTReady()))\r
+       {\r
+               if (USB_HostState == HOST_STATE_Unattached)\r
+                 return PIPE_RWSTREAM_DeviceDisconnected;\r
+       }\r

        \r
        Pipe_Freeze();\r
 \r
        \r
        Pipe_Freeze();\r
 \r


@@ -82,6 +86,8 @@ uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize)
                        wIndex:        0,\r
                        wLength:       sizeof(DeviceIDStringLength),\r
                };\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 ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r


@@ -122,6 +128,8 @@ uint8_t Printer_GetPortStatus(uint8_t* PortStatus)
                        wLength:       sizeof(uint8_t),\r
                };\r
 \r
                        wLength:       sizeof(uint8_t),\r
                };\r
 \r

+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r

        return USB_Host_SendControlRequest(PortStatus);\r
 }\r
 \r
        return USB_Host_SendControlRequest(PortStatus);\r
 }\r
 \r


@@ -141,6 +149,8 @@ uint8_t Printer_SoftReset(void)
                        wLength:       0,\r
                };\r
 \r
                        wLength:       0,\r
                };\r
 \r

+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r

        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r