Fix up the incomplete Webserver project so that it integrates with the uIP stack...

[pub/USBasp.git] / Demos / Device / ClassDriver / RNDISEthernet / Lib / ProtocolDecoders.c

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
index aac72ae..37cb840 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -51,17 +51,17 @@
 \r
 /** Decodes an Ethernet frame header and prints its contents to through the USART in a human readable format.\r
  *\r
 \r
 /** Decodes an Ethernet frame header and prints its contents to through the USART in a human readable format.\r
  *\r

- *  \param[in] InDataStart  Pointer to the start of an Ethernet frame header\r
+ *  \param[in] FrameINData  Pointer to the start of an Ethernet frame information structure\r

  */\r
  */\r

-void DecodeEthernetFrameHeader(void* InDataStart)\r
+void DecodeEthernetFrameHeader(Ethernet_Frame_Info_t* FrameINData)\r

 {\r
        #if !defined(NO_DECODE_ETHERNET)\r
 {\r
        #if !defined(NO_DECODE_ETHERNET)\r

-       Ethernet_Frame_Header_t* FrameHeader = (Ethernet_Frame_Header_t*)InDataStart;\r
+       Ethernet_Frame_Header_t* FrameHeader = (Ethernet_Frame_Header_t*)FrameINData->FrameData;\r

        \r
        printf_P(PSTR("\r\n"));\r
        \r
        printf_P(PSTR("  ETHERNET\r\n"));\r
        \r
        printf_P(PSTR("\r\n"));\r
        \r
        printf_P(PSTR("  ETHERNET\r\n"));\r

-       printf_P(PSTR("  + Frame Size: %u\r\n"), FrameIN.FrameLength);\r
+       printf_P(PSTR("  + Frame Size: %u\r\n"), FrameINData->FrameLength);\r

 \r
        if (!(MAC_COMPARE(&FrameHeader->Destination, &ServerMACAddress)) &&\r
            !(MAC_COMPARE(&FrameHeader->Destination, &BroadcastMACAddress)))\r
 \r
        if (!(MAC_COMPARE(&FrameHeader->Destination, &ServerMACAddress)) &&\r
            !(MAC_COMPARE(&FrameHeader->Destination, &BroadcastMACAddress)))\r


@@ -84,7 +84,7 @@ void DecodeEthernetFrameHeader(void* InDataStart)
                                                                             FrameHeader->Destination.Octets[4],\r
                                                                             FrameHeader->Destination.Octets[5]);\r
 \r
                                                                             FrameHeader->Destination.Octets[4],\r
                                                                             FrameHeader->Destination.Octets[5]);\r
 \r

-       if (SwapEndian_16(FrameIN.FrameLength) > ETHERNET_VER2_MINSIZE)\r
+       if (SwapEndian_16(FrameINData->FrameLength) > ETHERNET_VER2_MINSIZE)\r

          printf_P(PSTR("  + Protocol: 0x%04x\r\n"), SwapEndian_16(FrameHeader->EtherType));\r
        else\r
          printf_P(PSTR("  + Protocol: UNKNOWN E1\r\n"));\r
          printf_P(PSTR("  + Protocol: 0x%04x\r\n"), SwapEndian_16(FrameHeader->EtherType));\r
        else\r
          printf_P(PSTR("  + Protocol: UNKNOWN E1\r\n"));\r