Move SmartFusion configuration options into FreeRTOSConfig.h.

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

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Blinky-Demo/main_blinky.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Blinky-Demo/main_blinky.c
index f399c9021bd5920fb5882363223e841672250e7c..d155146aaa58a31686e4c2d23df5c2a712a3c17f 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Blinky-Demo/main_blinky.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Blinky-Demo/main_blinky.c
@@ -75,9 +75,10 @@
 /******************************************************************************\r
  * NOTE 1:  This project provides two demo applications.  A simple blinky style\r
  * project, and a more comprehensive test and demo application.  The\r
- * mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting in main.c is used to select\r
- * between the two.  See the notes on using mainCREATE_SIMPLE_BLINKY_DEMO_ONLY\r
- * in main.c.  This file implements the simply blinky style version.\r
+ * configCREATE_SIMPLE_BLINKY_DEMO_ONLY setting in FreeRTOSConifg.h is used to\r
+ * select between the two.  See the notes on using\r
+ * configCREATE_SIMPLE_BLINKY_DEMO_ONLY in main.c.  This file implements the\r
+ * simply blinky style version.\r
  *\r
  * NOTE 2:  This file only contains the source code that is specific to the\r
  * basic demo.  Generic functions, such FreeRTOS hook functions, and functions\r
@@ -148,7 +149,7 @@ static void prvQueueSendTask( void *pvParameters );
 \r
 /*\r
  * Called by main() to create the simply blinky style application if\r
- * mainCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 1.\r
+ * configCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 1.\r
  */\r
 void main_blinky( void );\r
 \r

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h
index 53c13135f23838a2dc472fbbd6d9a984ca7322b3..64d4d9ee58e87bb82bdc203d2757528d004e8746 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h
@@ -83,6 +83,20 @@
  */\r
 //#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.\r
 \r
+/*\r
+ * Set configCREATE_SIMPLE_BLINKY_DEMO_ONLY to one to run the simple blinky demo,\r
+ * or 0 to run the more comprehensive test and demo application.\r
+ */\r
+#define configCREATE_SIMPLE_BLINKY_DEMO_ONLY   0\r
+\r
+/*\r
+ * Set configBUILD_FOR_DEVELOPMENT_KIT to 1 to run the demo on the SmartFusion2\r
+ * development kit, or 0 to run the demo on the SmartFusion2 starter kit.  Refer\r
+ * to the documentation page for this demo on the FreeRTOS.org website for\r
+ * instruction on switching between the two hardware platforms.
+ */\r
+#define configBUILD_FOR_DEVELOPMENT_KIT 0\r
+\r
 /*-----------------------------------------------------------\r
  * Application specific definitions.\r
  *\r

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/UARTCommandConsole.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/UARTCommandConsole.c
index 7115e6ff42a2867a303a6a85a38f663c395faca0..19d758c1fc37a89fb5bedd1264a69c8d5e2157ed 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/UARTCommandConsole.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/UARTCommandConsole.c
@@ -106,8 +106,13 @@ static const uint8_t * const pcEndOfOutputMessage = ( uint8_t * ) "\r\n[Press EN
 static const uint8_t * const pcNewLine = ( uint8_t * ) "\r\n";\r
 \r
 /* The UART used by the CLI. */\r
-static const mss_uart_instance_t * const pxUART = &g_mss_uart0;\r
-static const IRQn_Type xUART_IRQ = UART0_IRQn;\r
+#if configBUILD_FOR_DEVELOPMENT_KIT == 1\r
+       static const mss_uart_instance_t * const pxUART = &g_mss_uart1;\r
+       static const IRQn_Type xUART_IRQ = UART1_IRQn;\r
+#else\r
+       static const mss_uart_instance_t * const pxUART = &g_mss_uart0;\r
+       static const IRQn_Type xUART_IRQ = UART0_IRQn;\r
+#endif\r
 \r
 /* Because characters are received slowly (at the speed somebody can type) then\r
 it is ok to pass received characters from the Rx interrupt to the task on a\r

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/main_full.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/main_full.c
index 16f4eadcc0e28bd17c4702422572d58341c52853..61cacb91c969b8f647835d0c1ea556f0df098b12 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/main_full.c
@@ -75,9 +75,10 @@
 /******************************************************************************\r
  * NOTE 1:  This project provides two demo applications.  A simple blinky style\r
  * project, and a more comprehensive test and demo application.  The\r
- * mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting in main.c is used to select\r
- * between the two.  See the notes on using mainCREATE_SIMPLE_BLINKY_DEMO_ONLY\r
- * in main.c.  This file implements the comprehensive test and demo version.\r
+ * configCREATE_SIMPLE_BLINKY_DEMO_ONLY setting in FreeRTOSConifg.h is used to\r
+ * select between the two.  See the notes on using\r
+ * configCREATE_SIMPLE_BLINKY_DEMO_ONLY in mainc.  This file implements the\r
+ * comprehensive test and demo version.\r
  *\r
  * NOTE 2:  This file only contains the source code that is specific to the\r
  * full demo.  Generic functions, such FreeRTOS hook functions, and functions\r

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/ParTest.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/ParTest.c
index 9119fe5910650369af4c6dd340e3c8ed3938ccb9..1c458302e481ec191bc0736c15958be032a34a5d 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/ParTest.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/ParTest.c
@@ -94,7 +94,11 @@
 /* Remember the state of the outputs for easy toggling. */\r
 static unsigned char ucPortState = 0;\r
 \r
