From 9a5b92c3d121ac4870c925716e5d017788460908 Mon Sep 17 00:00:00 2001 From: pvvx Date: Tue, 9 May 2017 18:55:34 +0300 Subject: [PATCH] update --- .../freertos/freertos_v8.1.2/Source/tasks.c | 4 ++-- .../freertos/freertos_v9.0.0/Source/queue.c | 1 + .../freertos/freertos_v9.0.0/Source/tasks.c | 4 ++-- build/bin/ota.bin | Bin 300984 -> 300984 bytes build/bin/ram_2.bin | Bin 300948 -> 300948 bytes build/bin/ram_2.ns.bin | Bin 300964 -> 300964 bytes build/bin/ram_2.p.bin | Bin 300964 -> 300964 bytes build/bin/ram_all.bin | Bin 346036 -> 346036 bytes 8 files changed, 5 insertions(+), 4 deletions(-) diff --git a/RTL00_SDKV35a/component/os/freertos/freertos_v8.1.2/Source/tasks.c b/RTL00_SDKV35a/component/os/freertos/freertos_v8.1.2/Source/tasks.c index f190952..2fde546 100644 --- a/RTL00_SDKV35a/component/os/freertos/freertos_v8.1.2/Source/tasks.c +++ b/RTL00_SDKV35a/component/os/freertos/freertos_v8.1.2/Source/tasks.c @@ -1711,11 +1711,11 @@ TickType_t xTaskGetTickCount( void ) TickType_t xTicks; /* Critical section required if running on a 16 bit processor. */ - taskENTER_CRITICAL(); +// taskENTER_CRITICAL(); { xTicks = xTickCount; } - taskEXIT_CRITICAL(); +// taskEXIT_CRITICAL(); return xTicks; } diff --git a/RTL00_SDKV35a/component/os/freertos/freertos_v9.0.0/Source/queue.c b/RTL00_SDKV35a/component/os/freertos/freertos_v9.0.0/Source/queue.c index ce623be..3659ecd 100644 --- a/RTL00_SDKV35a/component/os/freertos/freertos_v9.0.0/Source/queue.c +++ b/RTL00_SDKV35a/component/os/freertos/freertos_v9.0.0/Source/queue.c @@ -69,6 +69,7 @@ #include #include +#include /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining all the API functions to use the MPU wrappers. That should only be done when diff --git a/RTL00_SDKV35a/component/os/freertos/freertos_v9.0.0/Source/tasks.c b/RTL00_SDKV35a/component/os/freertos/freertos_v9.0.0/Source/tasks.c index 77c2c16..2f36b5e 100644 --- a/RTL00_SDKV35a/component/os/freertos/freertos_v9.0.0/Source/tasks.c +++ b/RTL00_SDKV35a/component/os/freertos/freertos_v9.0.0/Source/tasks.c @@ -2248,11 +2248,11 @@ TickType_t xTaskGetTickCount( void ) TickType_t xTicks; /* Critical section required if running on a 16 bit processor. */ - portTICK_TYPE_ENTER_CRITICAL(); +// portTICK_TYPE_ENTER_CRITICAL(); { xTicks = xTickCount; } - portTICK_TYPE_EXIT_CRITICAL(); +// portTICK_TYPE_EXIT_CRITICAL(); return xTicks; } diff --git a/build/bin/ota.bin b/build/bin/ota.bin index 1259c1bfc0fb2dc70d1642b3ec2d8127a3aa634e..5a4a2f549ba5bbc720518434fd76010970fd63f2 100644 GIT binary patch delta 71 zcmdn7UTDX9p@uDt8bUHx|18Q-&JlJ=%2=E**-8AeGLRN|a3F)_!-+rBU4$6JnC9$h YpCiNw#7scUynT)ki$p8Ss?D3!8AyvfIFP~eq3Z8+7a_(lCcnMy YbA%Xym?D3!8AyvfIFP~eq3Z8+6CuVhCcnMy SJwl8?%ml>D+k1pqI9dU6JQ&vi diff --git a/build/bin/ram_2.ns.bin b/build/bin/ram_2.ns.bin index 3fc45d54c61b428489b3c0ac191644fbd2893fe3..d217e50eac03075cd107ff37ccbfdffbf3483e89 100644 GIT binary patch delta 66 zcmZ3oUTDdBp@uDt8bUHx|18Q-&JlJ=%2=E**-8AeGLRN|a3F)_!-+rBU4$6JnC9$h TpCiNw#7scUynT)k3r8yepxqii delta 66 zcmZ3oUTDdBp@uDt8bUJde-~va=LowbWh_pZ>?D3!8AyvfIFP~eq3Z8+7a_(lCcnMy TbA%Xym?D3!8AyvfIFP~eq3Z8+7a_(lCcnMy TbA%XympZ=LowbWh_pZ>?D3!8AyvfIFP~e;l!WmE{7PynC9$h TpL2*2h?#(xdHbA0EE25%?Ia#l delta 66 zcmdneFS?~)v|$UQ#vz&Zzl$=IbA(-zG8QLHb`rm=45URK9LQk#Q1y4Z%OS=vCcnMy Ta}F^AF%u9oZ=Z9BMWPh|&T}1Y