Update version number to 9.0.0rc2.

[freertos] / FreeRTOS-Plus / Demo / Common / FreeRTOS_Plus_UDP_Demos / TraceMacros / Example1 / DemoIPTrace.h

diff --git a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/TraceMacros/Example1/DemoIPTrace.h b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/TraceMacros/Example1/DemoIPTrace.h
index 7d9ec459a535899b306487a77e705689dacf09e4..42e53251793493ed018d95eb436553167d39c1a4 100644 (file)
--- a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/TraceMacros/Example1/DemoIPTrace.h
+++ b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/TraceMacros/Example1/DemoIPTrace.h
@@ -1,75 +1,70 @@
 /*\r
 /*\r

-    FreeRTOS V7.4.1 - Copyright (C) 2013 Real Time Engineers Ltd.\r
-\r
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT\r
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
-     *    Complete, revised, and edited pdf reference manuals are also       *\r
-     *    available.                                                         *\r
-     *                                                                       *\r
-     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
-     *    ensuring you get running as quickly as possible and with an        *\r
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
-     *    the FreeRTOS project to continue with its mission of providing     *\r
-     *    professional grade, cross platform, de facto standard solutions    *\r
-     *    for microcontrollers - completely free of charge!                  *\r
-     *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
-     *                                                                       *\r
-    ***************************************************************************\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
+    All rights reserved\r

 \r
 \r

+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r

 \r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
 \r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r

-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r

 \r
 \r

-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to\r
-    distribute a combined work that includes FreeRTOS without being obliged to\r
-    provide the source code for proprietary components outside of the FreeRTOS\r
-    kernel.\r
+    ***************************************************************************\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
+    ***************************************************************************\r

 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r

-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more\r
-    details. You should have received a copy of the GNU General Public License\r
-    and the FreeRTOS license exception along with FreeRTOS; if not it can be\r
-    viewed here: http://www.freertos.org/a00114.html and also obtained by\r
-    writing to Real Time Engineers Ltd., contact details for whom are available\r
-    on the FreeRTOS WEB site.\r
-\r
-    1 tab == 4 spaces!\r
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following\r
+    link: http://www.freertos.org/a00114.html\r

 \r
     ***************************************************************************\r
      *                                                                       *\r
 \r
     ***************************************************************************\r
      *                                                                       *\r

-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
+     *    FreeRTOS provides completely free yet professionally developed,    *\r
+     *    robust, strictly quality controlled, supported, and cross          *\r
+     *    platform software that is more than just the market leader, it     *\r
+     *    is the industry's de facto standard.                               *\r

      *                                                                       *\r
      *                                                                       *\r

-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
+     *    Help yourself get started quickly while simultaneously helping     *\r
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *\r
+     *    tutorial book, reference manual, or both:                          *\r
+     *    http://www.FreeRTOS.org/Documentation                              *\r

      *                                                                       *\r
     ***************************************************************************\r
 \r
      *                                                                       *\r
     ***************************************************************************\r
 \r

+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading\r
+    the FAQ page "My application does not run, what could be wrong?".  Have you\r
+    defined configASSERT()?\r

 \r
 \r

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, \r
-    license and Real Time Engineers Ltd. contact details.\r
+    http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+    embedded software for free we request you assist our global community by\r
+    participating in the support forum.\r
+\r
+    http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+    be as productive as possible as early as possible.  Now you can receive\r
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+    Ltd, and the world's leading authority on the world's leading RTOS.\r

 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r

-    including FreeRTOS+Trace - an indispensable productivity tool, and our new\r
-    fully thread aware and reentrant UDP/IP stack.\r
-\r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High \r
-    Integrity Systems, who sell the code with commercial support, \r
-    indemnification and middleware, under the OpenRTOS brand.\r
-    \r
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety \r
-    engineered and independently SIL3 certified version for use in safety and \r
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
+\r
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
+    licenses offer ticketed support, indemnification and commercial middleware.\r
+\r
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+    engineered and independently SIL3 certified version for use in safety and\r

     mission critical applications that require provable dependability.\r
     mission critical applications that require provable dependability.\r

+\r
+    1 tab == 4 spaces!\r

 */\r
 \r
 /*\r
 */\r
 \r
 /*\r


@@ -95,18 +90,21 @@ typedef struct ExampleDebugStatEntry
 \r
 /* Unique identifiers used to locate the entry for each trace macro in the\r
 xIPTraceValues[] table defined in DemoIPTrace.c. */\r
 \r
 /* Unique identifiers used to locate the entry for each trace macro in the\r
 xIPTraceValues[] table defined in DemoIPTrace.c. */\r

