Update Atmel Studio blob - use sane method to extract the extension's bundled Getting...

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

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h
index c613c08..10f1c8c 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -43,14 +43,9 @@
                #include "EthernetProtocols.h"
                #include "Ethernet.h"
                #include "ProtocolDecoders.h"
                #include "EthernetProtocols.h"
                #include "Ethernet.h"
                #include "ProtocolDecoders.h"

+               #include "Config/AppConfig.h"

 
        /* Macros: */
 
        /* Macros: */

-               /** Protocol IP address of the host (client) machine, once assigned by DHCP. */
-               #define CLIENT_IP_ADDRESS                { 10,     0,    0,    1}
-
-               /** Protocol IP address of the virtual server machine. */
-               #define SERVER_IP_ADDRESS                { 10,     0,    0,    2}
-

                /** Protocol IP address of the broadcast address. */
                #define BROADCAST_IP_ADDRESS             {0xFF, 0xFF, 0xFF, 0xFF}
 
                /** Protocol IP address of the broadcast address. */
                #define BROADCAST_IP_ADDRESS             {0xFF, 0xFF, 0xFF, 0xFF}
 


@@ -64,7 +59,7 @@
                 *  \param[in] IP1  First IP address
                 *  \param[in] IP2  Second IP address
                 *
                 *  \param[in] IP1  First IP address
                 *  \param[in] IP2  Second IP address
                 *

-                *  \return True if the addresses match, false otherwise
+                *  \return True if the addresses match, \c false otherwise

                 */
                #define IP_COMPARE(IP1, IP2)             (memcmp(IP1, IP2, sizeof(IP_Address_t)) == 0)
 
                 */
                #define IP_COMPARE(IP1, IP2)             (memcmp(IP1, IP2, sizeof(IP_Address_t)) == 0)
 


@@ -72,21 +67,21 @@
                /** Type define of an IP packet header. */
                typedef struct
                {
                /** Type define of an IP packet header. */
                typedef struct
                {

-                       unsigned char  HeaderLength   : 4; /**< Total length of the packet header, in 4-byte blocks */
-                       unsigned char  Version        : 4; /**< IP protocol version */
-                       uint8_t        TypeOfService; /**< Special service type identifier, indicating delay/throughput/reliability levels */
-                       uint16_t       TotalLength; /**< Total length of the IP packet, in bytes */
+                       unsigned     HeaderLength   : 4; /**< Total length of the packet header, in 4-byte blocks */
+                       unsigned     Version        : 4; /**< IP protocol version */
+                       uint8_t      TypeOfService; /**< Special service type identifier, indicating delay/throughput/reliability levels */
+                       uint16_t     TotalLength; /**< Total length of the IP packet, in bytes */

 
 

-                       uint16_t       Identification; /**< Identification value for identifying fragmented packets */
-                       unsigned int   FragmentOffset : 13; /**< Offset of this IP fragment */
-                       unsigned int   Flags          : 3; /**< Fragment flags, to indicate if a packet is fragmented */
+                       uint16_t     Identification; /**< Identification value for identifying fragmented packets */
+                       unsigned     FragmentOffset : 13; /**< Offset of this IP fragment */
+                       unsigned     Flags          : 3; /**< Fragment flags, to indicate if a packet is fragmented */

 
 

-                       uint8_t        TTL; /**< Maximum allowable number of hops to reach the packet destination */
-                       uint8_t        Protocol; /**< Encapsulated protocol type */
-                       uint16_t       HeaderChecksum; /**< Ethernet checksum of the IP header */
+                       uint8_t      TTL; /**< Maximum allowable number of hops to reach the packet destination */
+                       uint8_t      Protocol; /**< Encapsulated protocol type */
+                       uint16_t     HeaderChecksum; /**< Ethernet checksum of the IP header */

 
 

-                       IP_Address_t  SourceAddress; /**< Source protocol IP address of the packet */
-                       IP_Address_t  DestinationAddress; /**< Destination protocol IP address of the packet */
+                       IP_Address_t SourceAddress; /**< Source protocol IP address of the packet */
+                       IP_Address_t DestinationAddress; /**< Destination protocol IP address of the packet */

                } IP_Header_t;
 
        /* Function Prototypes: */
                } IP_Header_t;
 
        /* Function Prototypes: */