]> git.sur5r.net Git - freertos/commitdiff
Tidy up and comment.
authorRichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Wed, 28 Jan 2009 12:21:11 +0000 (12:21 +0000)
committerRichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Wed, 28 Jan 2009 12:21:11 +0000 (12:21 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@629 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h
Demo/NEC_V850ES_Fx3_IAR/LEDtoggle/LED.c [deleted file]
Demo/NEC_V850ES_Fx3_IAR/LEDtoggle/LED.h [deleted file]
Demo/NEC_V850ES_Fx3_IAR/ParTest/ParTest.c
Demo/NEC_V850ES_Fx3_IAR/RegTest.s85
Demo/NEC_V850ES_Fx3_IAR/main.c
Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
Demo/NEC_V850ES_Fx3_IAR/serial/serial.c
Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni
Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt

index 14bc86b30fe6d7f378624d5bce6b11f6abc5d93f..57dc17fa63292a7829598341b47ff3ddcd75b840 100644 (file)
 \r
 /* only include in C files */\r
 #ifdef __IAR_SYSTEMS_ICC__\r
-#pragma language=extended\r
-#pragma system_include\r
-\r
-#include <intrinsics.h>\r
-#include "io70f3385.h"\r
+       #pragma language=extended\r
+       #pragma system_include\r
 \r
+       #include <intrinsics.h>\r
+       #include "io70f3385.h"\r
 #endif  /* __IAR_SYSTEMS_ICC__ */\r
 \r
 /* V850ES/Fx3 Memory Model\r
  */\r
 #define configUSE_PREEMPTION           1\r
 /* only include in C files */\r
+\r
 #ifdef __IAR_SYSTEMS_ICC__\r
 \r
-#define configUSE_IDLE_HOOK                            0\r
-#define configUSE_TICK_HOOK                            0\r
-#define configCPU_CLOCK_HZ                             ( ( unsigned portLONG ) 48000000 )  /* using the external clock source */\r
-#define configTICK_RATE_HZ                             ( ( portTickType ) 1000 )\r
-#define configMAX_PRIORITIES                   ( ( unsigned portBASE_TYPE ) 4 )\r
-#define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 85 )\r
-#define configTOTAL_HEAP_SIZE                  ( (size_t ) ( 60000 ) )\r
-#define configMAX_TASK_NAME_LEN                        ( 10 )\r
-#define configUSE_TRACE_FACILITY               0\r
-#define configUSE_16_BIT_TICKS                 0\r
-#define configIDLE_SHOULD_YIELD                        0\r
-#define configUSE_CO_ROUTINES                  0\r
-#define configUSE_MUTEXES                              1\r
-#define configCHECK_FOR_STACK_OVERFLOW 2\r
-#define configUSE_RECURSIVE_MUTEXES            1\r
-#define configQUEUE_REGISTRY_SIZE              0\r
-#define configUSE_COUNTING_SEMAPHORES  0\r
-\r
-/* Co-routine definitions. */\r
-#define configUSE_CO_ROUTINES                  0\r
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )\r
-\r
-/* Set the following definitions to 1 to include the API function, or zero\r
-to exclude the API function. */\r
-#define INCLUDE_vTaskPrioritySet               1\r
-#define INCLUDE_uxTaskPriorityGet              1\r
-#define INCLUDE_vTaskDelete                            1\r
-#define INCLUDE_vTaskCleanUpResources  0\r
-#define INCLUDE_vTaskSuspend                   1\r
-#define INCLUDE_vTaskDelayUntil                        1\r
-#define INCLUDE_vTaskDelay                             1\r
+       #define configUSE_IDLE_HOOK                             0\r
+       #define configUSE_TICK_HOOK                             0\r
+       #define configCPU_CLOCK_HZ                              ( ( unsigned portLONG ) 48000000 )  /* using the external clock source */\r
+       #define configTICK_RATE_HZ                              ( ( portTickType ) 1000 )\r
+       #define configMAX_PRIORITIES                    ( ( unsigned portBASE_TYPE ) 4 )\r
+       #define configMINIMAL_STACK_SIZE                ( ( unsigned portSHORT ) 85 )\r
+       #define configTOTAL_HEAP_SIZE                   ( (size_t ) ( 60000 ) )\r
+       #define configMAX_TASK_NAME_LEN                 ( 10 )\r
+       #define configUSE_TRACE_FACILITY                0\r
+       #define configUSE_16_BIT_TICKS                  0\r
+       #define configIDLE_SHOULD_YIELD                 0\r
+       #define configUSE_CO_ROUTINES                   0\r
+       #define configUSE_MUTEXES                               1\r
+       #define configCHECK_FOR_STACK_OVERFLOW  2\r
+       #define configUSE_RECURSIVE_MUTEXES             1\r
+       #define configQUEUE_REGISTRY_SIZE               0\r
+       #define configUSE_COUNTING_SEMAPHORES   0\r
+\r
+       /* Co-routine definitions. */\r
+       #define configUSE_CO_ROUTINES                   0\r
+       #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )\r
+\r
+       /* Set the following definitions to 1 to include the API function, or zero\r
+       to exclude the API function. */\r
+       #define INCLUDE_vTaskPrioritySet                1\r
+       #define INCLUDE_uxTaskPriorityGet               1\r
+       #define INCLUDE_vTaskDelete                             1\r
+       #define INCLUDE_vTaskCleanUpResources   0\r
+       #define INCLUDE_vTaskSuspend                    1\r
+       #define INCLUDE_vTaskDelayUntil                 1\r
+       #define INCLUDE_vTaskDelay                              1\r
 \r
 #endif /* __IAR_SYSTEMS_ICC__ */\r
 \r
