Remove obsolete macros and preprocessor checks from the AVRISP-MKII project's V2Proto...

[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 d5e091c..233f48d 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
@@ -52,13 +52,13 @@
                #include "IP.h"
                
        /* Macros: */
                #include "IP.h"
                
        /* Macros: */

-               /** Physical MAC address of the USB RNDIS network adapter */
+               /** Physical MAC address of the USB RNDIS network adapter. */

                #define ADAPTER_MAC_ADDRESS              {0x02, 0x00, 0x02, 0x00, 0x02, 0x00}
 
                #define ADAPTER_MAC_ADDRESS              {0x02, 0x00, 0x02, 0x00, 0x02, 0x00}
 

-               /** Physical MAC address of the virtual server on the network */
+               /** 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 */
+               /** 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.
                #define BROADCAST_MAC_ADDRESS            {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}
        
                /** Performs a comparison between two MAC addresses, indicating if they are identical.


@@ -70,27 +70,22 @@
                 */
                #define MAC_COMPARE(MAC1, MAC2)          (memcmp(MAC1, MAC2, sizeof(MAC_Address_t)) == 0)
                
                 */
                #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 */
+               /** Minimum size of an Ethernet packet in bytes, to conform to the Ethernet V2 packet standard. */

                #define ETHERNET_VER2_MINSIZE            0x0600
 
                #define ETHERNET_VER2_MINSIZE            0x0600
 

-               /** Return value for all sub protocol handling routines, indicating that no response packet has been generated */
+               /** 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 */
+               /** Return value for all sub protocol handling routines, indicating that the packet has not yet been handled. */

                #define NO_PROCESS                       -1
 
        /* Type Defines: */
                #define NO_PROCESS                       -1
 
        /* Type Defines: */

-               /** Type define for an Ethernet frame header */
+               /** Type define for an Ethernet frame header. */

                typedef struct
                {
                        MAC_Address_t Destination; /**< Physical MAC address of the packet recipient */
                        MAC_Address_t Source; /**< Physics MAC address of the packet source */
                typedef struct
                {
                        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;
                
        /* External Variables: */
                } Ethernet_Frame_Header_t;
                
        /* External Variables: */


@@ -101,7 +96,9 @@
                extern const IP_Address_t  ClientIPAddress;
                
        /* Function Prototypes: */
                extern const IP_Address_t  ClientIPAddress;
                
        /* 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