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

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
  *  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
 \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
 {        \r
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r

-       if (!(LineEncodingSet))\r
+       if (!(LineEncoding.BaudRateBPS))\r

          return -1;\r
        \r
        while (!(Endpoint_IsReadWriteAllowed()))\r
          return -1;\r
        \r
        while (!(Endpoint_IsReadWriteAllowed()))\r


@@ -84,7 +78,7 @@ static int CDC_getchar(FILE *stream)
 {\r
        int c;\r
 \r
 {\r
        int c;\r
 \r

-       if (!(LineEncodingSet))\r
+       if (!(LineEncoding.BaudRateBPS))\r

          return -1;\r
 \r
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\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
  */\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
        /* 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_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
                                \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_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
 \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
        {\r
                ActionSent = false;\r
        }\r

-       else if ((ActionSent == false) && LineEncodingSet)\r
+       else if ((ActionSent == false) && LineEncoding.BaudRateBPS)\r

        {\r
                ActionSent = true;\r
 \r
        {\r
                ActionSent = true;\r
 \r

diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.c b/Demos/Device/LowLevel/DualCDC/DualCDC.c
index dd278d5..654ce86 100644 (file)
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.c
+++ b/Demos/Device/LowLevel/DualCDC/DualCDC.c
@@ -45,10 +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
  *  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 LineCoding1 = { .BaudRateBPS = 9600,\r
-                                  .CharFormat  = OneStopBit,\r
-                                  .ParityType  = Parity_None,\r
-                                  .DataBits    = 8            };\r
+CDC_Line_Coding_t LineEncoding1 = { .BaudRateBPS = 0,\r
+                                    .CharFormat  = OneStopBit,\r
+                                    .ParityType  = Parity_None,\r
+                                    .DataBits    = 8            };\r

 \r
 /** Contains the current baud rate and other settings of the second virtual serial port. While this demo does not use\r
  *  the physical USART and thus does not use these settings, they must still be retained and returned to the host\r
 \r
 /** Contains the current baud rate and other settings of the second virtual serial port. While this demo does not use\r
  *  the physical USART and thus does not use these settings, they must still be retained and returned to the host\r


@@ -58,10 +58,10 @@ CDC_Line_Coding_t LineCoding1 = { .BaudRateBPS = 9600,
  *  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
  *  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 LineCoding2 = { .BaudRateBPS = 9600,\r
-                                  .CharFormat  = OneStopBit,\r
-                                  .ParityType  = Parity_None,\r
-                                  .DataBits    = 8            };\r
+CDC_Line_Coding_t LineEncoding2 = { .BaudRateBPS = 0,\r
+                                    .CharFormat  = OneStopBit,\r
+                                    .ParityType  = Parity_None,\r
+                                    .DataBits    = 8            };\r

 \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
  *  starts the scheduler to run the application tasks.\r
 \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
  *  starts the scheduler to run the application tasks.\r


@@ -172,7 +172,7 @@ void EVENT_USB_ConfigurationChanged(void)
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
        /* Determine which interface's Line Coding data is being set from the wIndex parameter */\r
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
        /* Determine which interface's Line Coding data is being set from the wIndex parameter */\r

-       uint8_t* LineCodingData = (USB_ControlRequest.wIndex == 0) ? (uint8_t*)&LineCoding1 : (uint8_t*)&LineCoding2;\r
+       uint8_t* LineEncodingData = (USB_ControlRequest.wIndex == 0) ? (uint8_t*)&LineEncoding1 : (uint8_t*)&LineEncoding2;\r

 \r
        /* Process CDC specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r
 \r
        /* Process CDC specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r


@@ -184,7 +184,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                Endpoint_ClearSETUP();\r
 \r
                                /* Write the line coding data to the control endpoint */\r
                                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(LineEncodingData, 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
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                Endpoint_ClearOUT();\r


@@ -198,7 +198,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_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
+                               Endpoint_Read_Control_Stream_LE(LineEncodingData, sizeof(CDC_Line_Coding_t));\r

 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
                                Endpoint_ClearIN();\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
                                Endpoint_ClearIN();\r


@@ -256,7 +256,7 @@ void CDC1_Task(void)
        {\r
                ActionSent = false;\r
        }\r
        {\r
                ActionSent = false;\r
        }\r

-       else if (ActionSent == false)\r
+       else if ((ActionSent == false) && LineEncoding1.BaudRateBPS)\r

        {\r
                ActionSent = true;\r
                \r
        {\r
                ActionSent = true;\r
                \r

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
index af963b1..2765064 100644 (file)
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
@@ -36,10 +36,10 @@
  *  These values are set by the host via a class-specific request, and the physical USART should be reconfigured to match the\r
  *  new settings each time they are changed by the host.\r
  */\r
  *  These values are set by the host via a class-specific request, and the physical USART should be reconfigured to match the\r
  *  new settings each time they are changed by the host.\r
  */\r

-CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,\r
-                                 .CharFormat  = OneStopBit,\r
-                                 .ParityType  = Parity_None,\r
-                                 .DataBits    = 8            };\r
+CDC_Line_Coding_t LineEncoding = { .BaudRateBPS = 0,\r
+                                   .CharFormat  = OneStopBit,\r
+                                   .ParityType  = Parity_None,\r
+                                   .DataBits    = 8            };\r

 \r
 /** Ring (circular) buffer to hold the RX data - data from the host to the attached device on the serial port. */\r
 RingBuff_t Rx_Buffer;\r
 \r
 /** Ring (circular) buffer to hold the RX data - data from the host to the attached device on the serial port. */\r
 RingBuff_t Rx_Buffer;\r


@@ -145,8 +145,6 @@ void EVENT_USB_ConfigurationChanged(void)
  */\r
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
  */\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
        /* Process CDC specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r
        {\r


@@ -157,7 +155,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                Endpoint_ClearSETUP();\r
 \r
                                /* Write the line coding data to the control endpoint */\r
                                Endpoint_ClearSETUP();\r
 \r
                                /* Write the line coding data to the control endpoint */\r

-                               Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(LineCoding));\r
+                               Endpoint_Write_Control_Stream_LE(&LineEncoding, sizeof(LineEncoding));\r

                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                Endpoint_ClearOUT();\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                Endpoint_ClearOUT();\r


@@ -171,7 +169,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_ClearSETUP();\r
 \r
                                /* Read the line coding data in from the host into the global struct */\r

-                               Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(LineCoding));\r
+                               Endpoint_Read_Control_Stream_LE(&LineEncoding, sizeof(LineEncoding));\r

 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
                                Endpoint_ClearIN();\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
                                Endpoint_ClearIN();\r


@@ -259,7 +257,7 @@ void CDC_Task(void)
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
        /* Check if the Tx buffer contains anything to be sent to the host */\r
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
        /* Check if the Tx buffer contains anything to be sent to the host */\r

-       if (Tx_Buffer.Elements)\r
+       if ((Tx_Buffer.Elements) && LineEncoding.BaudRateBPS)\r

        {\r
                /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
                while (!(Endpoint_IsReadWriteAllowed()))\r
        {\r
                /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
                while (!(Endpoint_IsReadWriteAllowed()))\r


@@ -304,7 +302,7 @@ void CDC_Task(void)
 ISR(USART1_RX_vect, ISR_BLOCK)\r
 {\r
        /* Only store received characters if the USB interface is connected */\r
 ISR(USART1_RX_vect, ISR_BLOCK)\r
 {\r
        /* Only store received characters if the USB interface is connected */\r

-       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) && LineEncoding.BaudRateBPS)\r

          Buffer_StoreElement(&Tx_Buffer, UDR1);\r
 }\r
 \r
          Buffer_StoreElement(&Tx_Buffer, UDR1);\r
 }\r
 \r


@@ -314,21 +312,21 @@ void ReconfigureUSART(void)
        uint8_t ConfigMask = 0;\r
 \r
        /* Determine parity - non odd/even parity mode defaults to no parity */\r
        uint8_t ConfigMask = 0;\r
 \r
        /* Determine parity - non odd/even parity mode defaults to no parity */\r

-       if (LineCoding.ParityType == Parity_Odd)\r
+       if (LineEncoding.ParityType == Parity_Odd)\r

          ConfigMask = ((1 << UPM11) | (1 << UPM10));\r
          ConfigMask = ((1 << UPM11) | (1 << UPM10));\r

-       else if (LineCoding.ParityType == Parity_Even)\r
+       else if (LineEncoding.ParityType == Parity_Even)\r

          ConfigMask = (1 << UPM11);\r
 \r
        /* Determine stop bits - 1.5 stop bits is set as 1 stop bit due to hardware limitations */\r
          ConfigMask = (1 << UPM11);\r
 \r
        /* Determine stop bits - 1.5 stop bits is set as 1 stop bit due to hardware limitations */\r

-       if (LineCoding.CharFormat == TwoStopBits)\r
+       if (LineEncoding.CharFormat == TwoStopBits)\r

          ConfigMask |= (1 << USBS1);\r
 \r
        /* Determine data size - 5, 6, 7, or 8 bits are supported */\r
          ConfigMask |= (1 << USBS1);\r
 \r
        /* Determine data size - 5, 6, 7, or 8 bits are supported */\r

-       if (LineCoding.DataBits == 6)\r
+       if (LineEncoding.DataBits == 6)\r

          ConfigMask |= (1 << UCSZ10);\r
          ConfigMask |= (1 << UCSZ10);\r

-       else if (LineCoding.DataBits == 7)\r
+       else if (LineEncoding.DataBits == 7)\r

          ConfigMask |= (1 << UCSZ11);\r
          ConfigMask |= (1 << UCSZ11);\r

-       else if (LineCoding.DataBits == 8)\r
+       else if (LineEncoding.DataBits == 8)\r

          ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));\r
        \r
        /* Enable double speed, gives better error percentages at 8MHz */\r
          ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));\r
        \r
        /* Enable double speed, gives better error percentages at 8MHz */\r


