Sync FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP with the version in GitHub at (23665258ca...

[freertos] / FreeRTOS-Plus / Source / FreeRTOS-Plus-TCP / include / FreeRTOS_IP_Private.h

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
index 641539ea0c529807bee33549af9f1df9b0a09b25..8604abed05a7030da1f59af9c5f9d8b9444337f1 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+TCP V2.0.11\r
+ * FreeRTOS+TCP V2.2.0\r
  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
  *\r
  * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
@@ -41,10 +41,6 @@ extern "C" {
        #include "FreeRTOS_TCP_IP.h"\r
 #endif\r
 \r
-#if( ipconfigSOCKET_HAS_USER_SEMAPHORE == 1 )\r
-       #include "semphr.h"\r
-#endif\r
-\r
 #include "event_groups.h"\r
 \r
 typedef struct xNetworkAddressingParameters\r
@@ -248,16 +244,17 @@ typedef enum
        eNoEvent = -1,\r
        eNetworkDownEvent,              /* 0: The network interface has been lost and/or needs [re]connecting. */\r
        eNetworkRxEvent,                /* 1: The network interface has queued a received Ethernet frame. */\r
-       eARPTimerEvent,                 /* 2: The ARP timer expired. */\r
-       eStackTxEvent,                  /* 3: The software stack has queued a packet to transmit. */\r
-       eDHCPEvent,                             /* 4: Process the DHCP state machine. */\r
-       eTCPTimerEvent,                 /* 5: See if any TCP socket needs attention. */\r
-       eTCPAcceptEvent,                /* 6: Client API FreeRTOS_accept() waiting for client connections. */\r
-       eTCPNetStat,                    /* 7: IP-task is asked to produce a netstat listing. */\r
-       eSocketBindEvent,               /* 8: Send a message to the IP-task to bind a socket to a port. */\r
-       eSocketCloseEvent,              /* 9: Send a message to the IP-task to close a socket. */\r
-       eSocketSelectEvent,             /*10: Send a message to the IP-task for select(). */\r
-       eSocketSignalEvent,             /*11: A socket must be signalled. */\r
+       eNetworkTxEvent,                /* 2: Let the IP-task send a network packet. */\r
+       eARPTimerEvent,                 /* 3: The ARP timer expired. */\r
+       eStackTxEvent,                  /* 4: The software stack has queued a packet to transmit. */\r
+       eDHCPEvent,                             /* 5: Process the DHCP state machine. */\r
+       eTCPTimerEvent,                 /* 6: See if any TCP socket needs attention. */\r
+       eTCPAcceptEvent,                /* 7: Client API FreeRTOS_accept() waiting for client connections. */\r
+       eTCPNetStat,                    /* 8: IP-task is asked to produce a netstat listing. */\r
+       eSocketBindEvent,               /* 9: Send a message to the IP-task to bind a socket to a port. */\r
+       eSocketCloseEvent,              /*10: Send a message to the IP-task to close a socket. */\r
+       eSocketSelectEvent,             /*11: Send a message to the IP-task for select(). */\r
+       eSocketSignalEvent,             /*12: A socket must be signalled. */\r
 } eIPEvent_t;\r
 \r
 typedef struct IP_TASK_COMMANDS\r
@@ -460,8 +457,8 @@ BaseType_t vNetworkSocketsInit( void );
 BaseType_t xIPIsNetworkTaskReady( void );\r
 \r
 #if( ipconfigSOCKET_HAS_USER_WAKE_CALLBACK == 1 )\r
-       struct XSOCKET;\r
-       typedef void (*SocketWakeupCallback_t)( struct XSOCKET * pxSocket );\r
+       struct xSOCKET;\r
+       typedef void (*SocketWakeupCallback_t)( struct xSOCKET * pxSocket );\r
 #endif\r
 \r
 #if( ipconfigUSE_TCP == 1 )\r
@@ -548,7 +545,7 @@ BaseType_t xIPIsNetworkTaskReady( void );
                                                                 * This counter is separate from the xmitCount in the\r
                                                                 * TCP win segments */\r
                uint8_t ucTCPState;             /* TCP state: see eTCP_STATE */\r
-               struct XSOCKET *pxPeerSocket;   /* for server socket: child, for child socket: parent */\r
+               struct xSOCKET *pxPeerSocket;   /* for server socket: child, for child socket: parent */\r
                #if( ipconfigTCP_KEEP_ALIVE == 1 )\r
                        uint8_t ucKeepRepCount;\r
                        TickType_t xLastAliveTime;\r
@@ -615,7 +612,7 @@ typedef enum eSOCKET_EVENT {
        eSOCKET_ALL             = 0x007F,\r
 } eSocketEvent_t;\r
 \r
-typedef struct XSOCKET\r
+typedef struct xSOCKET\r
 {\r
        EventBits_t xEventBits;\r
        EventGroupHandle_t xEventGroup;\r