Better fix for LowLevel CDC demo issue where sending data before the line encoding...

[pub/USBasp.git] / Demos / Device / LowLevel / CDC / CDC.c

diff --git a/Demos/Device/LowLevel/CDC/CDC.c b/Demos/Device/LowLevel/CDC/CDC.c
index 73b486c..4b5409f 100644 (file)
--- a/Demos/Device/LowLevel/CDC/CDC.c
+++ b/Demos/Device/LowLevel/CDC/CDC.c
@@ -45,16 +45,10 @@
  *  It is possible to completely ignore these value or use other settings as the host is completely unaware of the physical\r
  *  serial link characteristics and instead sends and receives data in endpoint streams.\r
  */\r
-CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,\r
-                                 .CharFormat  = OneStopBit,\r
-                                 .ParityType  = Parity_None,\r
-                                 .DataBits    = 8            };\r
-                                                       \r
-/** Indicates if the host has set the device line encoding. Until the line encoding is set by the host, the device should\r
- *  not attempt to send any bytes.\r
- */     \r
-bool LineEncodingSet = false;\r
-\r
+CDC_Line_Coding_t LineEncoding = { .BaudRateBPS = 0,\r
+                                   .CharFormat  = OneStopBit,\r
+                                   .ParityType  = Parity_None,\r
+                                   .DataBits    = 8            };\r
 \r
 #if 0\r
 /* NOTE: Here you can set up a standard stream using the created virtual serial port, so that the standard stream functions in\r
@@ -65,7 +59,7 @@ static int CDC_putchar(char c, FILE *stream)
 {        \r
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
-       if (!(LineEncodingSet))\r
+       if (!(LineEncoding.BaudRateBPS))\r
          return -1;\r
        \r
        while (!(Endpoint_IsReadWriteAllowed()))\r
@@ -84,7 +78,7 @@ static int CDC_getchar(FILE *stream)
 {\r
        int c;\r
 \r
-       if (!(LineEncodingSet))\r
+       if (!(LineEncoding.BaudRateBPS))\r
          return -1;\r
 \r
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
@@ -201,8 +195,6 @@ void EVENT_USB_ConfigurationChanged(void)
  */\r
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
-       uint8_t* LineCodingData = (uint8_t*)&LineCoding;\r
-\r
        /* Process CDC specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r
        {\r
@@ -213,7 +205,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                Endpoint_ClearSETUP();\r
 \r
                                /* Write the line coding data to the control endpoint */\r
-                               Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
+                               Endpoint_Write_Control_Stream_LE(&LineEncoding, sizeof(CDC_Line_Coding_t));\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                Endpoint_ClearOUT();\r
@@ -227,10 +219,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                Endpoint_ClearSETUP();\r
 \r
                                /* Read the line coding data in from the host into the global struct */\r
-                               Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
-                               \r
-                               /* Indicate that the line encoding has been set, and the device may now send data */\r
-                               LineEncodingSet = true;\r
+                               Endpoint_Read_Control_Stream_LE(&LineEncoding, sizeof(CDC_Line_Coding_t));\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
                                Endpoint_ClearIN();\r
@@ -314,7 +303,7 @@ void CDC_Task(void)
        {\r
                ActionSent = false;\r
        }\r
-       else if ((ActionSent == false) && LineEncodingSet)\r
+       else if ((ActionSent == false) && LineEncoding.BaudRateBPS)\r
        {\r
                ActionSent = true;\r
 \r