diff --git a/Demo/NEC_V850ES_Fx3_IAR/LEDtoggle/LED.c b/Demo/NEC_V850ES_Fx3_IAR/LEDtoggle/LED.c
deleted file mode 100644 (file)
index 739584e..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-/*\r
-       FreeRTOS.org V5.1.1 - Copyright (C) 2003-2008 Richard Barry.\r
-\r
-       This file is part of the FreeRTOS.org distribution.\r
-\r
-       FreeRTOS.org is free software; you can redistribute it and/or modify\r
-       it under the terms of the GNU General Public License as published by\r
-       the Free Software Foundation; either version 2 of the License, or\r
-       (at your option) any later version.\r
-\r
-       FreeRTOS.org is distributed in the hope that it will be useful,\r
-       but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-       GNU General Public License for more details.\r
-\r
-       You should have received a copy of the GNU General Public License\r
-       along with FreeRTOS.org; if not, write to the Free Software\r
-       Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
-\r
-       A special exception to the GPL can be applied should you wish to distribute\r
-       a combined work that includes FreeRTOS.org, without being obliged to provide\r
-       the source code for any proprietary components.  See the licensing section \r
-       of http://www.FreeRTOS.org for full details of how and when the exception\r
-       can be applied.\r
-\r
-    ***************************************************************************\r
-    ***************************************************************************\r
-    *                                                                         *\r
-    * SAVE TIME AND MONEY!  We can port FreeRTOS.org to your own hardware,    *\r
-    * and even write all or part of your application on your behalf.          *\r
-    * See http://www.OpenRTOS.com for details of the services we provide to   *\r
-    * expedite your project.                                                  *\r
-    *                                                                         *\r
-    ***************************************************************************\r
-    ***************************************************************************\r
-\r
-       Please ensure to read the configuration and relevant port sections of the\r
-       online documentation.\r
-\r
-       http://www.FreeRTOS.org - Documentation, latest information, license and \r
-       contact details.\r
-\r
-       http://www.SafeRTOS.com - A version that is certified for use in safety \r
-       critical systems.\r
-\r
-       http://www.OpenRTOS.com - Commercial support, development, porting, \r
-       licensing and training services.\r
-*/\r
-\r
-/**\r
- * This is a simple LED toggle test for the V850ES/Fx3.\r
- *\r
- * Creates two task that control one LED each. \r
- *\r
- * The first task toggles a LED with a frequency of 1Hz by using the vTaskDelay \r
- * function. So the task is yielded for 1 seconed after each LED switch.\r
- *\r
- * The second LED also starts with a toggling frequency of 1Hz but this frequency\r
- * can be increased by pushing the switch button conected to pin INTP0. \r
- * When the switch is pushed it is detected by an interrupt. When the interrupt\r
- * occurs a flag is set in the ISR and sent to the third task by using a queue. \r
- * Therefore the  xQueueSendFromISR() function is called from within the ISR to\r
- * write the flag value to the queue. The task uses the xQueueReceive() function\r
- * to read the flag value from the queue.\r
- * If the flag value changed from the last task activation the yield time for the\r
- * second LED is incremented by 100ms. If the yield time reaches a time greater\r
- * then 3 seconds it is set back to 1 second within task 3.\r
- * \r
- * Also a check function is implemented to check if the task still run properly\r
- */\r
-\r
-/* Scheduler include files. */\r
-#include "FreeRTOS.h"\r
-#include "task.h"\r
-\r
-/* Demo program include files. */\r
-#include "LED.h"\r
-#include "queue.h"\r
-#include "print.h"\r
-\r
-#define LEDToggleSTACK_SIZE (( unsigned portSHORT ) configMINIMAL_STACK_SIZE)\r
-#define SwitchSTACK_SIZE    (( unsigned portSHORT ) configMINIMAL_STACK_SIZE)\r
-#define LED_NUMBER_OF_TASKS   2 \r
-\r
-/* LED toggle wait time and check definitions */\r
-static portTickType LED1_Wait_Time   = 1000;\r
-static portTickType LED2_Wait_Time   = 1000;\r
-static portTickType SWITCH_Wait_Time = 50;\r
-\r
-/* Task function prototypes */\r
-static void vLEDToggleTask1  ( void *pvParameters );\r
-static void vLEDToggleTask2  ( void *pvParameters );\r
-static void vSWITCHDelayTask ( void *pvParameters );\r
-\r
-/* Port Initialization for LED's and Switch */\r
-static void prvLEDInit(void);\r
-\r
-/* Switch press counter */\r
-static unsigned portSHORT usClick = 0;\r
-/* Queue used for LED02 toggle*/ \r
-static xQueueHandle xSwitchQueue;\r
-\r
-/*xQUEUE *xLEDQueue;*/ \r
-\r
-static volatile unsigned portSHORT usTask1Check = 0, usTask2Check = 0, usTask3Check = 0, usLEDQueue = 0;\r
-\r
-void vStartLEDToggleTasks( unsigned portBASE_TYPE uxPriority )\r
-{\r
-\r
-const unsigned portBASE_TYPE uxQueueSize = 4;\r
-\r
-        prvLEDInit();\r
-\r
-       /* Create the queue used by the Switch ISR and the second task. */\r
-       xSwitchQueue = xQueueCreate( uxQueueSize, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );\r
-        /* create 2 LED toggle Tasks */\r
-        xTaskCreate(vLEDToggleTask1, "LEDTog1", LEDToggleSTACK_SIZE, ( void * ) &(usTask1Check), uxPriority, NULL );\r
-        xTaskCreate(vLEDToggleTask2, "LEDTog2", LEDToggleSTACK_SIZE, ( void * ) &(usTask2Check), uxPriority, NULL );  \r
-        xTaskCreate(vSWITCHDelayTask, "SWITCH", SwitchSTACK_SIZE, ( void * ) &xSwitchQueue, (uxPriority+1), NULL );  \r
-}\r
-/*---------------------------------------------------------------------------*/\r
-static void vLEDToggleTask1( void *pvParameters)\r
-{\r
-static portCHAR pcLED1old;\r
-static portCHAR LEDcounter1 = 0;\r
-portSHORT sError = pdFALSE;\r
-volatile unsigned portSHORT *pusTaskCheckVariable;\r
-const portCHAR * const pcTaskFailMsg = "ERROR: LED toggle failed.\r\n";\r
-  \r
-        pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;  \r
-        for(;;)\r
-        {\r
-                pcLED1old = LED01;\r
-                LED01 = ~LED01;\r
-                LEDcounter1++;\r
-                vTaskDelay( LED1_Wait_Time );\r
-                /* toggle the LED01 */\r
-                \r
-                if(pcLED1old == LED01)\r
-                {\r
-                        /* an error has occured */\r
-                        vPrintDisplayMessage( &pcTaskFailMsg );\r
-                        sError = pdTRUE;\r
-                }\r
-                \r
-                if(sError != pdTRUE)\r
-                {\r
-                       /* If a LED toggle has been made, increment the check\r
-                       variable so we know this task is still running okay. */\r
-                       ( *pusTaskCheckVariable )++;\r
-                }\r
-        }              \r
-} \r
-/*-----------------------------------------------------------*/\r
-static void vLEDToggleTask2( void *pvParameters)\r
-{\r
-static portCHAR pcLED2old;\r
-portSHORT sError = pdFALSE;\r
-volatile unsigned portSHORT *pusTaskCheckVariable;\r
-const portCHAR * const pcTaskFailMsg = "ERROR: LED toggle failed.\r\n";\r
-  \r
-        pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;  \r
-        for(;;)\r
-        {\r
-                pcLED2old = LED02;\r
-                /* toggle the LED02 */\r
-                LED02 = ~LED02;\r
-                vTaskDelay( LED2_Wait_Time );             \r
-                if(pcLED2old == LED02)\r
-                {\r
-                        /* an error has occured */\r
-                        vPrintDisplayMessage( &pcTaskFailMsg );\r
-                        sError = pdTRUE;\r
-                }\r
-                \r
-                if(sError != pdTRUE)\r
-                {\r
-                       /* If a LED toggle has been made, increment the check\r
-                       variable so we know this task is still running okay. */\r
-                       ( *pusTaskCheckVariable )++;\r
-                }\r
-        }              \r
-} \r
-/*-----------------------------------------------------------*/\r
-\r
-static void vSWITCHDelayTask( void *pvParameters)\r
-{\r
-unsigned portSHORT usData, usDataOld = 0;\r
-xQueueHandle *pxQueue;\r
\r
-        pxQueue = ( xQueueHandle * ) pvParameters;\r
-        for(;;)\r
-        {\r
-                if( xQueueReceive( *pxQueue, &usData, ( portTickType ) 0 ) == pdPASS )\r
-                {\r
-                        if (usData != usDataOld)\r
-                        {\r
-                                LED2_Wait_Time += 100;\r
-                                if(LED2_Wait_Time >= 3000)\r
-                                {\r
-                                    LED2_Wait_Time = 1000;\r
-                                }\r
-                        }\r
-                        usDataOld = usData;\r
-                }\r
-                vTaskDelay( SWITCH_Wait_Time );\r
-                /* increment check variable whenever the task gets active */\r
-                usTask3Check++;\r
-        }              \r
-}\r
-\r
-portBASE_TYPE xAreLEDToggleTaskStillRunning( void )\r
-{\r
-/* \r
- * Keep a history of the check variables so we know if they have been incremented \r
- * since the last call.\r
- */\r
-static unsigned portSHORT usLastTask1Check = 0;\r
-static unsigned portSHORT usLastTask2Check = 0;\r
-static unsigned portSHORT usLastTask3Check = 0;\r
-portBASE_TYPE xReturn = pdTRUE;\r
-\r
-       /* Check the LED toggle tasks are still running by ensuring their check variables \r
-        * are still incrementing. \r
-         */\r
-       if(( usTask1Check == usLastTask1Check )||(usLastTask2Check == usTask2Check)||(usLastTask3Check == usTask3Check))\r
-       {\r
-               /* The check has not incremented so an error exists. */\r
-               xReturn = pdFALSE;\r
-       }\r
-\r
-       usLastTask1Check = usTask1Check;\r
-       usLastTask2Check = usTask2Check;\r
-       usLastTask3Check = usTask3Check;\r
-        \r
-        return xReturn;\r
-}\r
-/*-----------------------------------------------------------*/\r
-\r
-static void prvLEDInit(void)\r
-{\r
-  \r
-       INTR0 = 0x00;\r
-       INTR1 = 0x00;\r
-       INTR3L = 0x00;\r
-       INTR3H = 0x00;\r
-       INTR4 = 0x00;\r
-       INTR6L = 0x00;\r
-       INTR6H = 0x00;\r
-       INTR8 = 0x00;\r
-       INTR9H = 0x00;\r
-       \r
-       INTF0 = 0x00;\r
-       INTF1 = 0x00;\r
-       INTF3L = 0x00;\r
-       INTF3H = 0x00;\r
-       INTF4 = 0x00;\r
-       INTF6L = 0x00;\r
-       INTF6H = 0x00;  \r
-       INTF8 = 0x00;\r
-       INTF9H = 0x00;  \r
-  \r
-/* LED Port Initialization */\r
-//        PCM = 0x00; \r
-       PMCM  = 0xF2;\r
-       PMCCM = 0x00;\r
-\r
-/* Switch Pin Initialization */        \r
-       /* INTP0 Setting */\r
-       PMK0 = 1;       /* INTP0 disable */\r
-       PIF0 = 0;       /* INTP0 IF clear */\r
-       /* Set INTP0 lowest priority */\r
-       PIC0 |= 0x07;\r
-       INTR0 |= 0x00;\r
-       INTF0 |= 0x08;\r
-       /* INTP0 pin set */\r
-       PFC0 &= 0xF7;\r
-        PFCE0 &= 0xF7;\r
-       PMC0 |= 0x08;\r
-       \r
-       PIF0 = 0;               /* INTP0 IF clear */\r
-       PMK0 = 0;               /* INTP0 enable */\r
-}\r
-/*-----------------------------------------------------------*/\r
-\r
-/* Switch ISR */\r
-\r
-#pragma vector=INTP0_vector\r
-__interrupt void MD_INTP0(void)\r
-{\r
-        /* Increment Switch pressed counter */\r
-        usClick++;\r
-        /* Use usClick to signalize a detected Interrupt for the vLEDToggleTask2\r
-         * to toggle the LED02.\r
-         */\r
-        xQueueSendFromISR( xSwitchQueue, &usClick, pdFALSE );\r
-}\r
-/*-----------------------------------------------------------*/
\ No newline at end of file
diff --git a/Demo/NEC_V850ES_Fx3_IAR/LEDtoggle/LED.h b/Demo/NEC_V850ES_Fx3_IAR/LEDtoggle/LED.h
deleted file mode 100644 (file)
index 2440530..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*\r
-       FreeRTOS.org V5.1.1 - Copyright (C) 2003-2008 Richard Barry.\r
-\r
-       This file is part of the FreeRTOS.org distribution.\r
-\r
-       FreeRTOS.org is free software; you can redistribute it and/or modify\r
-       it under the terms of the GNU General Public License as published by\r
-       the Free Software Foundation; either version 2 of the License, or\r
-       (at your option) any later version.\r
-\r
-       FreeRTOS.org is distributed in the hope that it will be useful,\r
-       but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-       GNU General Public License for more details.\r
-\r
-       You should have received a copy of the GNU General Public License\r
-       along with FreeRTOS.org; if not, write to the Free Software\r
-       Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
-\r
-       A special exception to the GPL can be applied should you wish to distribute\r
-       a combined work that includes FreeRTOS.org, without being obliged to provide\r
-       the source code for any proprietary components.  See the licensing section \r
-       of http://www.FreeRTOS.org for full details of how and when the exception\r
-       can be applied.\r
-\r
-    ***************************************************************************\r
-    ***************************************************************************\r
-    *                                                                         *\r
-    * SAVE TIME AND MONEY!  We can port FreeRTOS.org to your own hardware,    *\r
-    * and even write all or part of your application on your behalf.          *\r
-    * See http://www.OpenRTOS.com for details of the services we provide to   *\r
-    * expedite your project.                                                  *\r
-    *                                                                         *\r
-    ***************************************************************************\r
-    ***************************************************************************\r
-\r
-       Please ensure to read the configuration and relevant port sections of the\r
-       online documentation.\r
-\r
-       http://www.FreeRTOS.org - Documentation, latest information, license and \r
-       contact details.\r
-\r
-       http://www.SafeRTOS.com - A version that is certified for use in safety \r
-       critical systems.\r
-\r
-       http://www.OpenRTOS.com - Commercial support, development, porting, \r
-       licensing and training services.\r
-*/\r
-\r
-#ifndef LEDTOGGLE_TASKS_H\r
-#define LEDTOGGLE_TASKS_H\r
-\r
-void vStartLEDToggleTasks( unsigned portBASE_TYPE uxPriority );\r
-portBASE_TYPE xAreLEDToggleTaskStillRunning( void );\r
-/* LED Pin Configuration */\r
-static void prvLEDinit( void );\r
-\r
-#define LED01   PCM_bit.no3\r
-#define LED02   PCM_bit.no2\r
-\r
-#endif
\ No newline at end of file
index 5730903ec4fe70d5a9280bc884fa4337a3d6cc80..71ea53168b6cf71c63535c8281111402f0dc7f76 100644 (file)
        licensing and training services.\r
 */\r
 \r
