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

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

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.h
index 8de76f3..af3951c 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.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,18 +32,20 @@
  *
  *  Header file for ARP.c.
  */
  *
  *  Header file for ARP.c.
  */

- 
+

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

-               
+
+               #include <LUFA/Drivers/USB/USB.h>
+

                #include "EthernetProtocols.h"
                #include "Ethernet.h"
                #include "ProtocolDecoders.h"
                #include "EthernetProtocols.h"
                #include "Ethernet.h"
                #include "ProtocolDecoders.h"

-               
+

        /* Macros: */
                /** ARP header operation constant, indicating a request from a host for an address translation. */
                #define ARP_OPERATION_REQUEST            1
        /* Macros: */
                /** ARP header operation constant, indicating a request from a host for an address translation. */
                #define ARP_OPERATION_REQUEST            1


@@ -57,19 +59,20 @@
                {
                        uint16_t      HardwareType; /**< Hardware type constant, indicating the hardware used */
                        uint16_t      ProtocolType; /**< Protocol being resolved, usually ETHERTYPE_IPV4 */
                {
                        uint16_t      HardwareType; /**< Hardware type constant, indicating the hardware used */
                        uint16_t      ProtocolType; /**< Protocol being resolved, usually ETHERTYPE_IPV4 */

-                       
+

                        uint8_t       HLEN; /**< Length in bytes of the source/destination hardware addresses */
                        uint8_t       PLEN; /**< Length in bytes of the source/destination protocol addresses */
                        uint16_t      Operation; /**< Type of operation, either ARP_OPERATION_REQUEST or ARP_OPERATION_REPLY */
                        uint8_t       HLEN; /**< Length in bytes of the source/destination hardware addresses */
                        uint8_t       PLEN; /**< Length in bytes of the source/destination protocol addresses */
                        uint16_t      Operation; /**< Type of operation, either ARP_OPERATION_REQUEST or ARP_OPERATION_REPLY */

-                       
+

                        MAC_Address_t SHA; /**< Sender's hardware address */
                        IP_Address_t  SPA; /**< Sender's protocol address */
                        MAC_Address_t THA; /**< Target's hardware address */
                        IP_Address_t  TPA; /**< Target's protocol address */
                } ARP_Header_t;
                        MAC_Address_t SHA; /**< Sender's hardware address */
                        IP_Address_t  SPA; /**< Sender's protocol address */
                        MAC_Address_t THA; /**< Target's hardware address */
                        IP_Address_t  TPA; /**< Target's protocol address */
                } ARP_Header_t;

-               
+

        /* Function Prototypes: */
                int16_t ARP_ProcessARPPacket(void* InDataStart,
                                             void* OutDataStart);
 
 #endif
        /* Function Prototypes: */
                int16_t ARP_ProcessARPPacket(void* InDataStart,
                                             void* OutDataStart);
 
 #endif

+