Move Dataflash operational checking code out from SCSI.c into the DataflashManager...

[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..c6cd52a 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
@@ -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