Fix accidental struct copies on the stack in the old RNDISEthernet demo TCP code.

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

diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c
index 26b5ad2..d68cee3 100644 (file)
--- a/Projects/Benito/Benito.c
+++ b/Projects/Benito/Benito.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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

-  Copyright 2011  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,10 +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. */

-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];

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


@@ -51,9 +51,6 @@ 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;
 
 /** Milliseconds remaining until the receive buffer is flushed to the USB host */
 uint8_t FlushPeriodRemaining = RECEIVE_BUFFER_FLUSH_MS;
 


@@ -65,19 +62,25 @@ 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,
+                                       },

                        },
        };
 
                        },
        };
 


@@ -153,7 +156,7 @@ int main(void)
                                        {
                                                break;
                                        }
                                        {
                                                break;
                                        }

-                                       
+

                                        /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */
                                        RingBuffer_Remove(&USARTtoUSB_Buffer);
                                }
                                        /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */
                                        RingBuffer_Remove(&USARTtoUSB_Buffer);
                                }


@@ -286,7 +289,8 @@ 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)
 
        /* Check if the DTR line has been asserted - if so, start the target AVR's reset pulse */
        if (!(PreviousDTRState) && CurrentDTRState)