-#define iptraceID_NETWORK_BUFFER_OBTAINED                                      1\r
-#define iptraceID_NETWORK_BUFFER_OBTAINED_FROM_ISR                     2\r
-#define iptraceID_NETWORK_EVENT_RECEIVED                                       3\r
-#define iptraceID_FAILED_TO_OBTAIN_NETWORK_BUFFER                      4\r
-#define iptraceID_ARP_TABLE_ENTRY_EXPIRED                                      5\r
-#define iptraceID_PACKET_DROPPED_TO_GENERATE_ARP                       6\r
-#define iptraceID_FAILED_TO_CREATE_SOCKET                                      7\r
-#define iptraceID_RECVFROM_DISCARDING_BYTES                                    8\r
-#define iptraceID_ETHERNET_RX_EVENT_LOST                                       9\r
-#define iptraceID_STACK_TX_EVENT_LOST                                          10\r
-#define ipconfigID_BIND_FAILED                                                         11\r
-#define iptraceID_NETWORK_INTERFACE_TRANSMIT                           12\r
+#define iptraceID_NETWORK_INTERFACE_RECEIVE                                    0\r
+#define iptraceID_NETWORK_INTERFACE_TRANSMIT                           1\r
+#define iptraceID_PACKET_DROPPED_TO_GENERATE_ARP                       2\r
+/* Do not change IDs above this line as the ID is shared with a FreeRTOS+Nabto\r
+demo. */\r
+#define iptraceID_NETWORK_BUFFER_OBTAINED                                      3\r
+#define iptraceID_NETWORK_BUFFER_OBTAINED_FROM_ISR                     4\r
+#define iptraceID_NETWORK_EVENT_RECEIVED                                       5\r
+#define iptraceID_FAILED_TO_OBTAIN_NETWORK_BUFFER                      6\r
+#define iptraceID_ARP_TABLE_ENTRY_EXPIRED                                      7\r
+#define iptraceID_FAILED_TO_CREATE_SOCKET                                      8\r
+#define iptraceID_RECVFROM_DISCARDING_BYTES                                    9\r
+#define iptraceID_ETHERNET_RX_EVENT_LOST                                       10\r
+#define iptraceID_STACK_TX_EVENT_LOST                                          11\r
+#define ipconfigID_BIND_FAILED                                                         12\r

 #define iptraceID_RECVFROM_TIMEOUT                                                     13\r
 #define iptraceID_SENDTO_DATA_TOO_LONG                                         14\r
 #define iptraceID_SENDTO_SOCKET_NOT_BOUND                                      15\r
 #define iptraceID_RECVFROM_TIMEOUT                                                     13\r
 #define iptraceID_SENDTO_DATA_TOO_LONG                                         14\r
 #define iptraceID_SENDTO_SOCKET_NOT_BOUND                                      15\r


@@ -146,6 +144,7 @@ configINCLUDE_DEMO_DEBUG_STATS setting in FreeRTOSIPConfig.h. */
        #define iptraceNO_BUFFER_FOR_SENDTO()                                                           vExampleDebugStatUpdate( iptraceID_NO_BUFFER_FOR_SENDTO, 0 )\r
        #define iptraceWAITING_FOR_TX_DMA_DESCRIPTOR()                                          vExampleDebugStatUpdate( iptraceID_WAIT_FOR_TX_DMA_DESCRIPTOR, 0 )\r
        #define iptraceFAILED_TO_NOTIFY_SELECT_GROUP( xSocket )                         vExampleDebugStatUpdate( iptraceID_FAILED_TO_NOTIFY_SELECT_GROUP, 0 )\r
        #define iptraceNO_BUFFER_FOR_SENDTO()                                                           vExampleDebugStatUpdate( iptraceID_NO_BUFFER_FOR_SENDTO, 0 )\r
        #define iptraceWAITING_FOR_TX_DMA_DESCRIPTOR()                                          vExampleDebugStatUpdate( iptraceID_WAIT_FOR_TX_DMA_DESCRIPTOR, 0 )\r
        #define iptraceFAILED_TO_NOTIFY_SELECT_GROUP( xSocket )                         vExampleDebugStatUpdate( iptraceID_FAILED_TO_NOTIFY_SELECT_GROUP, 0 )\r

+       #define iptraceNETWORK_INTERFACE_RECEIVE()                                                      vExampleDebugStatUpdate( iptraceID_NETWORK_INTERFACE_RECEIVE, 0 )\r

 \r
        /*\r
         * The function that updates a line in the xIPTraceValues table.\r
 \r
        /*\r
         * The function that updates a line in the xIPTraceValues table.\r


@@ -155,7 +154,7 @@ configINCLUDE_DEMO_DEBUG_STATS setting in FreeRTOSIPConfig.h. */
        /*\r
         * Returns the number of entries in the xIPTraceValues table.\r
         */\r
        /*\r
         * Returns the number of entries in the xIPTraceValues table.\r
         */\r

-       portBASE_TYPE xExampleDebugStatEntries( void );\r
+       BaseType_t xExampleDebugStatEntries( void );\r

 \r
 #endif /* configINCLUDE_DEMO_DEBUG_STATS == 1 */\r
 \r
 \r
 #endif /* configINCLUDE_DEMO_DEBUG_STATS == 1 */\r
 \r