Add extra LUFA TAR archive export exclusions.

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

diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c
index b07ce4e..194f6b0 100644 (file)
--- a/Projects/USBtoSerial/USBtoSerial.c
+++ b/Projects/USBtoSerial/USBtoSerial.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -37,17 +37,16 @@
 #include "USBtoSerial.h"
 
 /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
 #include "USBtoSerial.h"
 
 /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */

-RingBuffer_t USBtoUSART_Buffer;
+static RingBuffer_t USBtoUSART_Buffer;

 
 /** Underlying data buffer for \ref USBtoUSART_Buffer, where the stored bytes are located. */
 
 /** Underlying data buffer for \ref USBtoUSART_Buffer, where the stored bytes are located. */

-uint8_t      USBtoUSART_Buffer_Data[128];
+static uint8_t      USBtoUSART_Buffer_Data[128];

 
 /** Circular buffer to hold data from the serial port before it is sent to the host. */
 
 /** Circular buffer to hold data from the serial port before it is sent to the host. */

-RingBuffer_t USARTtoUSB_Buffer;
+static RingBuffer_t USARTtoUSB_Buffer;

 
 /** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */
 
 /** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */

-uint8_t    USARTtoUSB_Buffer_Data[128];
-
+static uint8_t      USARTtoUSB_Buffer_Data[128];

 
 /** LUFA CDC Class driver interface configuration and state information. This structure is
  *  passed to all CDC Class driver functions, so that multiple instances of the same class
 
 /** LUFA CDC Class driver interface configuration and state information. This structure is
  *  passed to all CDC Class driver functions, so that multiple instances of the same class


@@ -73,6 +72,7 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
                        },
        };
 
                        },
        };
 

+

 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */
 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */


@@ -97,10 +97,10 @@ int main(void)
                        if (!(ReceivedByte < 0))
                          RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);
                }
                        if (!(ReceivedByte < 0))
                          RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);
                }

-               
+

                /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */
                uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
                /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */
                uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);

-               if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200))
+               if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75)))

                {
                        /* Clear flush timer expiry flag */
                        TIFR0 |= (1 << TOV0);
                {
                        /* Clear flush timer expiry flag */
                        TIFR0 |= (1 << TOV0);


@@ -122,7 +122,7 @@ int main(void)
 
                /* Load the next byte from the USART transmit buffer into the USART */
                if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))
 
                /* Load the next byte from the USART transmit buffer into the USART */
                if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))

-                 Serial_TxByte(RingBuffer_Remove(&USBtoUSART_Buffer));
+                 Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));

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