Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
index 6e87983..0072204 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

   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 2011  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.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -32,14 +32,14 @@
  *
  *  Header file for Ethernet.c.
  */
  *
  *  Header file for Ethernet.c.
  */

- 
+

 #ifndef _ETHERNET_H_
 #define _ETHERNET_H_
 
        /* Includes: */
                #include <avr/io.h>
                #include <string.h>
 #ifndef _ETHERNET_H_
 #define _ETHERNET_H_
 
        /* Includes: */
                #include <avr/io.h>
                #include <string.h>

-               
+

                #include <LUFA/Drivers/USB/Class/RNDIS.h>
 
                #include "EthernetProtocols.h"
                #include <LUFA/Drivers/USB/Class/RNDIS.h>
 
                #include "EthernetProtocols.h"


@@ -50,31 +50,31 @@
                #include "DHCP.h"
                #include "ARP.h"
                #include "IP.h"
                #include "DHCP.h"
                #include "ARP.h"
                #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. */
        /* 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}           
+               #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}

-       
+

                /** Performs a comparison between two MAC addresses, indicating if they are identical.
                /** Performs a comparison between two MAC addresses, indicating if they are identical.

-                *  
+                *

                 *  \param[in] MAC1  First MAC address
                 *  \param[in] MAC2  Second MAC address
                 *
                 *  \return True if the addresses match, false otherwise
                 */
                #define MAC_COMPARE(MAC1, MAC2)          (memcmp(MAC1, MAC2, sizeof(MAC_Address_t)) == 0)
                 *  \param[in] MAC1  First MAC address
                 *  \param[in] MAC2  Second MAC address
                 *
                 *  \return True if the addresses match, false otherwise
                 */
                #define MAC_COMPARE(MAC1, MAC2)          (memcmp(MAC1, MAC2, sizeof(MAC_Address_t)) == 0)

-               
+

                /** Minimum size of an Ethernet packet in bytes, to conform to the Ethernet V2 packet standard. */
                #define ETHERNET_VER2_MINSIZE            0x0600
 
                /** Return value for all sub protocol handling routines, indicating that no response packet has been generated. */
                /** Minimum size of an Ethernet packet in bytes, to conform to the Ethernet V2 packet standard. */
                #define ETHERNET_VER2_MINSIZE            0x0600
 
                /** Return value for all sub protocol handling routines, indicating that no response packet has been generated. */

-               #define NO_RESPONSE                      0              
+               #define NO_RESPONSE                      0

 
                /** Return value for all sub protocol handling routines, indicating that the packet has not yet been handled. */
                #define NO_PROCESS                       -1
 
                /** Return value for all sub protocol handling routines, indicating that the packet has not yet been handled. */
                #define NO_PROCESS                       -1


@@ -85,23 +85,21 @@
                {
                        MAC_Address_t Destination; /**< Physical MAC address of the packet recipient */
                        MAC_Address_t Source; /**< Physics MAC address of the packet source */
                {
                        MAC_Address_t Destination; /**< Physical MAC address of the packet recipient */
                        MAC_Address_t Source; /**< Physics MAC address of the packet source */

-                       
-                       union
-                       {
-                               uint16_t  EtherType; /**< Ethernet packet sub-protocol type, for Ethernet V2 packets */
-                               uint16_t  Length; /**< Ethernet frame length, for Ethernet V1 packets */
-                       };
+                       uint16_t      EtherType; /**< Ethernet packet sub-protocol type, for Ethernet V2 packets */

                } Ethernet_Frame_Header_t;
                } Ethernet_Frame_Header_t;

-               
+

        /* External Variables: */
                extern const MAC_Address_t ServerMACAddress;
                extern const IP_Address_t  ServerIPAddress;
                extern const MAC_Address_t BroadcastMACAddress;
                extern const IP_Address_t  BroadcastIPAddress;
                extern const IP_Address_t  ClientIPAddress;
        /* External Variables: */
                extern const MAC_Address_t ServerMACAddress;
                extern const IP_Address_t  ServerIPAddress;
                extern const MAC_Address_t BroadcastMACAddress;
                extern const IP_Address_t  BroadcastIPAddress;
                extern const IP_Address_t  ClientIPAddress;

-               
+

        /* Function Prototypes: */
        /* Function Prototypes: */

-               void     Ethernet_ProcessPacket(Ethernet_Frame_Info_t* FrameIN, Ethernet_Frame_Info_t* FrameOUT);
-               uint16_t Ethernet_Checksum16(void* Data, uint16_t Bytes);
-               
+               void     Ethernet_ProcessPacket(Ethernet_Frame_Info_t* const FrameIN,
+                                               Ethernet_Frame_Info_t* const FrameOUT);
+               uint16_t Ethernet_Checksum16(void* Data,
+                                            uint16_t Bytes);
+

 #endif
 #endif

+