1 files changed, 281 insertions, 281 deletions
diff --git a/usb-serial/usb-serial.c b/usb-serial/usb-serial.c
index 9983d9d..f333675 100644
--- a/usb-serial/usb-serial.c
+++ b/usb-serial/usb-serial.c
@@ -1,281 +1,281 @@
-/*
- *  spreadspace avr utils
- *
- *
- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
- *
- *  This file is part of spreadspace avr utils.
- *
- *  spreadspace avr utils is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  any later version.
- *
- *  spreadspace avr utils is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-/* this is more or less the same as the LUFA example Project USBtoSerial and
-   this is their LICENSE Header */
-
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2012.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  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
-  without fee, provided that the above copyright notice appear in
-  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
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *
- *  Main source file for the USBtoSerial project. This file contains the main tasks of
- *  the project and is responsible for the initial application hardware configuration.
- */
-
-
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <avr/power.h>
-
-#include "lufa-descriptor-usbserial.h"
-
-#include "util.h"
-#include "led.h"
-
-#include <LUFA/Version.h>
-#include <LUFA/Drivers/Peripheral/Serial.h>
-#include <LUFA/Drivers/Misc/RingBuffer.h>
-#include <LUFA/Drivers/USB/USB.h>
-
-    /* Function Prototypes: */
-void SetupHardware(void);
-
-void EVENT_USB_Device_Connect(void);
-void EVENT_USB_Device_Disconnect(void);
-void EVENT_USB_Device_ConfigurationChanged(void);
-void EVENT_USB_Device_ControlRequest(void);
-
-void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
-
-/** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
-static RingBuffer_t USBtoUSART_Buffer;
-
-/** Underlying data buffer for \ref USBtoUSART_Buffer, where the stored bytes are located. */
-static uint8_t      USBtoUSART_Buffer_Data[128];
-
-/** Circular buffer to hold data from the serial port before it is sent to the host. */
-static RingBuffer_t USARTtoUSB_Buffer;
-
-/** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */
-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
- *  within a device can be differentiated from one another.
- */
-USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
-  {
-    .Config =
-      {
-        .ControlInterfaceNumber         = 0,
-
-        .DataINEndpointNumber           = CDC_TX_EPNUM,
-        .DataINEndpointSize             = CDC_TXRX_EPSIZE,
-        .DataINEndpointDoubleBank       = false,
-
-        .DataOUTEndpointNumber          = CDC_RX_EPNUM,
-        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,
-        .DataOUTEndpointDoubleBank      = false,
-
-        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,
-        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,
-        .NotificationEndpointDoubleBank = false,
-      },
-  };
-
-
-/** Main program entry point. This routine contains the overall program flow, including initial
- *  setup of all components and the main program loop.
- */
-int main(void)
-{
-  SetupHardware();
-
-  RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));
-  RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));
-
-  sei();
-
-  for (;;)
-  {
-    /* Only try to read in bytes from the CDC interface if the transmit buffer is not full */
-    if (!(RingBuffer_IsFull(&USBtoUSART_Buffer)))
-    {
-      int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
-
-      /* Read bytes from the USB OUT endpoint into the USART transmit buffer */
-      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);
-    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75)))
-    {
-      /* Clear flush timer expiry flag */
-      TIFR0 |= (1 << TOV0);
-
-      /* Read bytes from the USART receive buffer into the USB IN endpoint */
-      while (BufferCount--)
-      {
-        /* Try to send the next byte of data to the host, abort if there is an error without dequeuing */
-        if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,
-                                RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)
-        {
-          break;
-        }
-
-        /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */
-        RingBuffer_Remove(&USARTtoUSB_Buffer);
-      }
-    }
-
-    /* Load the next byte from the USART transmit buffer into the USART */
-    if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))
-      Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));
-
-    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
-    USB_USBTask();
-  }
-}
-
-/** Configures the board hardware and chip peripherals for the demo's functionality. */
-void SetupHardware(void)
-{
-  /* Disable watchdog if enabled by bootloader/fuses */
-  MCUSR &= ~(1 << WDRF);
-  wdt_disable();
-
-  cpu_init();
-  led_init();
-  USB_Init();
-
-  /* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */
-  TCCR0B = (1 << CS02);
-}
-
-/** Event handler for the library USB Connection event. */
-void EVENT_USB_Device_Connect(void)
-{
-  led_on();
-}
-
-/** Event handler for the library USB Disconnection event. */
-void EVENT_USB_Device_Disconnect(void)
-{
-  led_off();
-}
-
-/** Event handler for the library USB Configuration Changed event. */
-void EVENT_USB_Device_ConfigurationChanged(void)
-{
-  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
-  led_toggle();
-  _delay_ms(10);
-  led_toggle();
-}
-
-/** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
-{
-  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
-}
-
-/** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer
- *  for later transmission to the host.
- */
-ISR(USART1_RX_vect, ISR_BLOCK)
-{
-  uint8_t ReceivedByte = UDR1;
-
-  if (USB_DeviceState == DEVICE_STATE_Configured)
-    RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);
-}
-
-/** Event handler for the CDC Class driver Line Encoding Changed event.
- *
- *  \param[in] CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced
- */
-void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-  uint8_t ConfigMask = 0;
-
-  switch (CDCInterfaceInfo->State.LineEncoding.ParityType)
-  {
-    case CDC_PARITY_Odd:
-      ConfigMask = ((1 << UPM11) | (1 << UPM10));
-      break;
-    case CDC_PARITY_Even:
-      ConfigMask = (1 << UPM11);
-      break;
-  }
-
-  if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)
-    ConfigMask |= (1 << USBS1);
-
-  switch (CDCInterfaceInfo->State.LineEncoding.DataBits)
-  {
-    case 6:
-      ConfigMask |= (1 << UCSZ10);
-      break;
-    case 7:
-      ConfigMask |= (1 << UCSZ11);
-      break;
-    case 8:
-      ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
-      break;
-  }
-
-  /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
-  UCSR1B = 0;
-  UCSR1A = 0;
-  UCSR1C = 0;
-
-  /* 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;
-  UCSR1A = (1 << U2X1);
-  UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
-}
-
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/* this is more or less the same as the LUFA example Project USBtoSerial and
+   this is their LICENSE Header */
+
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  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
+  without fee, provided that the above copyright notice appear in
+  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
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Main source file for the USBtoSerial project. This file contains the main tasks of
+ *  the project and is responsible for the initial application hardware configuration.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+
+#include "lufa-descriptor-usbserial.h"
+
+#include "util.h"
+#include "led.h"
+
+#include <LUFA/Version.h>
+#include <LUFA/Drivers/Peripheral/Serial.h>
+#include <LUFA/Drivers/Misc/RingBuffer.h>
+#include <LUFA/Drivers/USB/USB.h>
+
+    /* Function Prototypes: */
+void SetupHardware(void);
+
+void EVENT_USB_Device_Connect(void);
+void EVENT_USB_Device_Disconnect(void);
+void EVENT_USB_Device_ConfigurationChanged(void);
+void EVENT_USB_Device_ControlRequest(void);
+
+void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
+
+/** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
+static RingBuffer_t USBtoUSART_Buffer;
+
+/** Underlying data buffer for \ref USBtoUSART_Buffer, where the stored bytes are located. */
+static uint8_t      USBtoUSART_Buffer_Data[128];
+
+/** Circular buffer to hold data from the serial port before it is sent to the host. */
+static RingBuffer_t USARTtoUSB_Buffer;
+
+/** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */
+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
+ *  within a device can be differentiated from one another.
+ */
+USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
+  {
+    .Config =
+      {
+        .ControlInterfaceNumber         = 0,
+
+        .DataINEndpointNumber           = CDC_TX_EPNUM,
+        .DataINEndpointSize             = CDC_TXRX_EPSIZE,
+        .DataINEndpointDoubleBank       = false,
+
+        .DataOUTEndpointNumber          = CDC_RX_EPNUM,
+        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,
+        .DataOUTEndpointDoubleBank      = false,
+
+        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,
+        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,
+        .NotificationEndpointDoubleBank = false,
+      },
+  };
+
+
+/** Main program entry point. This routine contains the overall program flow, including initial
+ *  setup of all components and the main program loop.
+ */
+int main(void)
+{
+  SetupHardware();
+
+  RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));
+  RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));
+
+  sei();
+
+  for (;;)
+  {
+    /* Only try to read in bytes from the CDC interface if the transmit buffer is not full */
+    if (!(RingBuffer_IsFull(&USBtoUSART_Buffer)))
+    {
+      int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
+
+      /* Read bytes from the USB OUT endpoint into the USART transmit buffer */
+      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);
+    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75)))
+    {
+      /* Clear flush timer expiry flag */
+      TIFR0 |= (1 << TOV0);
+
+      /* Read bytes from the USART receive buffer into the USB IN endpoint */
+      while (BufferCount--)
+      {
+        /* Try to send the next byte of data to the host, abort if there is an error without dequeuing */
+        if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,
+                                RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)
+        {
+          break;
+        }
+
+        /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */
+        RingBuffer_Remove(&USARTtoUSB_Buffer);
+      }
+    }
+
+    /* Load the next byte from the USART transmit buffer into the USART */
+    if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))
+      Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));
+
+    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
+    USB_USBTask();
+  }
+}
+
+/** Configures the board hardware and chip peripherals for the demo's functionality. */
+void SetupHardware(void)
+{
+  /* Disable watchdog if enabled by bootloader/fuses */
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  USB_Init();
+
+  /* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */
+  TCCR0B = (1 << CS02);
+}
+
+/** Event handler for the library USB Connection event. */
+void EVENT_USB_Device_Connect(void)
+{
+  led_on();
+}
+
+/** Event handler for the library USB Disconnection event. */
+void EVENT_USB_Device_Disconnect(void)
+{
+  led_off();
+}
+
+/** Event handler for the library USB Configuration Changed event. */
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+  led_toggle();
+  _delay_ms(10);
+  led_toggle();
+}
+
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)
+{
+  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
+}
+
+/** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer
+ *  for later transmission to the host.
+ */
+ISR(USART1_RX_vect, ISR_BLOCK)
+{
+  uint8_t ReceivedByte = UDR1;
+
+  if (USB_DeviceState == DEVICE_STATE_Configured)
+    RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);
+}
+
+/** Event handler for the CDC Class driver Line Encoding Changed event.
+ *
+ *  \param[in] CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced
+ */
+void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+  uint8_t ConfigMask = 0;
+
+  switch (CDCInterfaceInfo->State.LineEncoding.ParityType)
+  {
+    case CDC_PARITY_Odd:
+      ConfigMask = ((1 << UPM11) | (1 << UPM10));
+      break;
+    case CDC_PARITY_Even:
+      ConfigMask = (1 << UPM11);
+      break;
+  }
+
+  if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)
+    ConfigMask |= (1 << USBS1);
+
+  switch (CDCInterfaceInfo->State.LineEncoding.DataBits)
+  {
+    case 6:
+      ConfigMask |= (1 << UCSZ10);
+      break;
+    case 7:
+      ConfigMask |= (1 << UCSZ11);
+      break;
+    case 8:
+      ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
+      break;
+  }
+
+  /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
+  UCSR1B = 0;
+  UCSR1A = 0;
+  UCSR1C = 0;
+
+  /* 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;
+  UCSR1A = (1 << U2X1);
+  UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
+}
+