Fixed incorrect USB device state set when a suspended LUFA device is woken while...

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

diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c
index 3b3a398..a89e6ca 100644 (file)
--- a/Projects/Benito/Benito.c
+++ b/Projects/Benito/Benito.c
@@ -1,24 +1,24 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

   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 2013  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.
 
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims 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
   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


@@ -37,7 +37,10 @@
 #include "Benito.h"
 
 /** Circular buffer to hold data from the serial port before it is sent to the host. */
 #include "Benito.h"
 
 /** Circular buffer to hold data from the serial port before it is sent to the host. */

-RingBuff_t Tx_Buffer;
+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];

 
 /** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
 volatile struct
 
 /** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
 volatile struct


@@ -48,8 +51,8 @@ volatile struct
        uint8_t PingPongLEDPulse; /**< Milliseconds remaining for enumeration Tx/Rx ping-pong LED pulse */
 } PulseMSRemaining;
 
        uint8_t PingPongLEDPulse; /**< Milliseconds remaining for enumeration Tx/Rx ping-pong LED pulse */
 } PulseMSRemaining;
 

-/** Previous state of the virtual DTR control line from the host */
-bool PreviousDTRState = false;
+/** Milliseconds remaining until the receive buffer is flushed to the USB host */
+uint8_t FlushPeriodRemaining = RECEIVE_BUFFER_FLUSH_MS;

 
 /** 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


@@ -57,21 +60,27 @@ bool PreviousDTRState = false;
  */
 USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
        {
  */
 USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
        {

-               .Config = 
+               .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,
+                               .ControlInterfaceNumber   = 0,
+                               .DataINEndpoint           =
+                                       {
+                                               .Address          = CDC_TX_EPADDR,
+                                               .Size             = CDC_TXRX_EPSIZE,
+                                               .Banks            = 1,
+                                       },
+                               .DataOUTEndpoint =
+                                       {
+                                               .Address          = CDC_RX_EPADDR,
+                                               .Size             = CDC_TXRX_EPSIZE,
+                                               .Banks            = 1,
+                                       },
+                               .NotificationEndpoint =
+                                       {
+                                               .Address          = CDC_NOTIFICATION_EPADDR,
+                                               .Size             = CDC_NOTIFICATION_EPSIZE,
+                                               .Banks            = 1,
+                                       },

                        },
        };
 
                        },
        };
 


@@ -81,48 +90,42 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
 int main(void)
 {
        SetupHardware();
 int main(void)
 {
        SetupHardware();

-       
-       RingBuffer_InitBuffer(&Tx_Buffer);
-       
-       sei();
+
+       RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));
+
+       GlobalInterruptEnable();

 
        for (;;)
        {
                /* Echo bytes from the host to the target via the hardware USART */
 
        for (;;)
        {
                /* Echo bytes from the host to the target via the hardware USART */

-               while (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface) > 0)
+               if ((UCSR1A & (1 << UDRE1)) && CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))

                {
                {

-                       Serial_TxByte(CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
+                       UDR1 = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);

 
                        LEDs_TurnOnLEDs(LEDMASK_TX);
 
                        LEDs_TurnOnLEDs(LEDMASK_TX);

-                       PulseMSRemaining.TxLEDPulse = TX_RX_LED_PULSE_MS;                       
+                       PulseMSRemaining.TxLEDPulse = TX_RX_LED_PULSE_MS;

                }
                }

-               
-               /* Echo bytes from the target to the host via the virtual serial port */
-               while (Tx_Buffer.Count)
-               {
-                       CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&Tx_Buffer));

 
 

