Move RNDISConstants.h into the RNDIS class driver common definition header.

[pub/USBasp.git] / Projects / USBtoSerial / USBtoSerial.c

diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c
index 4f3fcf5..3f06acd 100644 (file)
--- a/Projects/USBtoSerial/USBtoSerial.c
+++ b/Projects/USBtoSerial/USBtoSerial.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 */
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -48,7 +48,7 @@ RingBuff_t USARTtoUSB_Buffer;
  */
 USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
        {
  */
 USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
        {

-               .Config = 
+               .Config =

                        {
                                .ControlInterfaceNumber         = 0,
 
                        {
                                .ControlInterfaceNumber         = 0,
 


@@ -72,7 +72,7 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
 int main(void)
 {
        SetupHardware();
 int main(void)
 {
        SetupHardware();

-       
+

        RingBuffer_InitBuffer(&USBtoUSART_Buffer);
        RingBuffer_InitBuffer(&USARTtoUSB_Buffer);
 
        RingBuffer_InitBuffer(&USBtoUSART_Buffer);
        RingBuffer_InitBuffer(&USARTtoUSB_Buffer);
 


@@ -84,22 +84,23 @@ int main(void)
                /* Read bytes from the USB OUT endpoint into the USART transmit buffer */
                int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
                if (!(ReceivedByte < 0) && !(RingBuffer_IsFull(&USBtoUSART_Buffer)))
                /* Read bytes from the USB OUT endpoint into the USART transmit buffer */
                int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
                if (!(ReceivedByte < 0) && !(RingBuffer_IsFull(&USBtoUSART_Buffer)))

-                 RingBuffer_AtomicInsert(&USBtoUSART_Buffer, (uint8_t)ReceivedByte);           
-               
-               /* Check if the UART receive buffer flush timer has expired */
-               if (TIFR0 & (1 << TOV0))
+                 RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);
+
+               /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */
+               RingBuff_Count_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
+               if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200))

                {
                        TIFR0 |= (1 << TOV0);
 
                        /* Read bytes from the USART receive buffer into the USB IN endpoint */
                {
                        TIFR0 |= (1 << TOV0);
 
                        /* Read bytes from the USART receive buffer into the USB IN endpoint */

-                       while (USARTtoUSB_Buffer.Count)
-                         CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_AtomicRemove(&USARTtoUSB_Buffer));
+                       while (BufferCount--)
+                         CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&USARTtoUSB_Buffer));

                }
                }

-               
+

                /* Load the next byte from the USART transmit buffer into the USART */
                /* Load the next byte from the USART transmit buffer into the USART */

-               if (USBtoUSART_Buffer.Count)
-                 Serial_TxByte(RingBuffer_AtomicRemove(&USBtoUSART_Buffer));
-               
+               if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))
+                 Serial_TxByte(RingBuffer_Remove(&USBtoUSART_Buffer));
+

                CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
                USB_USBTask();
        }
                CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
                USB_USBTask();
        }


@@ -138,10 +139,11 @@ void EVENT_USB_Device_Disconnect(void)
 /** Event handler for the library USB Configuration Changed event. */
 void EVENT_USB_Device_ConfigurationChanged(void)
 {
 /** Event handler for the library USB Configuration Changed event. */
 void EVENT_USB_Device_ConfigurationChanged(void)
 {

-       LEDs_SetAllLEDs(LEDMASK_USB_READY);
+       bool ConfigSuccess = true;
+
+       ConfigSuccess &= CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);

 
 

-       if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface)))
-         LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+       LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);

 }
 
 /** Event handler for the library USB Unhandled Control Request event. */
 }
 
 /** Event handler for the library USB Unhandled Control Request event. */


@@ -172,10 +174,10 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI
        switch (CDCInterfaceInfo->State.LineEncoding.ParityType)
        {
                case CDC_PARITY_Odd:
        switch (CDCInterfaceInfo->State.LineEncoding.ParityType)
        {
                case CDC_PARITY_Odd:

-                       ConfigMask = ((1 << UPM11) | (1 << UPM10));             
+                       ConfigMask = ((1 << UPM11) | (1 << UPM10));

                        break;
                case CDC_PARITY_Even:
                        break;
                case CDC_PARITY_Even:

-                       ConfigMask = (1 << UPM11);              
+                       ConfigMask = (1 << UPM11);

                        break;
        }
 
                        break;
        }
 


@@ -202,9 +204,10 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI
 
        /* Set the new baud rate before configuring the USART */
        UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
 
        /* Set the new baud rate before configuring the USART */
        UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);

-       
+

        /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */
        UCSR1C = ConfigMask;
        /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */
        UCSR1C = ConfigMask;

-       UCSR1A = (1 << U2X1);   
+       UCSR1A = (1 << U2X1);

        UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
 }
        UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
 }

+