Fix flip-ee DFU build target accidentally erasing the target FLASH memory space.

[pub/USBasp.git] / Demos / Device / LowLevel / RNDISEthernet / Lib / Ethernet.h

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.h
index 52d120d..45ba0cf 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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


@@ -40,6 +40,8 @@
                #include <avr/io.h>
                #include <string.h>
 
                #include <avr/io.h>
                #include <string.h>
 

+               #include "Config/AppConfig.h"
+

                #include "EthernetProtocols.h"
                #include "ProtocolDecoders.h"
                #include "ICMP.h"
                #include "EthernetProtocols.h"
                #include "ProtocolDecoders.h"
                #include "ICMP.h"


@@ -50,12 +52,6 @@
                #include "IP.h"
 
        /* Macros: */
                #include "IP.h"
 
        /* Macros: */

-               /** Physical MAC address of the USB RNDIS network adapter. */
-               #define ADAPTER_MAC_ADDRESS              {0x02, 0x00, 0x02, 0x00, 0x02, 0x00}
-
-               /** Physical MAC address of the virtual server on the network. */
-               #define SERVER_MAC_ADDRESS               {0x00, 0x01, 0x00, 0x01, 0x00, 0x01}
-

                /** Physical MAC address of the network broadcast address. */
                #define BROADCAST_MAC_ADDRESS            {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}
 
                /** Physical MAC address of the network broadcast address. */
                #define BROADCAST_MAC_ADDRESS            {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}
 


@@ -81,6 +77,13 @@
                #define NO_PROCESS                       -1
 
        /* Type Defines: */
                #define NO_PROCESS                       -1
 
        /* Type Defines: */

+               /** Type define for an Ethernet frame buffer data and information structure. */
+               typedef struct
+               {
+                       uint8_t  FrameData[ETHERNET_FRAME_SIZE_MAX]; /**< Ethernet frame contents. */
+                       uint16_t FrameLength; /**< Length in bytes of the Ethernet frame stored in the buffer. */
+               } Ethernet_Frame_Info_t;
+

                /** Type define for an Ethernet frame header. */
                typedef struct
                {
                /** Type define for an Ethernet frame header. */
                typedef struct
                {