-                       LEDs_TurnOnLEDs(LEDMASK_RX);
-                       PulseMSRemaining.RxLEDPulse = TX_RX_LED_PULSE_MS;
-               }
-               

                /* Check if the millisecond timer has elapsed */
                if (TIFR0 & (1 << OCF0A))
                {
                /* Check if the millisecond timer has elapsed */
                if (TIFR0 & (1 << OCF0A))
                {

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

                        /* Check if the reset pulse period has elapsed, if so tristate the target reset line */
                        if (PulseMSRemaining.ResetPulse && !(--PulseMSRemaining.ResetPulse))
                        {
                                LEDs_TurnOffLEDs(LEDMASK_BUSY);
                                AVR_RESET_LINE_DDR &= ~AVR_RESET_LINE_MASK;
                        }
                        /* Check if the reset pulse period has elapsed, if so tristate the target reset line */
                        if (PulseMSRemaining.ResetPulse && !(--PulseMSRemaining.ResetPulse))
                        {
                                LEDs_TurnOffLEDs(LEDMASK_BUSY);
                                AVR_RESET_LINE_DDR &= ~AVR_RESET_LINE_MASK;
                        }

-                       
+

                        /* Check if the LEDs should be ping-ponging (during enumeration) */
                        if (PulseMSRemaining.PingPongLEDPulse && !(--PulseMSRemaining.PingPongLEDPulse))
                        {
                                LEDs_ToggleLEDs(LEDMASK_TX | LEDMASK_RX);
                                PulseMSRemaining.PingPongLEDPulse = PING_PONG_LED_PULSE_MS;
                        }
                        /* Check if the LEDs should be ping-ponging (during enumeration) */
                        if (PulseMSRemaining.PingPongLEDPulse && !(--PulseMSRemaining.PingPongLEDPulse))
                        {
                                LEDs_ToggleLEDs(LEDMASK_TX | LEDMASK_RX);
                                PulseMSRemaining.PingPongLEDPulse = PING_PONG_LED_PULSE_MS;
                        }

-               
+

                        /* Turn off TX LED(s) once the TX pulse period has elapsed */
                        if (PulseMSRemaining.TxLEDPulse && !(--PulseMSRemaining.TxLEDPulse))
                          LEDs_TurnOffLEDs(LEDMASK_TX);
                        /* Turn off TX LED(s) once the TX pulse period has elapsed */
                        if (PulseMSRemaining.TxLEDPulse && !(--PulseMSRemaining.TxLEDPulse))
                          LEDs_TurnOffLEDs(LEDMASK_TX);


@@ -131,10 +134,35 @@ int main(void)
                        if (PulseMSRemaining.RxLEDPulse && !(--PulseMSRemaining.RxLEDPulse))
                          LEDs_TurnOffLEDs(LEDMASK_RX);
 
                        if (PulseMSRemaining.RxLEDPulse && !(--PulseMSRemaining.RxLEDPulse))
                          LEDs_TurnOffLEDs(LEDMASK_RX);
 

-                       /* Clear the millisecond timer CTC flag (cleared by writing logic one to the register) */
-                       TIFR0 |= (1 << OCF0A);          
+                       /* Check if the receive buffer flush period has expired */
+                       uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
+                       if (!(--FlushPeriodRemaining) || (BufferCount > 200))
+                       {
+                               FlushPeriodRemaining = RECEIVE_BUFFER_FLUSH_MS;
+
+                               /* Start RX LED indicator pulse */
+                               if (BufferCount)
+                               {
+                                       LEDs_TurnOnLEDs(LEDMASK_RX);
+                                       PulseMSRemaining.RxLEDPulse = TX_RX_LED_PULSE_MS;
+                               }
+
+                               /* Echo bytes from the target to the host via the virtual serial port */
+                               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);
+                               }
+                       }

                }
                }

-               
+

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


