Commit of new class abstraction APIs for all device demos other than the MIDI demo...

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

diff --git a/Demos/Device/RNDISEthernet/Lib/TCP.c b/Demos/Device/RNDISEthernet/Lib/TCP.c
index f259aad..1ebd154 100644 (file)
--- a/Demos/Device/RNDISEthernet/Lib/TCP.c
+++ b/Demos/Device/RNDISEthernet/Lib/TCP.c
@@ -56,7 +56,7 @@ TCP_ConnectionState_t  ConnectionStateTable[MAX_TCP_CONNECTIONS];
  *  level. If an application produces a response, this task constructs the appropriate Ethernet frame and places it into the Ethernet OUT\r
  *  buffer for later transmission.\r
  */\r
  *  level. If an application produces a response, this task constructs the appropriate Ethernet frame and places it into the Ethernet OUT\r
  *  buffer for later transmission.\r
  */\r

-TASK(TCP_Task)\r
+void TCP_TCPTask(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo)\r

 {\r
        /* Task to hand off TCP packets to and from the listening applications. */\r
 \r
 {\r
        /* Task to hand off TCP packets to and from the listening applications. */\r
 \r


@@ -76,7 +76,7 @@ TASK(TCP_Task)
        }\r
        \r
        /* Bail out early if there is already a frame waiting to be sent in the Ethernet OUT buffer */\r
        }\r
        \r
        /* Bail out early if there is already a frame waiting to be sent in the Ethernet OUT buffer */\r

-       if (FrameOUT.FrameInBuffer)\r
+       if (RNDISInterfaceInfo->FrameOUT.FrameInBuffer)\r

          return;\r
        \r
        /* Send response packets from each application as the TCP packet buffers are filled by the applications */\r
          return;\r
        \r
        /* Send response packets from each application as the TCP packet buffers are filled by the applications */\r


@@ -86,13 +86,13 @@ TASK(TCP_Task)
                if ((ConnectionStateTable[CSTableEntry].Info.Buffer.Direction == TCP_PACKETDIR_OUT) &&\r
                    (ConnectionStateTable[CSTableEntry].Info.Buffer.Ready))\r
                {\r
                if ((ConnectionStateTable[CSTableEntry].Info.Buffer.Direction == TCP_PACKETDIR_OUT) &&\r
                    (ConnectionStateTable[CSTableEntry].Info.Buffer.Ready))\r
                {\r

-                       Ethernet_Frame_Header_t* FrameOUTHeader = (Ethernet_Frame_Header_t*)&FrameOUT.FrameData;\r
-                       IP_Header_t*             IPHeaderOUT    = (IP_Header_t*)&FrameOUT.FrameData[sizeof(Ethernet_Frame_Header_t)];\r
-                       TCP_Header_t*            TCPHeaderOUT   = (TCP_Header_t*)&FrameOUT.FrameData[sizeof(Ethernet_Frame_Header_t) +\r
-                                                                                                    sizeof(IP_Header_t)];                                              \r
-                       void*                    TCPDataOUT     = &FrameOUT.FrameData[sizeof(Ethernet_Frame_Header_t) +\r
-                                                                                     sizeof(IP_Header_t) +\r
-                                                                                     sizeof(TCP_Header_t)];\r
+                       Ethernet_Frame_Header_t* FrameOUTHeader = (Ethernet_Frame_Header_t*)&RNDISInterfaceInfo->FrameOUT.FrameData;\r
+                       IP_Header_t*    IPHeaderOUT  = (IP_Header_t*)&RNDISInterfaceInfo->FrameOUT.FrameData[sizeof(Ethernet_Frame_Header_t)];\r
+                       TCP_Header_t*   TCPHeaderOUT = (TCP_Header_t*)&RNDISInterfaceInfo->FrameOUT.FrameData[sizeof(Ethernet_Frame_Header_t) +\r
+                                                                                                             sizeof(IP_Header_t)];                                             \r
+                       void*           TCPDataOUT     = &RNDISInterfaceInfo->FrameOUT.FrameData[sizeof(Ethernet_Frame_Header_t) +\r
+                                                                                                sizeof(IP_Header_t) +\r
+                                                                                                sizeof(TCP_Header_t)];\r

 \r
                        uint16_t PacketSize = ConnectionStateTable[CSTableEntry].Info.Buffer.Length;\r
 \r
 \r
                        uint16_t PacketSize = ConnectionStateTable[CSTableEntry].Info.Buffer.Length;\r
 \r


@@ -145,8 +145,8 @@ TASK(TCP_Task)
                        PacketSize += sizeof(Ethernet_Frame_Header_t);\r
 \r
                        /* Set the response length in the buffer and indicate that a response is ready to be sent */\r
                        PacketSize += sizeof(Ethernet_Frame_Header_t);\r
 \r
                        /* Set the response length in the buffer and indicate that a response is ready to be sent */\r

-                       FrameOUT.FrameLength            = PacketSize;\r
-                       FrameOUT.FrameInBuffer          = true;\r
+                       RNDISInterfaceInfo->FrameOUT.FrameLength   = PacketSize;\r
+                       RNDISInterfaceInfo->FrameOUT.FrameInBuffer = true;\r

                        \r
                        ConnectionStateTable[CSTableEntry].Info.Buffer.Ready = false;\r
                        \r
                        \r
                        ConnectionStateTable[CSTableEntry].Info.Buffer.Ready = false;\r
                        \r