Seperate out XMEGA and TINY NVM routines into seperate files.

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

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.c
index 57b3f3a..06f0c69 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.c
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.c
@@ -38,7 +38,6 @@
 #define  INCLUDE_FROM_TCP_C\r
 #include "TCP.h"\r
 \r
 #define  INCLUDE_FROM_TCP_C\r
 #include "TCP.h"\r
 \r

-/* Global Variables: */\r

 /** Port state table array. This contains the current status of TCP ports in the device. To save on space, only open ports are\r
  *  stored - closed ports may be overwritten at any time, and the system will assume any ports not present in the array are closed. This\r
  *  allows for MAX_OPEN_TCP_PORTS to be less than the number of ports used by the application if desired.\r
 /** Port state table array. This contains the current status of TCP ports in the device. To save on space, only open ports are\r
  *  stored - closed ports may be overwritten at any time, and the system will assume any ports not present in the array are closed. This\r
  *  allows for MAX_OPEN_TCP_PORTS to be less than the number of ports used by the application if desired.\r


@@ -58,19 +57,18 @@ TCP_ConnectionState_t  ConnectionStateTable[MAX_TCP_CONNECTIONS];
  */\r
 void TCP_Task(void)\r
 {\r
  */\r
 void TCP_Task(void)\r
 {\r

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

        /* Run each application in sequence, to process incoming and generate outgoing packets */\r
        for (uint8_t CSTableEntry = 0; CSTableEntry < MAX_TCP_CONNECTIONS; CSTableEntry++)\r
        {\r
                /* Find the corresponding port entry in the port table */\r
        /* Run each application in sequence, to process incoming and generate outgoing packets */\r
        for (uint8_t CSTableEntry = 0; CSTableEntry < MAX_TCP_CONNECTIONS; CSTableEntry++)\r
        {\r
                /* Find the corresponding port entry in the port table */\r

-               for (uint8_t PTableEntry = 0; PTableEntry < MAX_TCP_CONNECTIONS; PTableEntry++)\r
+               for (uint8_t PTableEntry = 0; PTableEntry < MAX_OPEN_TCP_PORTS; PTableEntry++)\r

                {\r
                        /* Run the application handler for the port */\r
                        if ((PortStateTable[PTableEntry].Port  == ConnectionStateTable[CSTableEntry].Port) && \r
                            (PortStateTable[PTableEntry].State == TCP_Port_Open))\r
                        {\r
                {\r
                        /* Run the application handler for the port */\r
                        if ((PortStateTable[PTableEntry].Port  == ConnectionStateTable[CSTableEntry].Port) && \r
                            (PortStateTable[PTableEntry].State == TCP_Port_Open))\r
                        {\r

-                               PortStateTable[PTableEntry].ApplicationHandler(&ConnectionStateTable[CSTableEntry], &ConnectionStateTable[CSTableEntry].Info.Buffer);\r
+                               PortStateTable[PTableEntry].ApplicationHandler(&ConnectionStateTable[CSTableEntry],\r
+                                                                              &ConnectionStateTable[CSTableEntry].Info.Buffer);\r

                        }\r
                }\r
        }\r
                        }\r
                }\r
        }\r


@@ -89,7 +87,7 @@ void TCP_Task(void)
                        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
                        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
+                                                                                                    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
                        void*                    TCPDataOUT     = &FrameOUT.FrameData[sizeof(Ethernet_Frame_Header_t) +\r
                                                                                      sizeof(IP_Header_t) +\r
                                                                                      sizeof(TCP_Header_t)];\r


@@ -367,11 +365,12 @@ int16_t TCP_ProcessTCPPacket(void* IPHeaderInStart, void* TCPHeaderInStart, void
                /* Detect RST from host to abort existing connection */\r
                if (TCPHeaderIN->Flags & TCP_FLAG_RST)\r
                {\r
                /* Detect RST from host to abort existing connection */\r
                if (TCPHeaderIN->Flags & TCP_FLAG_RST)\r
                {\r

-                       TCPHeaderOUT->Flags = (TCP_FLAG_RST | TCP_FLAG_ACK);                            \r
-                       PacketResponse = true;\r
-                       \r
-                       TCP_SetConnectionState(TCPHeaderIN->DestinationPort, IPHeaderIN->SourceAddress,\r
-                                              TCPHeaderIN->SourcePort, TCP_Connection_Closed);                 \r
+                       if (TCP_SetConnectionState(TCPHeaderIN->DestinationPort, IPHeaderIN->SourceAddress,\r
+                                                  TCPHeaderIN->SourcePort, TCP_Connection_Closed))\r
+                       {\r
+                               TCPHeaderOUT->Flags = (TCP_FLAG_RST | TCP_FLAG_ACK);                            \r
+                               PacketResponse = true;                  \r
+                       }\r

                }\r
                else\r
                {\r
                }\r
                else\r
                {\r


@@ -584,10 +583,10 @@ int16_t TCP_ProcessTCPPacket(void* IPHeaderInStart, void* TCPHeaderInStart, void
 /** Calculates the appropriate TCP checksum, consisting of the addition of the one's compliment of each word,\r
  *  complimented.\r
  *\r
 /** Calculates the appropriate TCP checksum, consisting of the addition of the one's compliment of each word,\r
  *  complimented.\r
  *\r

- *  \param[in] TCPHeaderOutStart  Pointer to the start of the packet's outgoing TCP header\r
- *  \param[in] SourceAddress      Source protocol IP address of the outgoing IP header\r
- *  \param[in] DestinationAddress Destination protocol IP address of the outgoing IP header\r
- *  \param[in] TCPOutSize         Size in bytes of the TCP data header and payload\r
+ *  \param[in] TCPHeaderOutStart   Pointer to the start of the packet's outgoing TCP header\r
+ *  \param[in] SourceAddress       Source protocol IP address of the outgoing IP header\r
+ *  \param[in] DestinationAddress  Destination protocol IP address of the outgoing IP header\r
+ *  \param[in] TCPOutSize          Size in bytes of the TCP data header and payload\r

  *\r
  *  \return A 16-bit TCP checksum value\r
  */\r
  *\r
  *  \return A 16-bit TCP checksum value\r
  */\r