/*\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
if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
{\r
- if (Pipe_IsEndpointBound(EndpointData->EndpointAddress))\r
- {\r
- CDCInterfaceInfo->State.BidirectionalDataEndpoints = true;\r
- Pipe_DisablePipe();\r
- }\r
-\r
Pipe_ConfigurePipe(CDCInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
EndpointData->EndpointAddress, EndpointData->EndpointSize, \r
CDCInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
+\r
CDCInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
\r
FoundEndpoints |= CDC_FOUND_DATAPIPE_IN;\r
}\r
else\r
{\r
- if (Pipe_IsEndpointBound(EndpointData->EndpointAddress))\r
- {\r
- CDCInterfaceInfo->State.BidirectionalDataEndpoints = true;\r
- }\r
- else\r
- {\r
- Pipe_ConfigurePipe(CDCInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
- EndpointData->EndpointAddress, EndpointData->EndpointSize, \r
- CDCInterfaceInfo->Config.DataOUTPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
- }\r
- \r
+ Pipe_ConfigurePipe(CDCInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
+ EndpointData->EndpointAddress, EndpointData->EndpointSize, \r
+ CDCInterfaceInfo->Config.DataOUTPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
+ \r
CDCInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
\r
FoundEndpoints |= CDC_FOUND_DATAPIPE_OUT;\r
uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, char* Data, const uint16_t Length)\r
{\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r
- return PIPE_READYWAIT_NoError;\r
+ return PIPE_READYWAIT_DeviceDisconnected;\r
\r
uint8_t ErrorCode;\r
\r
- if (CDCInterfaceInfo->State.BidirectionalDataEndpoints)\r
- {\r
- Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
- Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
- }\r
- else\r
- {\r
- Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
- }\r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
\r
Pipe_Unfreeze();\r
ErrorCode = Pipe_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK);\r
Pipe_Freeze();\r
-\r
- if (CDCInterfaceInfo->State.BidirectionalDataEndpoints)\r
- Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
\r
return ErrorCode;\r
}\r
uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, const uint8_t Data)\r
{\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r
- return PIPE_READYWAIT_NoError;;\r
+ return PIPE_READYWAIT_DeviceDisconnected;\r
\r
uint8_t ErrorCode;\r
\r
- if (CDCInterfaceInfo->State.BidirectionalDataEndpoints)\r
- {\r
- Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
- Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
- }\r
- else\r
- {\r
- Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
- }\r
- \r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
Pipe_Unfreeze();\r
\r
if (!(Pipe_IsReadWriteAllowed()))\r
\r
Pipe_Write_Byte(Data); \r
Pipe_Freeze();\r
-\r
- if (CDCInterfaceInfo->State.BidirectionalDataEndpoints)\r
- Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
\r
return PIPE_READYWAIT_NoError;\r
}\r
uint16_t BytesInPipe = 0;\r
\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r
- return BytesInPipe;\r
+ return 0;\r
\r
Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
Pipe_Unfreeze();\r
\r
- if (Pipe_IsINReceived() && !(Pipe_BytesInPipe()))\r
- Pipe_ClearIN();\r
- \r
- BytesInPipe = Pipe_BytesInPipe();\r
- Pipe_Freeze();\r
- \r
- return BytesInPipe;\r
+ if (Pipe_IsINReceived())\r
+ {\r
+ if (!(Pipe_BytesInPipe()))\r
+ Pipe_ClearIN();\r
+ \r
+ BytesInPipe = Pipe_BytesInPipe();\r
+ Pipe_Freeze();\r
+ \r
+ return BytesInPipe;\r
+ }\r
+ else\r
+ {\r
+ Pipe_Freeze();\r
+ \r
+ return 0;\r
+ }\r
}\r
\r
uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)\r
uint8_t ReceivedByte = 0;\r
\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r
- return ReceivedByte;\r
+ return 0;\r
\r
Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
return ReceivedByte;\r
}\r
\r
+uint8_t CDC_Host_Flush(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)\r
+{\r
+ if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r
+ return PIPE_READYWAIT_DeviceDisconnected;\r
+ \r
+ uint8_t ErrorCode;\r
+\r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
+ Pipe_Unfreeze();\r
+ \r
+ if (!(Pipe_BytesInPipe()))\r
+ return PIPE_READYWAIT_NoError;\r
+\r
+ bool BankFull = !(Pipe_IsReadWriteAllowed());\r
+\r
+ Pipe_ClearOUT();\r
+\r
+ if (BankFull)\r
+ {\r
+ if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)\r
+ return ErrorCode;\r
+\r
+ Pipe_ClearOUT();\r
+ }\r
+\r
+ Pipe_Freeze();\r
+ \r
+ return PIPE_READYWAIT_NoError;\r
+}\r
+\r
void CDC_Host_CreateStream(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, FILE* Stream)\r
{\r
*Stream = (FILE)FDEV_SETUP_STREAM(CDC_Host_putchar, CDC_Host_getchar, _FDEV_SETUP_RW);\r
{\r
while (!(CDC_Host_BytesReceived((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream))))\r
{\r
+ if (USB_HostState == HOST_STATE_Unattached)\r
+ return _FDEV_EOF;\r
+\r
CDC_Host_USBTask((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));\r
USB_USBTask();\r
}\r
projects / pub / USBasp.git / blobdiff