-static const mss_gpio_id_t ucLEDs[ partstNUM_LEDS ] = { MSS_GPIO_0, MSS_GPIO_1 };\r
+#if configBUILD_FOR_DEVELOPMENT_KIT == 1\r
+       static const mss_gpio_id_t ucLEDs[ partstNUM_LEDS ] = { MSS_GPIO_14, MSS_GPIO_15 };\r
+#else\r
+       static const mss_gpio_id_t ucLEDs[ partstNUM_LEDS ] = { MSS_GPIO_0, MSS_GPIO_1 };\r
+#endif\r
 \r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/main.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/main.c
index e96a299f32a653a629cb3087d16256e3e681171f..4b37eb57d6bf746faa96679f711cb71459c0f149 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/main.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/main.c
@@ -75,10 +75,10 @@
 /******************************************************************************\r
  * This project provides two demo applications.  A simple blinky style project,\r
  * and a more comprehensive test and demo application.  The\r
- * mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting (defined in this file) is used to\r
- * select between the two.  The simply blinky demo is implemented and described\r
- * in main_blinky.c.  The more comprehensive test and demo application is\r
- * implemented and described in main_full.c.\r
+ * configCREATE_SIMPLE_BLINKY_DEMO_ONLY setting (defined in FreeRTOSConfig.h) is\r
+ * used to select between the two.  The simply blinky demo is implemented and\r
+ * described in main_blinky.c.  The more comprehensive test and demo application\r
+ * is implemented and described in main_full.c.\r
  *\r
  * This file implements the code that is not demo specific, including the\r
  * hardware setup and FreeRTOS hook functions.\r
@@ -96,18 +96,14 @@
 function. */\r
 #include "partest.h"\r
 \r
-/* Set mainCREATE_SIMPLE_BLINKY_DEMO_ONLY to one to run the simple blinky demo,\r
-or 0 to run the more comprehensive test and demo application. */\r
-#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY     0\r
-\r
 /*\r
  * Set up the hardware ready to run this demo.\r
  */\r
 static void prvSetupHardware( void );\r
 \r
 /*\r
- * main_blinky() is used when mainCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 1.\r
- * main_full() is used when mainCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 0.\r
+ * main_blinky() is used when configCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 1.\r
+ * main_full() is used when configCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 0.\r
  */\r
 extern void main_blinky( void );\r
 extern void main_full( void );\r
@@ -128,9 +124,9 @@ int main( void )
        /* Prepare the hardware to run this demo. */\r
        prvSetupHardware();\r
 \r
-       /* The mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting is described at the top\r
+       /* The configCREATE_SIMPLE_BLINKY_DEMO_ONLY setting is described at the top\r
        of this file. */\r
-       #if mainCREATE_SIMPLE_BLINKY_DEMO_ONLY == 1\r
+       #if configCREATE_SIMPLE_BLINKY_DEMO_ONLY == 1\r
        {\r
                main_blinky();\r
        }\r
@@ -182,7 +178,7 @@ void vApplicationIdleHook( void )
        function, because it is the responsibility of the idle task to clean up\r
        memory allocated by the kernel to any task that has since been deleted. */\r
 \r
-       #if mainCREATE_SIMPLE_BLINKY_DEMO_ONLY != 1\r
+       #if configCREATE_SIMPLE_BLINKY_DEMO_ONLY != 1\r
        {\r
                /* If the file system is only going to be accessed from one task then\r
                F_FS_THREAD_AWARE can be set to 0 and the set of example files is created\r