Slight modification to license blub text in header comments.

[freertos] / FreeRTOS-Plus / Source / FreeRTOS-Plus-UDP / FreeRTOS_UDP_IP.c

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c
index 4318ab301e1760168287342a7687e3873549a6b6..9d70bb1addd4e77fda2bb6c54f55b050da3af6de 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c
@@ -4,10 +4,12 @@
  * This file is part of the FreeRTOS+UDP distribution.  The FreeRTOS+UDP license\r
  * terms are different to the FreeRTOS license terms.\r
  *\r
- * FreeRTOS+UDP uses a dual license model that allows the software to be used\r
- * under a pure GPL open source license (as opposed to the modified GPL license\r
- * under which FreeRTOS is distributed) or a commercial license.  Details of\r
- * both license options follow:\r
+ * FreeRTOS+UDP uses a dual license model that allows the software to be used \r
+ * under a standard GPL open source license, or a commercial license.  The \r
+ * standard GPL license (unlike the modified GPL license under which FreeRTOS \r
+ * itself is distributed) requires that all software statically linked with \r
+ * FreeRTOS+UDP is also distributed under the same GPL V2 license terms.  \r
+ * Details of both license options follow:\r
  *\r
  * - Open source licensing -\r
  * FreeRTOS+UDP is a free download and may be used, modified, evaluated and\r
@@ -318,10 +320,6 @@ static void prvOutputARPRequest( uint32_t ulIPAddress );
  */\r
 static void prvProcessNetworkDownEvent( void );\r
 \r
-#if( ipconfigFREERTOS_PLUS_NABTO == 1 )\r
-       static void prvStartNabtoTask( void );\r
-       extern void FreeRTOS_NabtoInit();\r
-#endif /* ipconfigFRERTOS_PLUS_NABTO */\r
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used to pass events into the UDP task for processing. */\r
@@ -1391,18 +1389,18 @@ static void prvProcessNetworkDownEvent( void )
                }\r
                #else\r
                {\r
-                       /* Static configuration is being used, so the network is now up. */\r
-                       #if ipconfigFREERTOS_PLUS_NABTO == 1\r
-                       {\r
-                               prvStartNabtoTask();\r
-                       }\r
-                       #endif /* ipconfigFREERTOS_PLUS_NABTO */\r
-\r
                        #if ipconfigUSE_NETWORK_EVENT_HOOK == 1\r
                        {\r
                                vApplicationIPNetworkEventHook( eNetworkUp );\r
                        }\r
                        #endif /* ipconfigUSE_NETWORK_EVENT_HOOK */\r
+\r
+                       /* Static configuration is being used, so the network is now up. */\r
+                       #if ipconfigFREERTOS_PLUS_NABTO == 1\r
+                       {\r
+                               vStartNabtoTask();\r
+                       }\r
+                       #endif /* ipconfigFREERTOS_PLUS_NABTO */\r
                }\r
                #endif\r
        }\r
@@ -1840,17 +1838,3 @@ xARPHeader_t *pxARPHeader;
 \r
 /*-----------------------------------------------------------*/\r
 \r
-#if( ipconfigFREERTOS_PLUS_NABTO == 1 )\r
-       static void prvStartNabtoTask( void )\r
-       {\r
-       static portBASE_TYPE xNabtoTaskStarted = pdFALSE;\r
-\r
-               if( xNabtoTaskStarted == pdFALSE )\r
-               {\r
-                       FreeRTOS_NabtoInit();\r
-                       xNabtoTaskStarted = pdTRUE;\r
-               }\r
-       }\r
-#endif /* ipconfigFREERTOS_PLUS_NABTO */\r
-\r
-\r