Completion of initial CDC host mode class driver.

[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 e0e15e1..2985b24 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -34,12 +34,10 @@
 #define  INCLUDE_FROM_CDC_CLASS_HOST_C\r
 #include "CDC.h"\r
 \r
-#warning The CDC Host mode Class driver is currently incomplete and is for preview purposes only.\r
-\r
 uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint16_t ConfigDescriptorSize,\r
                                 uint8_t* ConfigDescriptorData)\r
 {\r
-       uint8_t  FoundEndpoints = 0;\r
+       uint8_t FoundEndpoints = 0;\r
 \r
        memset(&CDCInterfaceInfo->State, 0x00, sizeof(CDCInterfaceInfo->State));\r
 \r
@@ -198,7 +196,32 @@ static uint8_t DComp_CDC_Host_NextInterfaceCDCDataEndpoint(void* CurrentDescript
 \r
 void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
 {\r
-       EVENT_CDC_Host_ControLineStateChanged(CDCInterfaceInfo);\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+         return;\r
+       \r
+       Pipe_SelectPipe(CDCInterfaceInfo->Config.NotificationPipeNumber);       \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
+               \r
+               if ((Notification.bRequest      == NOTIF_SerialState) &&\r
+                   (Notification.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)))\r
+               {\r
+                       Pipe_Read_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,\r
+                                           sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),\r
+                                           NO_STREAM_CALLBACK);\r
+                       \r
+               }\r
+\r
+               Pipe_ClearIN();\r
+\r
+               EVENT_CDC_Host_ControLineStateChanged(CDCInterfaceInfo);\r
+       }\r
+       \r
+       Pipe_Freeze();\r
 }\r
 \r
 uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
@@ -206,7 +229,7 @@ uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
        USB_ControlRequest = (USB_Request_Header_t)\r
        {\r
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
-               .bRequest      = REQ_SetControlLineState,\r
+               .bRequest      = REQ_SetLineEncoding,\r
                .wValue        = 0,\r
                .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,\r
                .wLength       = sizeof(CDCInterfaceInfo->State.LineEncoding),\r