Very minor changes to the EFM32 Giant and Pearl Geckos demos in preparation for pre...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2426 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/.cproject b/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/.cproject
index 484959bfe086f619cd9ded95fa4045d2ca7530ed..04894f200184c21c7a4ce54790a0cce1e070d5e0 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/.cproject
+++ b/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/.cproject
@@ -101,4 +101,5 @@
                        <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>\r
                </scannerConfigBuildInfo>\r
        </storageModule>\r
+       <storageModule moduleId="refreshScope"/>\r
 </cproject>\r

diff --git a/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/FreeRTOSConfig.h
index 91a324041d2028e2e1aeb4f934814c904cd6d0f4..a1873149a6fdd3174c565c2659b4f6f2b7f2116d 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/FreeRTOSConfig.h
@@ -99,7 +99,7 @@ extern "C" {
  *  See the comments at the top of main.c, main_full.c and main_low_power.c for\r
  *  more information.\r
  */\r
-#define configCREATE_LOW_POWER_DEMO    0\r
+#define configCREATE_LOW_POWER_DEMO            0\r
 \r
 /* Some configuration is dependent on the demo being built. */\r
 #if( configCREATE_LOW_POWER_DEMO == 0 )\r

diff --git a/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/Full_Demo/main_full.c b/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/Full_Demo/main_full.c
index 67ccd0a1619179469296807eb251b3e2d9c6a762..ee6fd06b8538cf2de36fde662b843ed4ed3b760b 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/Full_Demo/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/Full_Demo/main_full.c
@@ -145,7 +145,7 @@
 /* The period after which the check timer will expire, in ms, provided no errors\r
 have been reported by any of the standard demo tasks.  ms are converted to the\r
 equivalent in ticks using the portTICK_PERIOD_MS constant. */\r
-#define mainNO_ERROR_CHECK_TASK_PERIOD         ( 3000UL / portTICK_PERIOD_MS )\r
+#define mainNO_ERROR_CHECK_TASK_PERIOD         pdMS_TO_TICKS( 3000UL )\r
 \r
 /* The period at which the check timer will expire, in ms, if an error has been\r
 reported in one of the standard demo tasks.  ms are converted to the equivalent\r

diff --git a/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/Low_Power_Demo/low_power_tick_management_BURTC.c b/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/Low_Power_Demo/low_power_tick_management_BURTC.c
index 748931fdfd1f6504bfa73adee5d136097e5089c9..ef452aa2c1f25590c0d35ffdacc331bb5eee264f 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/Low_Power_Demo/low_power_tick_management_BURTC.c
+++ b/FreeRTOS/Demo/CORTEX_EFM32_Giant_Gecko_Simplicity_Studio/Low_Power_Demo/low_power_tick_management_BURTC.c
@@ -67,8 +67,6 @@
     1 tab == 4 spaces!\r
 */\r
 \r
-#warning Not functioning correctly above -O1 optimisation level.\r
-\r
 /* Standard includes. */\r
 #include "limits.h"\r
 \r

diff --git a/FreeRTOS/Demo/CORTEX_EFM32_Pearl_Gecko_Simplicity_Studio/Full_Demo/main_full.c b/FreeRTOS/Demo/CORTEX_EFM32_Pearl_Gecko_Simplicity_Studio/Full_Demo/main_full.c
index 67ccd0a1619179469296807eb251b3e2d9c6a762..ee6fd06b8538cf2de36fde662b843ed4ed3b760b 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_EFM32_Pearl_Gecko_Simplicity_Studio/Full_Demo/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_EFM32_Pearl_Gecko_Simplicity_Studio/Full_Demo/main_full.c
@@ -145,7 +145,7 @@
 /* The period after which the check timer will expire, in ms, provided no errors\r
 have been reported by any of the standard demo tasks.  ms are converted to the\r
 equivalent in ticks using the portTICK_PERIOD_MS constant. */\r
-#define mainNO_ERROR_CHECK_TASK_PERIOD         ( 3000UL / portTICK_PERIOD_MS )\r
+#define mainNO_ERROR_CHECK_TASK_PERIOD         pdMS_TO_TICKS( 3000UL )\r
 \r
 /* The period at which the check timer will expire, in ms, if an error has been\r
 reported in one of the standard demo tasks.  ms are converted to the equivalent\r

diff --git a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c
index 54dc882ab073438a6920d420c7df9cb8c8c18835..48b4ebd87242e7d3a3aa71c5043cd109f57f5391 100644 (file)
--- a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c
+++ b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c
@@ -137,7 +137,7 @@ void vUtilityStartTraceTask( unsigned portBASE_TYPE uxPriority )
        {\r
                portENTER_CRITICAL();\r
                InitUart0();\r
-               portENTER_CRITICAL();\r
+               portEXIT_CRITICAL();\r
                xTaskCreate( vUART0Task, "UART1", configMINIMAL_STACK_SIZE * 3, ( void * ) NULL, uxPriority, &UART_TaskHandle );\r
        }\r
 }\r