@@ -341,5 +339,5 @@ void ReconfigureUSART(void)
        UCSR1C = ConfigMask;\r
        \r
        /* Set the USART baud rate register to the desired baud rate value */\r
        UCSR1C = ConfigMask;\r
        \r
        /* Set the USART baud rate register to the desired baud rate value */\r

-       UBRR1  = SERIAL_2X_UBBRVAL((uint16_t)LineCoding.BaudRateBPS);\r
+       UBRR1  = SERIAL_2X_UBBRVAL((uint16_t)LineEncoding.BaudRateBPS);\r

 }\r
 }\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index cdd2333..c674a55 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -68,6 +68,7 @@
   *    to only unfreeze and check one data pipe at a time) to prevent incorrect device enumerations and freezes while trasferring data\r
   *  - Make Pipe_ConfigurePipe() mask the given endpoint number against PIPE_EPNUM_MASK to ensure the endpoint IN direction bit is\r
   *    cleared to prevent endpoint type corruption\r
   *    to only unfreeze and check one data pipe at a time) to prevent incorrect device enumerations and freezes while trasferring data\r
   *  - Make Pipe_ConfigurePipe() mask the given endpoint number against PIPE_EPNUM_MASK to ensure the endpoint IN direction bit is\r
   *    cleared to prevent endpoint type corruption\r

+  *  - Fixed issue opening CDC-ACM ports on hosts when the CDC device tries to send data before the host has set the line encoding\r

   *  - Fixed USB_OPT_MANUAL_PLL option being ignored during device disconnects on some models (thanks to Brian Dickman)\r
   *  - Fixed documentation mentioning Pipe_GetCurrentToken() function when correct function name is Pipe_GetPipeToken()\r
   *  - Fixed ADC driver for the ATMEGA32U4 and ATMEGA16U4 (thanks to Opendous Inc.)\r
   *  - Fixed USB_OPT_MANUAL_PLL option being ignored during device disconnects on some models (thanks to Brian Dickman)\r
   *  - Fixed documentation mentioning Pipe_GetCurrentToken() function when correct function name is Pipe_GetPipeToken()\r
   *  - Fixed ADC driver for the ATMEGA32U4 and ATMEGA16U4 (thanks to Opendous Inc.)\r