#define INCLUDE_FROM_CDC_CLASS_HOST_C\r
#include "CDC.h"\r
\r
-uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint16_t ConfigDescriptorSize,\r
- uint8_t* ConfigDescriptorData)\r
+uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, uint16_t ConfigDescriptorSize,\r
+ void* ConfigDescriptorData)\r
{\r
uint8_t FoundEndpoints = 0;\r
\r
return CDC_ENUMERROR_NoCDCInterfaceFound;\r
}\r
\r
- CDCInterfaceInfo->State.ControlInterfaceNumber =\r
-#if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
- DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_Interface_t).InterfaceNumber;\r
-#else\r
- DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_Interface_t).bInterfaceNumber;\r
-#endif\r
+ CDCInterfaceInfo->State.ControlInterfaceNumber = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_Interface_t).InterfaceNumber;\r
\r
while (FoundEndpoints != (CDC_FOUND_NOTIFICATION_IN | CDC_FOUND_DATAPIPE_IN | CDC_FOUND_DATAPIPE_OUT))\r
{\r
if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)\r
{\r
if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
- { \r
+ {\r
Pipe_ConfigurePipe(CDCInterfaceInfo->Config.NotificationPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,\r
- EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+ EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
+ CDCInterfaceInfo->Config.NotificationPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
CDCInterfaceInfo->State.NotificationPipeSize = EndpointData->EndpointSize;\r
\r
Pipe_SetInterruptPeriod(EndpointData->PollingIntervalMS);\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, PIPE_BANK_SINGLE);\r
+ EndpointData->EndpointAddress, EndpointData->EndpointSize, \r
+ CDCInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
CDCInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
\r
FoundEndpoints |= CDC_FOUND_DATAPIPE_IN;\r
}\r
else\r
{\r
- Pipe_ConfigurePipe(CDCInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
- EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\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
CDCInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
\r
FoundEndpoints |= CDC_FOUND_DATAPIPE_OUT;\r
}\r
}\r
\r
+ CDCInterfaceInfo->State.ControlLineStates.HostToDevice = (CDC_CONTROL_LINE_OUT_RTS | CDC_CONTROL_LINE_OUT_DTR);\r
+ CDCInterfaceInfo->State.ControlLineStates.DeviceToHost = (CDC_CONTROL_LINE_IN_DCD | CDC_CONTROL_LINE_IN_DSR);\r
CDCInterfaceInfo->State.IsActive = true;\r
return CDC_ENUMERROR_NoError;\r
}\r
\r
-static uint8_t DComp_CDC_Host_NextCDCControlInterface(void* CurrentDescriptor)\r
+static uint8_t DComp_CDC_Host_NextCDCControlInterface(void* const CurrentDescriptor)\r
{\r
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
{\r
return DESCRIPTOR_SEARCH_NotFound;\r
}\r
\r
-static uint8_t DComp_CDC_Host_NextCDCDataInterface(void* CurrentDescriptor)\r
+static uint8_t DComp_CDC_Host_NextCDCDataInterface(void* const CurrentDescriptor)\r
{\r
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
{\r
return DESCRIPTOR_SEARCH_NotFound;\r
}\r
\r
-static uint8_t DComp_CDC_Host_NextCDCInterfaceEndpoint(void* CurrentDescriptor)\r
+static uint8_t DComp_CDC_Host_NextCDCInterfaceEndpoint(void* const CurrentDescriptor)\r
{\r
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
{\r
\r
uint8_t EndpointType = (CurrentEndpoint->Attributes & EP_TYPE_MASK);\r
\r
- if (((EndpointType == EP_TYPE_BULK) || (EndpointType == EP_TYPE_INTERRUPT)) &&\r
- !(Pipe_IsEndpointBound(CurrentEndpoint->EndpointAddress)))\r
+ if ((EndpointType == EP_TYPE_BULK) || (EndpointType == EP_TYPE_INTERRUPT))\r
{\r
return DESCRIPTOR_SEARCH_Found;\r
}\r
return DESCRIPTOR_SEARCH_NotFound;\r
}\r
\r
-void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)\r
{\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r
return;\r
\r
- Pipe_SelectPipe(CDCInterfaceInfo->Config.NotificationPipeNumber); \r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.NotificationPipeNumber);\r
+ Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
Pipe_Unfreeze();\r
\r
if (Pipe_IsINReceived())\r
{\r
USB_Request_Header_t Notification;\r
- Pipe_Read_Stream_LE(&Notification, sizeof(Notification), NO_STREAM_CALLBACK);\r
+ Pipe_Read_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NO_STREAM_CALLBACK);\r
\r
if ((Notification.bRequest == NOTIF_SerialState) &&\r
(Notification.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)))\r
Pipe_Freeze();\r
}\r
\r
-uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)\r
{\r
USB_ControlRequest = (USB_Request_Header_t)\r
{\r
return USB_Host_SendControlRequest(&CDCInterfaceInfo->State.LineEncoding);\r
}\r
\r
-uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)\r
{\r
USB_ControlRequest = (USB_Request_Header_t)\r
{\r
return USB_Host_SendControlRequest(NULL);\r
}\r
\r
-uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, char* Data, uint16_t Length)\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;\r
+ return PIPE_READYWAIT_DeviceDisconnected;\r
\r
uint8_t ErrorCode;\r
\r
- Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
+ if (CDCInterfaceInfo->State.BidirectionalDataEndpoints)\r
+ {\r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
+ Pipe_SetPipeToken(PIPE_TOKEN_OUT);\r
+ }\r
+ else\r
+ {\r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
+ }\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
\r
-uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint8_t Data)\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;\r
+ return PIPE_READYWAIT_DeviceDisconnected;\r
\r
uint8_t ErrorCode;\r
\r
- Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
+ if (CDCInterfaceInfo->State.BidirectionalDataEndpoints)\r
+ {\r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
+ Pipe_SetPipeToken(PIPE_TOKEN_OUT);\r
+ }\r
+ else\r
+ {\r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
+ }\r
+ \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
\r
-uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)\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_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
+ Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
Pipe_Unfreeze();\r
\r
if (Pipe_IsINReceived() && !(Pipe_BytesInPipe()))\r
return BytesInPipe;\r
}\r
\r
-uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)\r
{\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_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
+ Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
Pipe_Unfreeze();\r
\r
ReceivedByte = Pipe_Read_Byte();\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
+ if (CDCInterfaceInfo->State.BidirectionalDataEndpoints)\r
+ {\r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);\r
+ Pipe_SetPipeToken(PIPE_TOKEN_OUT);\r
+ }\r
+ else\r
+ {\r
+ Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber); \r
+ }\r
+ \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
+ if (CDCInterfaceInfo->State.BidirectionalDataEndpoints)\r
+ Pipe_SetPipeToken(PIPE_TOKEN_IN);\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
+ fdev_set_udata(Stream, CDCInterfaceInfo);\r
+}\r
+\r
+void CDC_Host_CreateBlockingStream(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, FILE* Stream)\r
+{\r
+ *Stream = (FILE)FDEV_SETUP_STREAM(CDC_Host_putchar, CDC_Host_getchar_Blocking, _FDEV_SETUP_RW);\r
+ fdev_set_udata(Stream, CDCInterfaceInfo);\r
+}\r
+\r
+static int CDC_Host_putchar(char c, FILE* Stream)\r
+{\r
+ return CDC_Host_SendByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : 0;\r
+}\r
+\r
+static int CDC_Host_getchar(FILE* Stream)\r
+{\r
+ if (!(CDC_Host_BytesReceived((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream))))\r
+ return _FDEV_EOF;\r
+\r
+ return CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));\r
+}\r
+\r
+static int CDC_Host_getchar_Blocking(FILE* Stream)\r
+{\r
+ while (!(CDC_Host_BytesReceived((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream))))\r
+ {\r
+ CDC_Host_USBTask((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));\r
+ USB_USBTask();\r
+ }\r
+\r
+ return CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));\r
+}\r
+\r
void CDC_Host_Event_Stub(void)\r
{\r
\r
projects / pub / USBasp.git / blobdiff