Fix issue in CDC device class driver where received data the size of the data endpoin...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / CDC.c

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c
index b7a192a..e0e15e1 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -51,6 +51,13 @@ uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint
        {\r
                return CDC_ENUMERROR_NoCDCInterfaceFound;\r
        }\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

 \r
        while (FoundEndpoints != (CDC_FOUND_DATAPIPE_IN | CDC_FOUND_DATAPIPE_OUT | CDC_FOUND_DATAPIPE_NOTIFICATION))\r
        {\r
 \r
        while (FoundEndpoints != (CDC_FOUND_DATAPIPE_IN | CDC_FOUND_DATAPIPE_OUT | CDC_FOUND_DATAPIPE_NOTIFICATION))\r
        {\r


@@ -126,6 +133,7 @@ uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint
                }\r
        }\r
 \r
                }\r
        }\r
 \r

+       CDCInterfaceInfo->State.Active = true;\r

        return CDC_ENUMERROR_NoError;\r
 }\r
 \r
        return CDC_ENUMERROR_NoError;\r
 }\r
 \r


@@ -190,6 +198,111 @@ static uint8_t DComp_CDC_Host_NextInterfaceCDCDataEndpoint(void* CurrentDescript
 \r
 void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
 {\r
 \r
 void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
 {\r

+       EVENT_CDC_Host_ControLineStateChanged(CDCInterfaceInfo);\r
+}\r
+\r
+uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+{\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+       {\r
+               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+               .bRequest      = REQ_SetControlLineState,\r
+               .wValue        = 0,\r
+               .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,\r
+               .wLength       = sizeof(CDCInterfaceInfo->State.LineEncoding),\r
+       };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(&CDCInterfaceInfo->State.LineEncoding);\r
+}\r
+\r
+uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+{\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+       {\r
+               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+               .bRequest      = REQ_SetControlLineState,\r
+               .wValue        = CDCInterfaceInfo->State.ControlLineStates.HostToDevice,\r
+               .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,\r
+               .wLength       = 0,\r
+       };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(NULL);\r
+}\r
+\r
+void CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, char* Data, uint16_t Length)\r
+{\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+         return;\r
+\r
+       Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber);    \r
+       Pipe_Unfreeze();\r
+       Pipe_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK); \r
+       Pipe_Freeze();\r
+}\r
+\r
+void CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint8_t Data)\r
+{\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+         return;\r
+\r
+       Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipeNumber);    \r
+       Pipe_Unfreeze();\r
+       \r
+       if (!(Pipe_IsReadWriteAllowed()))\r
+       {\r
+               Pipe_ClearOUT();\r
+               Pipe_WaitUntilReady();\r
+       }\r
+\r
+       Pipe_Write_Byte(Data);  \r
+       Pipe_Freeze();\r
+}\r
+\r
+uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+{\r
+       uint16_t BytesInPipe = 0;\r
+\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+         return BytesInPipe;\r
+       \r
+       Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);     \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
+}\r
+\r
+uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
+{\r
+       uint8_t ReceivedByte = 0;\r
+\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+         return ReceivedByte;\r
+         \r
+       Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);     \r
+       Pipe_Unfreeze();\r
+\r
+       ReceivedByte = Pipe_Read_Byte();\r
+       \r
+       if (!(Pipe_BytesInPipe()))\r
+         Pipe_ClearIN();\r
+       \r
+       Pipe_Freeze();\r
+       \r
+       return ReceivedByte;\r
+}\r
+\r
+void CDC_Host_Event_Stub(void)\r
+{\r

 \r
 }\r
 \r
 \r
 }\r
 \r