@@ -143,12 +171,16 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {

+#if (ARCH == ARCH_AVR8)

        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 

+       /* Disable clock division */
+       clock_prescale_set(clock_div_1);
+#endif
+

        /* Hardware Initialization */
        /* Hardware Initialization */

-       Serial_Init(9600, false);

        LEDs_Init();
        USB_Init();
 
        LEDs_Init();
        USB_Init();
 


@@ -156,7 +188,7 @@ void SetupHardware(void)
        OCR0A  = (F_CPU / 64 / 1000);
        TCCR0A = (1 << WGM01);
        TCCR0B = ((1 << CS01) | (1 << CS00));
        OCR0A  = (F_CPU / 64 / 1000);
        TCCR0A = (1 << WGM01);
        TCCR0B = ((1 << CS01) | (1 << CS00));

-       
+

        /* Tristate target /RESET Line */
        AVR_RESET_LINE_PORT &= ~AVR_RESET_LINE_MASK;
        AVR_RESET_LINE_DDR  &= ~AVR_RESET_LINE_MASK;
        /* Tristate target /RESET Line */
        AVR_RESET_LINE_PORT &= ~AVR_RESET_LINE_MASK;
        AVR_RESET_LINE_DDR  &= ~AVR_RESET_LINE_MASK;


@@ -179,15 +211,20 @@ 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)
 {

+       bool ConfigSuccess = true;
+
+       ConfigSuccess &= CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+

        PulseMSRemaining.PingPongLEDPulse = 0;
        PulseMSRemaining.PingPongLEDPulse = 0;

-       LEDs_SetAllLEDs(LEDS_NO_LEDS);

 
 

-       if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface)))
-         LEDs_SetAllLEDs(LEDMASK_ERROR);
+       LEDs_SetAllLEDs(ConfigSuccess ? LEDS_NO_LEDS : LEDMASK_ERROR);

 }
 
 }
 

-/** Event handler for the library USB Unhandled Control Request event. */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+/** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to
+ *  the device from the USB host before passing along unhandled control requests to the library for processing
+ *  internally.
+ */
+void EVENT_USB_Device_ControlRequest(void)

 {
        CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
 }
 {
        CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
 }


@@ -203,10 +240,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;
        }
 


@@ -225,11 +262,19 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI
                        ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
                        break;
        }
                        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));
        UCSR1A = (1 << U2X1);
        UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));

-       UCSR1C = ConfigMask;    
-       UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);

 }
 
 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer
 }
 
 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer


@@ -240,7 +285,7 @@ ISR(USART1_RX_vect, ISR_BLOCK)
        uint8_t ReceivedByte = UDR1;
 
        if (USB_DeviceState == DEVICE_STATE_Configured)
        uint8_t ReceivedByte = UDR1;
 
        if (USB_DeviceState == DEVICE_STATE_Configured)

-         RingBuffer_Insert(&Tx_Buffer, ReceivedByte);
+         RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);

 }
 
 /** Event handler for the CDC Class driver Host-to-Device Line Encoding Changed event.
 }
 
 /** Event handler for the CDC Class driver Host-to-Device Line Encoding Changed event.


@@ -249,16 +294,18 @@ ISR(USART1_RX_vect, ISR_BLOCK)
  */
 void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {
  */
 void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {

-       bool CurrentDTRState = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR);
+       static bool PreviousDTRState = false;
+       bool        CurrentDTRState  = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR);

 
        /* Check if the DTR line has been asserted - if so, start the target AVR's reset pulse */
        if (!(PreviousDTRState) && CurrentDTRState)
        {
                LEDs_SetAllLEDs(LEDMASK_BUSY);
 
        /* Check if the DTR line has been asserted - if so, start the target AVR's reset pulse */
        if (!(PreviousDTRState) && CurrentDTRState)
        {
                LEDs_SetAllLEDs(LEDMASK_BUSY);

-       
+

                AVR_RESET_LINE_DDR |= AVR_RESET_LINE_MASK;
                PulseMSRemaining.ResetPulse = AVR_RESET_PULSE_MS;
        }
                AVR_RESET_LINE_DDR |= AVR_RESET_LINE_MASK;
                PulseMSRemaining.ResetPulse = AVR_RESET_PULSE_MS;
        }

-       
+

        PreviousDTRState = CurrentDTRState;
 }
        PreviousDTRState = CurrentDTRState;
 }

+