/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
\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
/** Sends the given data directly to the printer via the data endpoints, for the sending of print commands in printer\r
* languages accepted by the attached printer (e.g. PCL).\r
*\r
- * \param[in] PrinterCommands Pointer to a structure containing the commands and length of the data to send\r
+ * \param[in] PrinterCommands Pointer to the data to send to the attached printer\r
+ * \param[in] CommandSize Size of the data to send to the attached printer\r
*\r
* \return A value from the Pipe_Stream_RW_ErrorCodes_t enum\r
*/\r
-uint8_t Printer_SendData(Printer_Data_t* PrinterCommands)\r
+uint8_t Printer_SendData(void* PrinterCommands, uint16_t CommandSize)\r
{\r
uint8_t ErrorCode;\r
\r
Pipe_SelectPipe(PRINTER_DATA_OUT_PIPE);\r
Pipe_Unfreeze();\r
\r
- if ((ErrorCode = Pipe_Write_Stream_LE(PrinterCommands->Data, PrinterCommands->Length)) != PIPE_RWSTREAM_NoError)\r
+ if ((ErrorCode = Pipe_Write_Stream_LE(PrinterCommands, CommandSize)) != PIPE_RWSTREAM_NoError)\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
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
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
};\r
\r
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r
return USB_Host_SendControlRequest(PortStatus);\r
}\r
\r
{\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
+\r
return USB_Host_SendControlRequest(NULL);\r
}\r
\r
projects / pub / USBasp.git / blobdiff