-/*\r
-       Changes from V2.5.2\r
-\r
-       + All LED's are turned off to start.\r
-*/\r
-\r
+/*-----------------------------------------------------------\r
+ * Simple parallel port IO routines.\r
+ *-----------------------------------------------------------*/\r
 \r
+/* FreeRTOS includes. */\r
 #include "FreeRTOS.h"\r
-#include "task.h"\r
 #include "partest.h"\r
 \r
+\r
 #define partstNUM_LEDs 4\r
 \r
 #define LED0_MASK              ( ( unsigned short ) 0x08 )\r
@@ -68,9 +66,6 @@
 static const unsigned short xLEDs[ partstNUM_LEDs ] = { LED0_MASK, LED1_MASK, LED2_MASK, LED3_MASK };\r
 \r
 \r
-/*-----------------------------------------------------------\r
- * Simple parallel port IO routines.\r
- *-----------------------------------------------------------*/\r
 \r
 void vParTestInitialise( void )\r
 {\r
index 97d349496e3cce00a84c4ab5e528e16954205f83..bb65ac034095967c55255ae7f1d2a49dde82cb4e 100644 (file)
@@ -1,4 +1,4 @@
-;      FreeRTOS.org V5.0.2 - Copyright (C) 2003-2008 Richard Barry.\r
+;      FreeRTOS.org V5.1.1 - Copyright (C) 2003-2009 Richard Barry.\r
 ;\r
 ;      This file is part of the FreeRTOS.org distribution.\r
 ;\r
 \r
        EXTERN  vRegTestFailed\r
 \r
+\r
+\r
+;\r
+; The RegTest tasks as described in the comments at the top of main().\r
+;\r
+\r
+\r
 ;------------------------------------------------------------------------------\r
 \r
 ; Functions implemented in this file\r
index 38a0864f3f1d6726f79c198ebb8c880436fed75a..80699aca5e7dfab672b60b29fda18ae0624f092d 100644 (file)
        licensing and training services.\r
 */\r
 \r
+/*\r
+ * Creates all the demo application tasks, then starts the scheduler.  The WEB\r
+ * documentation provides more details of the standard demo application tasks.\r
+ * In addition to the standard demo tasks, the following tasks and tests are\r
+ * defined and/or created within this file:\r
+ *\r
+ * "Check" task -  This only executes every three seconds but has a high priority\r
+ * to ensure it gets processor time.  Its main function is to check that all the\r
+ * standard demo tasks are still operational.  If everything is running as\r
+ * expected then the check task will toggle an LED every 3 seconds.  An error\r
+ * being discovered in any task will cause the toggle rate to increase to 500ms.\r
+ *\r
+ * "Reg test" tasks - These fill the registers with known values, then check\r
+ * that each register still contains its expected value.  Each task uses\r
+ * different values.  The tasks run with very low priority so get preempted very\r
+ * frequently.  A register containing an unexpected value is indicative of an\r
+ * error in the context switching mechanism.\r
+ *\r
+ */\r
+\r
+/* Standard include files. */\r
 #include <stdlib.h>\r
 #include <string.h>\r
 \r
 #define mainGEN_QUEUE_TASK_PRIORITY                    ( tskIDLE_PRIORITY )\r
 #define mainCOMTEST_PRIORITY                           ( tskIDLE_PRIORITY + 1 )\r
 \r
+/* Passed into the check task just as a test that the parameter passing\r
+mechanism is working correctly. */\r
 #define mainCHECK_PARAMETER                                    ( ( void * ) 0x12345678 )\r
 \r
 /* The period between executions of the check task. */\r
 #define mainNO_ERROR_DELAY             ( ( portTickType ) 3000 / portTICK_RATE_MS  )\r
 #define mainERROR_DELAY                        ( ( portTickType ) 500 / portTICK_RATE_MS )\r
 \r
+/* The LEDs used by the demos. */\r
 #define mainCHECK_TASK_LED             ( 3 )\r
 #define mainCOMTEST_LED                        ( 5 )\r
 \r
+/* The baud rate used by the comtest task. */\r
 #define mainBAUD_RATE                  ( 9600 )\r
 \r
+/*-----------------------------------------------------------*/\r
 \r
-/* The task function for the "Check" task. */\r
+/* The implementation of the 'check' task as described at the top of this file. */\r
 static void prvCheckTask( void *pvParameters );\r
 \r
-/* low level initialization prototype */\r
+/* Called by the startup code to initialise the run time system. */\r
 unsigned portCHAR __low_level_init(void);\r
 \r
+/* Just sets up the LED outputs.  Most generic setup is done in \r
+__low_level_init(). */\r
 static void prvSetupHardware( void );\r
 \r
+/* The RegTest functions as described at the top of this file. */\r
 extern void vRegTest1( void *pvParameters );\r
 extern void vRegTest2( void *pvParameters );\r
 \r
-/*-----------------------------------------------------------*/\r
-\r
+/* A variable that will get set to fail if a RegTest task finds an error.  The\r
+variable is inspected by the 'Check' task. */\r
 static volatile portLONG lRegTestStatus = pdPASS;\r
 \r
-void vRegTestFailed( void )\r
-{\r
-       lRegTestStatus = pdFAIL;\r
-       \r
-       /* Do not return from here as the reg test tasks clobber all registers so\r
-       function calls may not function correctly. */\r
-       for( ;; );\r
-}\r
+/*-----------------------------------------------------------*/\r
 \r
+/* Create all the demo tasks then start the scheduler. */\r
 void main( void )\r
 {\r
+       /* Just sets up the LED outputs. */\r
        prvSetupHardware();\r
 \r
+       /* Standard demo tasks. */\r
        vStartLEDFlashTasks( mainFLASH_PRIORITY );\r
        vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
        vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
@@ -130,9 +155,10 @@ void main( void )
        vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
        vAltStartComTestTasks( mainCOMTEST_PRIORITY, mainBAUD_RATE, mainCOMTEST_LED );\r
 \r
-       /* Create the tasks defined within this file. */\r
+       /* Create the check task as described at the top of this file. */\r
        xTaskCreate( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, mainCHECK_PARAMETER, mainCHECK_TASK_PRIORITY, NULL );\r
 \r
+       /* Create the RegTest tasks as described at the top of this file. */\r
        xTaskCreate( vRegTest1, "Reg1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
        xTaskCreate( vRegTest2, "Reg2", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
 \r
@@ -160,6 +186,8 @@ portTickType xDelayPeriod = mainNO_ERROR_DELAY, xLastWakeTime;
                xDelayPeriod = mainERROR_DELAY;\r
        }\r
 \r
+       /* Initialise xLastWakeTime before it is used.  After this point it is not\r
+       written to directly. */\r
        xLastWakeTime = xTaskGetTickCount();\r
        \r
        /* Cycle for ever, delaying then checking all the other tasks are still\r
@@ -287,14 +315,32 @@ unsigned portCHAR psval = 0;
 \r
        return pdTRUE;\r
 }\r
+/*-----------------------------------------------------------*/\r
 \r
 static void prvSetupHardware( void )\r
 {\r
+       /* Setup the LED outputs. */\r
        vParTestInitialise();\r
+\r
+       /* Any additional hardware configuration can be added here. */\r
 }\r
+/*-----------------------------------------------------------*/\r
 \r
 void vApplicationStackOverflowHook( void )\r
 {\r
+       /* This will be called if a task overflows its stack.  pxCurrentTCB\r
+       can be inspected to see which is the offending task. */\r
        for( ;; );\r
 }\r
+/*-----------------------------------------------------------*/\r
 \r
+void vRegTestFailed( void )\r
+{\r
+       /* Called by the RegTest tasks if an error is found.  lRegTestStatus is\r
+       inspected by the check task. */\r
+       lRegTestStatus = pdFAIL;\r
+       \r
+       /* Do not return from here as the reg test tasks clobber all registers so\r
+       function calls may not function correctly. */\r
+       for( ;; );\r
+}\r
index 4b1c1ff7ea2f9815cfff97a58f1ec45735c779d4..7a2dda22aec8f2a9dec2157d55a7cdaeb37812a1 100644 (file)
@@ -17,7 +17,7 @@
         <debug>1</debug>\r
         <option>\r
           <name>GMemoryModel</name>\r
-          <state>1</state>\r
+          <state>2</state>\r
         </option>\r
         <option>\r
           <name>GUseShort</name>\r
         </option>\r
         <option>\r
           <name>RTConfigPath</name>\r
-          <state>$TOOLKIT_DIR$\LIB\dl85esnn.h</state>\r
+          <state>$TOOLKIT_DIR$\LIB\dl85etnn.h</state>\r
         </option>\r
         <option>\r
           <name>RTLibraryPath</name>\r
-          <state>$TOOLKIT_DIR$\LIB\dl85esnn.r85</state>\r
+          <state>$TOOLKIT_DIR$\LIB\dl85etnn.r85</state>\r
         </option>\r
         <option>\r
           <name>GRuntimeLibSelectSlave</name>\r
index 8477c8d3068661f6df9f539e7f738b5a716e563e..59007b3473fb2a2396e5bfcefeab084cad961508 100644 (file)
@@ -49,6 +49,9 @@
 \r
 /*\r
        BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER FOR UART0.\r
+\r
+       *NOTE* - This file is designed to test some of the RTOS features - it is\r
+       not intended to represent an efficient implementation!\r
 */\r
 \r
 /* Standard includes. */\r
 #include "serial.h"\r
 \r
 \r
-\r
+/* Hardware specifics. */\r
 #define serRX_DATA_PIN         ( 0x01 )\r
 #define serTX_DATA_PIN         ( 0x02 )\r
-\r
 #define serCLOCK_Fxx_DIV_8             0x03\r
 #define serUPWR                ( 0x80 )\r
 #define serUTXE                ( 0x40 )\r
@@ -87,12 +89,10 @@ static xQueueHandle xCharsForTx;
 \r
 /*-----------------------------------------------------------*/\r
 \r
-/* Interrupt entry point written in the assembler file serialISR.s79. */\r
+/* Interrupt entry point written in the assembler file serialISR.s85. */\r
 extern void vSerialISREntry( void );\r
 \r
-/* The interrupt service routine - called from the assembly entry point. */\r
-void vSerialISR( void );\r
-\r
+/* Flag to indicate whether or not there are characters already queued to send. */\r
 static volatile unsigned long ulTxInProgress = pdFALSE;\r
 \r
 /*-----------------------------------------------------------*/\r
@@ -103,7 +103,6 @@ static volatile unsigned long ulTxInProgress = pdFALSE;
 xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
 {\r
 xComPortHandle xReturn = serHANDLE;\r
-extern void ( vUART_ISR )( void );\r
 const unsigned portLONG ulFuclk = ( configCPU_CLOCK_HZ / 2 ) / 8UL;\r
 \r
        /* Create the queues used to hold Rx and Tx characters. */\r
@@ -127,8 +126,9 @@ const unsigned portLONG ulFuclk = ( configCPU_CLOCK_HZ / 2 ) / 8UL;
                        /* Enable, n81. */                      \r
                        UD0CTL0 = ( serUPWR | serUTXE | serURXE | serUCL | serLSB );\r
                        \r
-                       UD0TIC  = 0x07;                                                 /* UARTA0 transmit enable interrupt request signal clear, mask release, priority level 7 set */\r
-                       UD0RIC  = 0x07;                                                 /* UARTA0 receive end interrupt request signal clear, mask release, priority level 7 set */                     \r
+                       /* Enable interrupts for both Rx and Tx. */\r
+                       UD0TIC  = 0x07;\r
+                       UD0RIC  = 0x07;\r
                        \r
                        ulTxInProgress = pdFALSE;\r
                }\r
@@ -193,6 +193,8 @@ portBASE_TYPE xReturn = pdPASS;
 \r
        portENTER_CRITICAL();\r
        {\r
+               /* There are currently no characters queued up to send so write the\r
+               character directly to the UART. */\r
                if( ulTxInProgress == pdFALSE )\r
                {\r
                        UD0TX = cOutChar;\r
@@ -200,6 +202,8 @@ portBASE_TYPE xReturn = pdPASS;
                }\r
                else\r
                {\r
+                       /* The UART is already busy so write the character to the Tx queue.\r
+                       The queue is drained from within the Tx interrupt. */\r
                        if( xQueueSend( xCharsForTx, &cOutChar, xBlockTime ) != pdPASS )\r
                        {\r
                                xReturn = pdFAIL;\r
@@ -218,32 +222,46 @@ void vSerialClose( xComPortHandle xPort )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
+/* Tx interrupt handler.  This is called from the asm file wrapper. */\r
 void vUARTTxISRHandler( void )\r
 {\r
 char cChar;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
+       /* Are there any more characters queue to transmit? */\r
        if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )\r
        {\r
+               /* Send the next character. */\r
                UD0TX = cChar;\r
        }\r
        else\r
        {\r
+               /* The UART is no longer active. */\r
                ulTxInProgress = pdFALSE;\r
        }\r
        \r
+       /* If reading a character from the Rx queue caused a task to unblock, and\r
+       the unblocked task has a priority higher than the currently running task,\r
+       then xHigherPriorityTaskWoken will have been set to true and a context\r
+       switch should occur now. */\r
        portYIELD_FROM_ISR( xHigherPriorityTaskWoken );\r
 }\r
+/*-----------------------------------------------------------*/\r
 \r
-\r
+/* Rx interrupt handler.  This is called from the asm file wrapper. */\r
 void vUARTRxISRHandler( void )\r
 {\r
 portCHAR cChar;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
+       /* Send the received character to the Rx queue. */\r
        cChar = UD0RX;\r
        xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );\r
        \r
+       /* If sending a character to the Tx queue caused a task to unblock, and\r
+       the unblocked task has a priority higher than the currently running task,\r
+       then xHigherPriorityTaskWoken will have been set to true and a context\r
+       switch should occur now. */\r
        portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); \r
 }\r
 \r
index f97508dbf0b12ef95a7bf94f9f42ca43df0f3237..6e3d017201b96c539b7b4ae9998738d4c0c0ae10 100644 (file)
           \r
           \r
           \r
-        <Column0>93</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>254</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
       <Disassembly>\r
         \r
         \r
       <PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><MixedMode>1</MixedMode><CodeCovShow>0</CodeCovShow></Disassembly>\r
-    <Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><Watch><Format><struct_types/><watch_formats/></Format><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>156</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3></Watch><Memory><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><FindDirection>1</FindDirection><FindAsHex>0</FindAsHex></Memory><Find-in-Files><ColumnWidth0>580</ColumnWidth0><ColumnWidth1>82</ColumnWidth1><ColumnWidth2>994</ColumnWidth2></Find-in-Files></Static>\r
+    <Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><Watch><Format><struct_types/><watch_formats/></Format><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>156</Column0><Column1>105</Column1><Column2>166</Column2><Column3>100</Column3></Watch><Memory><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><FindDirection>1</FindDirection><FindAsHex>0</FindAsHex></Memory><Find-in-Files><ColumnWidth0>580</ColumnWidth0><ColumnWidth1>82</ColumnWidth1><ColumnWidth2>994</ColumnWidth2></Find-in-Files></Static>\r
     <Windows>\r
       \r
       \r
@@ -43,7 +43,7 @@
           </Tab>\r
         <Tab><Identity>TabID-20969-27878</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-27119-4411</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>\r
+      <SelectedTab>3</SelectedTab></Wnd0><Wnd2>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-11505-1326</Identity>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd1><Wnd2><Tabs><Tab><Identity>TabID-27476-15253</Identity><TabName>Register</TabName><Factory>Register</Factory><Session><REG1>0</REG1><REG2>0</REG2><Group>0</Group><States>2</States><State0>EIPSW</State0><State1>PSW</State1></Session></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd2></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-15636-29532</Identity><TabName>Watch</TabName><Factory>Watch</Factory><Session><Expressions><Expression><Expression>xStart</Expression></Expression><Expression><Expression>pxBlock</Expression></Expression></Expressions><TabId>0</TabId><Column0>156</Column0><Column1>105</Column1><Column2>166</Column2><Column3>100</Column3></Session></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\serial\serialISR.s85</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>1116</SelStart><SelEnd>1116</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\serial\serial.c</Filename><XPos>0</XPos><YPos>108</YPos><SelStart>4801</SelStart><SelEnd>4801</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\comtest.c</Filename><XPos>0</XPos><YPos>165</YPos><SelStart>7455</SelStart><SelEnd>7455</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85</Filename><XPos>0</XPos><YPos>125</YPos><SelStart>3960</SelStart><SelEnd>3960</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\portmacro.h</Filename><XPos>0</XPos><YPos>116</YPos><SelStart>5010</SelStart><SelEnd>5015</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\include\queue.h</Filename><XPos>0</XPos><YPos>719</YPos><SelStart>25052</SelStart><SelEnd>25072</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\queue.c</Filename><XPos>1</XPos><YPos>984</YPos><SelStart>33540</SelStart><SelEnd>33540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\portasm.s85</Filename><XPos>0</XPos><YPos>237</YPos><SelStart>9109</SelStart><SelEnd>9109</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\include\task.h</Filename><XPos>0</XPos><YPos>102</YPos><SelStart>3906</SelStart><SelEnd>3924</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>69</YPos><SelStart>3431</SelStart><SelEnd>3431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\BlockQ.c</Filename><XPos>0</XPos><YPos>171</YPos><SelStart>9651</SelStart><SelEnd>9651</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>1486</YPos><SelStart>46919</SelStart><SelEnd>46919</SelEnd></Tab><ActiveTab>12</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>100</YPos><SelStart>4336</SelStart><SelEnd>4336</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\portmacro.h</Filename><XPos>0</XPos><YPos>114</YPos><SelStart>4996</SelStart><SelEnd>4996</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\serial\serial.c</Filename><XPos>0</XPos><YPos>213</YPos><SelStart>7666</SelStart><SelEnd>7666</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>104</YPos><SelStart>4379</SelStart><SelEnd>4379</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c</Filename><XPos>0</XPos><YPos>65</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\portasm.s85</Filename><XPos>0</XPos><YPos>80</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_2.c</Filename><XPos>0</XPos><YPos>216</YPos><SelStart>9232</SelStart><SelEnd>9239</SelEnd></Tab><ActiveTab>5</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c</Filename><XPos>0</XPos><YPos>72</YPos><SelStart>3690</SelStart><SelEnd>3690</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>1767</YPos><SelStart>55191</SelStart><SelEnd>55191</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>45</YPos><SelStart>2688</SelStart><SelEnd>2688</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-00aa9b30><key>iaridepm.enu1</key></Toolbar-00aa9b30><Toolbar-03abbe58><key>debuggergui.enu1</key></Toolbar-03abbe58></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>183</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>110119</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>525</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>313690</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00aa9b60><key>iaridepm.enu1</key></Toolbar-00aa9b60><Toolbar-02f1e380><key>debuggergui.enu1</key></Toolbar-02f1e380></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>344</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>205952</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>528</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>315476</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd3></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Project>\r
 \r
index 385b3b7b700980167c50bc66179331219adf78f8..3ac16814fe58a5cad5bea3c843fb4cb387cbb6d5 100644 (file)
@@ -236,8 +236,7 @@ Category=_ 0
 LoggingEnabled=_ 0\r
 LogFile=_ ""\r
 [Breakpoints]\r
-Bp0=_ "STD_CODE" "{C:\E\Dev\FreeRTOS\WorkingCopy3\Source\queue.c}.998.8@1" 1 0 0 0 "" 0 ""\r
-Count=1\r
+Count=0\r
 [TraceHelper]\r
 Enabled=1\r
 ShowSource=1\r
index 496deec93e0aedc0fa5f9650b37a0ec4f698869e..6975cc0af410aa49567e74368d49aa03e0358915 100644 (file)
@@ -17,7 +17,7 @@
     <Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build><Debug-Log/><TerminalIO/></Static>\r
     <Windows>\r
       \r
-    <Wnd0>\r
+    <Wnd2>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-30435-11592</Identity>\r
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>rtosdemo</ExpandedNode><ExpandedNode>rtosdemo/demo source</ExpandedNode><ExpandedNode>rtosdemo/demo source/Standard Demo Tasks</ExpandedNode><ExpandedNode>rtosdemo/kernel source</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>rtosdemo</ExpandedNode><ExpandedNode>rtosdemo/demo source</ExpandedNode><ExpandedNode>rtosdemo/kernel source</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-2785-875</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-21438-1140</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-21061-4073</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-2785-875</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-21438-1140</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-21061-4073</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\serial\serialISR.s85</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>1116</SelStart><SelEnd>1116</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\serial\serial.c</Filename><XPos>0</XPos><YPos>108</YPos><SelStart>4801</SelStart><SelEnd>4801</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\comtest.c</Filename><XPos>0</XPos><YPos>165</YPos><SelStart>7455</SelStart><SelEnd>7455</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85</Filename><XPos>0</XPos><YPos>125</YPos><SelStart>3960</SelStart><SelEnd>3960</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\portmacro.h</Filename><XPos>0</XPos><YPos>116</YPos><SelStart>5010</SelStart><SelEnd>5015</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\include\queue.h</Filename><XPos>0</XPos><YPos>719</YPos><SelStart>25052</SelStart><SelEnd>25072</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\queue.c</Filename><XPos>1</XPos><YPos>984</YPos><SelStart>33540</SelStart><SelEnd>33540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\portasm.s85</Filename><XPos>0</XPos><YPos>237</YPos><SelStart>9109</SelStart><SelEnd>9109</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\include\task.h</Filename><XPos>0</XPos><YPos>102</YPos><SelStart>3906</SelStart><SelEnd>3924</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>69</YPos><SelStart>3431</SelStart><SelEnd>3431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\BlockQ.c</Filename><XPos>0</XPos><YPos>171</YPos><SelStart>9651</SelStart><SelEnd>9651</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>1486</YPos><SelStart>46919</SelStart><SelEnd>46919</SelEnd></Tab><ActiveTab>12</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>100</YPos><SelStart>4336</SelStart><SelEnd>4336</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane/><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-00aa9b30><key>iaridepm.enu1</key></Toolbar-00aa9b30></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>314</Right><x>-2</x><y>-2</y><xscreen>316</xscreen><yscreen>205</yscreen><sizeHorzCX>188095</sizeHorzCX><sizeHorzCY>208758</sizeHorzCY><sizeVertCX>188095</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00aa9b60><key>iaridepm.enu1</key></Toolbar-00aa9b60></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>314</Right><x>-2</x><y>-2</y><xscreen>316</xscreen><yscreen>205</yscreen><sizeHorzCX>188095</sizeHorzCX><sizeHorzCY>208758</sizeHorzCY><sizeVertCX>188095</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r