X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5a4def747897c1c6ffbe465506d846c7c686d3e9..40e1caa2da06d6d4699d5dc3dafb3d34b81f23f7:/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c?ds=sidebyside

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
index 99e3ab46b..57e71cb77 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2015.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2015  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
@@ -18,7 +18,7 @@
   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
@@ -51,17 +51,16 @@
 
 /** Decodes an Ethernet frame header and prints its contents to through the USART in a human readable format.
  *
- *  \param[in] FrameINData  Pointer to the start of an Ethernet frame information structure
+ *  \param[in] InDataStart  Pointer to the start of an Ethernet frame of data
  */
-void DecodeEthernetFrameHeader(Ethernet_Frame_Info_t* const FrameINData)
+void DecodeEthernetFrameHeader(void* InDataStart)
 {
 	#if !defined(NO_DECODE_ETHERNET)
-	Ethernet_Frame_Header_t* FrameHeader = (Ethernet_Frame_Header_t*)FrameINData->FrameData;
+	Ethernet_Frame_Header_t* FrameHeader = (Ethernet_Frame_Header_t*)InDataStart;
 
 	printf_P(PSTR("\r\n"));
 
 	printf_P(PSTR("  ETHERNET\r\n"));
-	printf_P(PSTR("  + Frame Size: %u\r\n"), FrameINData->FrameLength);
 
 	if (!(MAC_COMPARE(&FrameHeader->Destination, &ServerMACAddress)) &&
 	    !(MAC_COMPARE(&FrameHeader->Destination, &BroadcastMACAddress)))
@@ -84,10 +83,7 @@ void DecodeEthernetFrameHeader(Ethernet_Frame_Info_t* const FrameINData)
 	                                                                     FrameHeader->Destination.Octets[4],
 	                                                                     FrameHeader->Destination.Octets[5]);
 
-	if (SwapEndian_16(FrameINData->FrameLength) > ETHERNET_VER2_MINSIZE)
-	  printf_P(PSTR("  + Protocol: 0x%04x\r\n"), SwapEndian_16(FrameHeader->EtherType));
-	else
-	  printf_P(PSTR("  + Protocol: UNKNOWN E1\r\n"));
+	printf_P(PSTR("  + Protocol: 0x%04x\r\n"), SwapEndian_16(FrameHeader->EtherType));
 	#endif
 }