From: richardbarry Date: Tue, 21 May 2013 14:14:03 +0000 (+0000) Subject: Slight modification to license blub text in header comments. X-Git-Tag: V7.5.0~88 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5b70eb1ddd51812647d782bec094438a5975e353;p=freertos Slight modification to license blub text in header comments. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1902 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.c index 2f7764b0e..9e1ae4d9c 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+CLI distribution. The FreeRTOS+CLI license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+CLI uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+CLI uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+CLI is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+CLI is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.h index 15048ffb9..4e4b3cdc9 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+CLI distribution. The FreeRTOS+CLI license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+CLI uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+CLI uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+CLI is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+CLI is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/api_mdriver.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/api_mdriver.h index c10ffec07..8e9b07081 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/api_mdriver.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/api_mdriver.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/api_mdriver_ram.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/api_mdriver_ram.h index 46dd1c61e..c7b342121 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/api_mdriver_ram.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/api_mdriver_ram.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/fat_sl.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/fat_sl.h index f80ef2784..d18848c90 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/fat_sl.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/api/fat_sl.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/config/config_fat_sl_template.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/config/config_fat_sl_template.h index 2ecf56966..5b7314158 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/config/config_fat_sl_template.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/config/config_fat_sl_template.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/config/config_mdriver_ram_template.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/config/config_mdriver_ram_template.h index 5912ed04d..c0f59814d 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/config/config_mdriver_ram_template.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/config/config_mdriver_ram_template.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/dir.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/dir.c index 815db86a9..e46c7f1a6 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/dir.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/dir.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/dir.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/dir.h index 467973cc0..84c7de1c2 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/dir.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/dir.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/drv.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/drv.c index 82f19bd33..41c5c2229 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/drv.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/drv.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/drv.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/drv.h index 10827a21a..d4dd245e2 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/drv.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/drv.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/f_lock.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/f_lock.c index 23ebbf20b..35d13a2ff 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/f_lock.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/f_lock.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/f_lock.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/f_lock.h index c0505590c..abdb850b6 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/f_lock.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/f_lock.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/fat.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/fat.c index 771d1ffcd..2063dd644 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/fat.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/fat.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/fat.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/fat.h index bb8c727c3..9923b39b7 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/fat.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/fat.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/file.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/file.c index ae08990b2..38b93a51b 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/file.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/file.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/file.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/file.h index a124d0700..63045303a 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/file.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/file.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util.c index 590aecf01..9d5ed9b65 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util.h index 9d2366569..51be82120 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util_sfn.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util_sfn.c index 1ddbee162..ec2c39aa5 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util_sfn.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util_sfn.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util_sfn.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util_sfn.h index 8e9751a15..9b4b2b68a 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util_sfn.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/util_sfn.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/volume.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/volume.c index 22609831d..3325f4cde 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/volume.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/volume.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/volume.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/volume.h index e65a44f8d..16a1d016c 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/volume.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/common/volume.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/test/test.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/test/test.c index ef67ad094..b25e05c19 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/test/test.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/test/test.c @@ -8,10 +8,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/test/test.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/test/test.h index cc6274992..033f5db00 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/test/test.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/fat_sl/test/test.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/media-drv/ram/ramdrv_f.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/media-drv/ram/ramdrv_f.c index 5d1d49fa1..c665df38e 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/media-drv/ram/ramdrv_f.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/media-drv/ram/ramdrv_f.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/include/psp_rtc.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/include/psp_rtc.h index 7f1d560e8..4dab7fdad 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/include/psp_rtc.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/include/psp_rtc.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/include/psp_string.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/include/psp_string.h index 310e439ab..237c90c0c 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/include/psp_string.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/include/psp_string.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.c index e54321420..085425cc7 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.h index 630c60f41..53b1540d0 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/rtc/psp_rtc.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/rtc/psp_rtc.c index 45b3a99df..3f10512cf 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/rtc/psp_rtc.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/rtc/psp_rtc.c @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_fat_sl.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_fat_sl.h index f521ffb83..a789f73c7 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_fat_sl.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_fat_sl.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_mdriver.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_mdriver.h index 4a9468d98..18f298313 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_mdriver.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_mdriver.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_mdriver_ram.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_mdriver_ram.h index 384a0916c..730c11aee 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_mdriver_ram.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_mdriver_ram.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_fat_sl.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_fat_sl.h index 98a22e1da..38511cbb6 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_fat_sl.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_fat_sl.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_rtc.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_rtc.h index 8a65db0fb..a1f4c6e61 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_rtc.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_rtc.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_string.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_string.h index 2ed0415e7..d2c0a21a8 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_string.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/version/ver_psp_string.h @@ -4,10 +4,12 @@ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license * terms. * - * FreeRTOS+FAT SL uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL licence - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+FAT SL uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c index 9e2e3bed2..f2226726b 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and @@ -285,18 +287,19 @@ void vDHCPProcess( portBASE_TYPE xReset, xMACAddress_t *pxMACAddress, uint32_t * eDHCPState = eNotUsingLeasedAddress; xTimerStop( xDHCPTimer, ( portTickType ) 0 ); - #if ipconfigFREERTOS_PLUS_NABTO == 1 - { - vStartNabtoTask(); - } - #endif /* ipconfigFREERTOS_PLUS_NABTO */ - #if ipconfigUSE_NETWORK_EVENT_HOOK == 1 { vApplicationIPNetworkEventHook( eNetworkUp ); } #endif + /* Static configuration is being used, so the network is now up. */ + #if ipconfigFREERTOS_PLUS_NABTO == 1 + { + vStartNabtoTask(); + } + #endif /* ipconfigFREERTOS_PLUS_NABTO */ + /* Close socket to ensure packets don't queue on it. */ FreeRTOS_closesocket( xDHCPSocket ); xDHCPSocket = NULL; @@ -315,18 +318,19 @@ void vDHCPProcess( portBASE_TYPE xReset, xMACAddress_t *pxMACAddress, uint32_t * *pulIPAddress = ulOfferedIPAddress; eDHCPState = eLeasedAddress; - #if ipconfigFREERTOS_PLUS_NABTO == 1 - { - vStartNabtoTask(); - } - #endif /* ipconfigFREERTOS_PLUS_NABTO */ - #if ipconfigUSE_NETWORK_EVENT_HOOK == 1 { vApplicationIPNetworkEventHook( eNetworkUp ); } #endif + /* Static configuration is being used, so the network is now up. */ + #if ipconfigFREERTOS_PLUS_NABTO == 1 + { + vStartNabtoTask(); + } + #endif /* ipconfigFREERTOS_PLUS_NABTO */ + /* Close socket to ensure packets don't queue on it. */ FreeRTOS_closesocket( xDHCPSocket ); xDHCPSocket = NULL; diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DNS.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DNS.c index b1424727e..0dada5234 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DNS.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DNS.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_Sockets.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_Sockets.c index 4eae98723..314c4daa4 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_Sockets.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_Sockets.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and 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 4318ab301..9d70bb1ad 100644 --- 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 * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and @@ -318,10 +320,6 @@ static void prvOutputARPRequest( uint32_t ulIPAddress ); */ static void prvProcessNetworkDownEvent( void ); -#if( ipconfigFREERTOS_PLUS_NABTO == 1 ) - static void prvStartNabtoTask( void ); - extern void FreeRTOS_NabtoInit(); -#endif /* ipconfigFRERTOS_PLUS_NABTO */ /*-----------------------------------------------------------*/ /* The queue used to pass events into the UDP task for processing. */ @@ -1391,18 +1389,18 @@ static void prvProcessNetworkDownEvent( void ) } #else { - /* Static configuration is being used, so the network is now up. */ - #if ipconfigFREERTOS_PLUS_NABTO == 1 - { - prvStartNabtoTask(); - } - #endif /* ipconfigFREERTOS_PLUS_NABTO */ - #if ipconfigUSE_NETWORK_EVENT_HOOK == 1 { vApplicationIPNetworkEventHook( eNetworkUp ); } #endif /* ipconfigUSE_NETWORK_EVENT_HOOK */ + + /* Static configuration is being used, so the network is now up. */ + #if ipconfigFREERTOS_PLUS_NABTO == 1 + { + vStartNabtoTask(); + } + #endif /* ipconfigFREERTOS_PLUS_NABTO */ } #endif } @@ -1840,17 +1838,3 @@ xARPHeader_t *pxARPHeader; /*-----------------------------------------------------------*/ -#if( ipconfigFREERTOS_PLUS_NABTO == 1 ) - static void prvStartNabtoTask( void ) - { - static portBASE_TYPE xNabtoTaskStarted = pdFALSE; - - if( xNabtoTaskStarted == pdFALSE ) - { - FreeRTOS_NabtoInit(); - xNabtoTaskStarted = pdTRUE; - } - } -#endif /* ipconfigFREERTOS_PLUS_NABTO */ - - diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOSIPConfigDefaults.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOSIPConfigDefaults.h index 66e7b7029..9e7bd407b 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOSIPConfigDefaults.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOSIPConfigDefaults.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_DHCP.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_DHCP.h index c953239f5..2c6a91f5a 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_DHCP.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_DHCP.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_DNS.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_DNS.h index f1bcd2243..f59af32ea 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_DNS.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_DNS.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_IP_Private.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_IP_Private.h index 7f470043d..e6685a964 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_IP_Private.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_IP_Private.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h index a4b17aa87..519735094 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_UDP_IP.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_UDP_IP.h index 6630faee1..a7cc748c4 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_UDP_IP.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_UDP_IP.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/IPTraceMacroDefaults.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/IPTraceMacroDefaults.h index 3b63446a0..3dca4819c 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/IPTraceMacroDefaults.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/IPTraceMacroDefaults.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/NetworkBufferManagement.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/NetworkBufferManagement.h index 7fb394344..680d1a2bf 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/NetworkBufferManagement.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/NetworkBufferManagement.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/NetworkInterface.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/NetworkInterface.h index f27e5111e..d50fbb324 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/NetworkInterface.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/NetworkInterface.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_1.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_1.c index 4383040ab..aa2adddca 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_1.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_1.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_2.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_2.c index e86ec6c84..565b71a40 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_2.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_2.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/GCC/pack_struct_end.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/GCC/pack_struct_end.h index 772c05878..1d35ebb4d 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/GCC/pack_struct_end.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/GCC/pack_struct_end.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/GCC/pack_struct_start.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/GCC/pack_struct_start.h index 16b4d9813..356f96596 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/GCC/pack_struct_start.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/GCC/pack_struct_start.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/MSVC/pack_struct_end.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/MSVC/pack_struct_end.h index bdc847daa..f395272ee 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/MSVC/pack_struct_end.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/MSVC/pack_struct_end.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/MSVC/pack_struct_start.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/MSVC/pack_struct_start.h index 24a365b1d..2c0d58ff1 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/MSVC/pack_struct_start.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/MSVC/pack_struct_start.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/Renesas/pack_struct_end.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/Renesas/pack_struct_end.h index 8824ca0bf..cbcc6846d 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/Renesas/pack_struct_end.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/Renesas/pack_struct_end.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/Renesas/pack_struct_start.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/Renesas/pack_struct_start.h index a83c25580..eeb183683 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/Renesas/pack_struct_start.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/Compiler/Renesas/pack_struct_start.h @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC17xx/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC17xx/NetworkInterface.c index fb553d7ce..432cf320f 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC17xx/NetworkInterface.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC17xx/NetworkInterface.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/NetworkInterface.c index f7e000382..ee281a288 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/NetworkInterface.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/NetworkInterface.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SH2A/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SH2A/NetworkInterface.c index ab79d02d4..d2a24ae04 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SH2A/NetworkInterface.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SH2A/NetworkInterface.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/WinPCap/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/WinPCap/NetworkInterface.c index bc88bf0e8..dc0a57f14 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/WinPCap/NetworkInterface.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/WinPCap/NetworkInterface.c @@ -4,10 +4,12 @@ * This file is part of the FreeRTOS+UDP distribution. The FreeRTOS+UDP license * terms are different to the FreeRTOS license terms. * - * FreeRTOS+UDP uses a dual license model that allows the software to be used - * under a pure GPL open source license (as opposed to the modified GPL license - * under which FreeRTOS is distributed) or a commercial license. Details of - * both license options follow: + * FreeRTOS+UDP uses a dual license model that allows the software to be used + * under a standard GPL open source license, or a commercial license. The + * standard GPL license (unlike the modified GPL license under which FreeRTOS + * itself is distributed) requires that all software statically linked with + * FreeRTOS+UDP is also distributed under the same GPL V2 license terms. + * Details of both license options follow: * * - Open source licensing - * FreeRTOS+UDP is a free download and may be used, modified, evaluated and