Commit for the 091122 release.

[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 b300252..3a41fa4 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
@@ -40,7 +40,7 @@
                #include <avr/io.h>\r
                #include <string.h>\r
                \r
                #include <avr/io.h>\r
                #include <string.h>\r
                \r

-               #include <LUFA/Drivers/USB/Class/Device/RNDIS.h>\r
+               #include <LUFA/Drivers/USB/Class/RNDIS.h>\r

 \r
                #include "EthernetProtocols.h"\r
                #include "ProtocolDecoders.h"\r
 \r
                #include "EthernetProtocols.h"\r
                #include "ProtocolDecoders.h"\r


@@ -53,7 +53,7 @@
                \r
        /* Macros: */\r
                /** Physical MAC address of the USB RNDIS network adapter */\r
                \r
        /* Macros: */\r
                /** Physical MAC address of the USB RNDIS network adapter */\r

-               #define ADAPTER_MAC_ADDRESS              {0x00, 0x02, 0x00, 0x02, 0x00, 0x02}           \r
+               #define ADAPTER_MAC_ADDRESS              {0x02, 0x00, 0x02, 0x00, 0x02, 0x00}\r

 \r
                /** Physical MAC address of the virtual server on the network */\r
                #define SERVER_MAC_ADDRESS               {0x00, 0x01, 0x00, 0x01, 0x00, 0x01}           \r
 \r
                /** Physical MAC address of the virtual server on the network */\r
                #define SERVER_MAC_ADDRESS               {0x00, 0x01, 0x00, 0x01, 0x00, 0x01}           \r


@@ -63,13 +63,16 @@
        \r
                /** Performs a comparison between two MAC addresses, indicating if they are identical.\r
                 *  \r
        \r
                /** Performs a comparison between two MAC addresses, indicating if they are identical.\r
                 *  \r

-                *  \param MAC1  First MAC address\r
-                *  \param MAC2  Second MAC address\r
+                *  \param[in] MAC1  First MAC address\r
+                *  \param[in] MAC2  Second MAC address\r

                 *\r
                 *  \return True if the addresses match, false otherwise\r
                 */\r
                #define MAC_COMPARE(MAC1, MAC2)          (memcmp(MAC1, MAC2, sizeof(MAC_Address_t)) == 0)\r
                \r
                 *\r
                 *  \return True if the addresses match, false otherwise\r
                 */\r
                #define MAC_COMPARE(MAC1, MAC2)          (memcmp(MAC1, MAC2, sizeof(MAC_Address_t)) == 0)\r
                \r

+               /** Minimum size of an Ethernet packet in bytes, to conform to the Ethernet V2 packet standard */\r
+               #define ETHERNET_VER2_MINSIZE            0x0600\r
+\r

                /** Return value for all sub protocol handling routines, indicating that no response packet has been generated */\r
                #define NO_RESPONSE                      0              \r
 \r
                /** Return value for all sub protocol handling routines, indicating that no response packet has been generated */\r
                #define NO_RESPONSE                      0              \r
 \r


@@ -85,7 +88,7 @@
                        \r
                        union\r
                        {\r
                        \r
                        union\r
                        {\r

-                               uint16_t  EtherType; /**< Ethernet packet subprotocol type, for Ethernet V2 packets */\r
+                               uint16_t  EtherType; /**< Ethernet packet sub-protocol type, for Ethernet V2 packets */\r

                                uint16_t  Length; /**< Ethernet frame length, for Ethernet V1 packets */\r
                        };\r
                } Ethernet_Frame_Header_t;\r
                                uint16_t  Length; /**< Ethernet frame length, for Ethernet V1 packets */\r
                        };\r
                } Ethernet_Frame_Header_t;\r