Add a few lines to the RX ports that allow the vector to be installed when the FreeRT...

[freertos] / Demo / WIN32-MSVC / main.c

diff --git a/Demo/WIN32-MSVC/main.c b/Demo/WIN32-MSVC/main.c
index a8f09742dde1efa9ecc69a9412499ca930125232..f067143e18b250a23f0987c96c0077060d2db6fb 100644 (file)
--- a/Demo/WIN32-MSVC/main.c
+++ b/Demo/WIN32-MSVC/main.c
@@ -1,38 +1,38 @@
 /*\r
 /*\r

-    FreeRTOS V6.1.0 - Copyright (C) 2010 Real Time Engineers Ltd.\r
+    FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+       \r

 \r
     ***************************************************************************\r
 \r
     ***************************************************************************\r

-    *                                                                         *\r
-    * If you are:                                                             *\r
-    *                                                                         *\r
-    *    + New to FreeRTOS,                                                   *\r
-    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
-    *    + Looking for basic training,                                        *\r
-    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
-    *                                                                         *\r
-    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
-    *                                                                         *\r
-    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
-    *                  http://www.FreeRTOS.org/Documentation                  *\r
-    *                                                                         *\r
-    * A pdf reference manual is also available.  Both are usually delivered   *\r
-    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
-    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
-    * exceptional circumstances).  Thank you for your support!                *\r
-    *                                                                         *\r
+     *                                                                       *\r
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
+     *    Complete, revised, and edited pdf reference manuals are also       *\r
+     *    available.                                                         *\r
+     *                                                                       *\r
+     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
+     *    ensuring you get running as quickly as possible and with an        *\r
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
+     *    the FreeRTOS project to continue with its mission of providing     *\r
+     *    professional grade, cross platform, de facto standard solutions    *\r
+     *    for microcontrollers - completely free of charge!                  *\r
+     *                                                                       *\r
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
+     *                                                                       *\r
+     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *                                                                       *\r

     ***************************************************************************\r
 \r
     ***************************************************************************\r
 \r

+\r

     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r

-    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
-    a combined work that includes FreeRTOS without being obliged to provide the\r
-    source code for proprietary components outside of the FreeRTOS kernel.\r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+    >>>NOTE<<< The modification to the GPL is included to allow you to\r
+    distribute a combined work that includes FreeRTOS without being obliged to\r
+    provide the source code for proprietary components outside of the FreeRTOS\r
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r

     more details. You should have received a copy of the GNU General Public\r
     License and the FreeRTOS license exception along with FreeRTOS; if not it\r
     can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
     more details. You should have received a copy of the GNU General Public\r
     License and the FreeRTOS license exception along with FreeRTOS; if not it\r
     can be viewed here: http://www.freertos.org/a00114.html and also obtained\r


@@ -56,12 +56,7 @@
  * -NOTE- The Win32 port is a simulation (or is that emulation?) only!  Do not\r
  * expect to get real time behaviour from the Win32 port or this demo\r
  * application.  It is provided as a convenient development and demonstration\r
  * -NOTE- The Win32 port is a simulation (or is that emulation?) only!  Do not\r
  * expect to get real time behaviour from the Win32 port or this demo\r
  * application.  It is provided as a convenient development and demonstration\r

- * test bed only.  Also, at the time of writing, a method of deleting theads \r
- * has not been implemented, although doing so would be trivial so this\r
- * functionality might be added in at a later date.  At present, calling \r
- * vTaskDelete() will delete the real time task from FreeRTOS but not the Win32\r
- * thread in which the task was executing.  DO NOT CALL vTaskDelete() when using \r
- * the Win32 port!  This was tested using Windows XP on a dual core laptop.\r
+ * test bed only.  This was tested using Windows XP on a dual core laptop.\r

  *\r
  * - READ THE WEB DOCUMENTATION FOR THIS PORT FOR MORE INFORMATION ON USING IT -\r
  *******************************************************************************\r
  *\r
  * - READ THE WEB DOCUMENTATION FOR THIS PORT FOR MORE INFORMATION ON USING IT -\r
  *******************************************************************************\r


@@ -91,11 +86,11 @@
 #include <FreeRTOS.h>\r
 #include "task.h"\r
 #include "queue.h"\r
 #include <FreeRTOS.h>\r
 #include "task.h"\r
 #include "queue.h"\r

+#include "timers.h"\r
+#include "semphr.h"\r

 \r
 /* Standard demo includes. */\r
 \r
 /* Standard demo includes. */\r

-#include "partest.h"\r

 #include "BlockQ.h"\r
 #include "BlockQ.h"\r

-#include "death.h"\r

 #include "integer.h"\r
 #include "semtest.h"\r
 #include "PollQ.h"\r
 #include "integer.h"\r
 #include "semtest.h"\r
 #include "PollQ.h"\r


@@ -103,6 +98,10 @@
 #include "QPeek.h"\r
 #include "recmutex.h"\r
 #include "flop.h"\r
 #include "QPeek.h"\r
 #include "recmutex.h"\r
 #include "flop.h"\r

+#include "TimerDemo.h"\r
+#include "countsem.h"\r
+#include "death.h"\r
+#include "dynamic.h"\r

 \r
 /* Priorities at which the tasks are created. */\r
 #define mainCHECK_TASK_PRIORITY                ( configMAX_PRIORITIES - 1 )\r
 \r
 /* Priorities at which the tasks are created. */\r
 #define mainCHECK_TASK_PRIORITY                ( configMAX_PRIORITIES - 1 )\r


@@ -116,16 +115,18 @@
 #define mainGEN_QUEUE_TASK_PRIORITY    ( tskIDLE_PRIORITY )\r
 #define mainFLOP_TASK_PRIORITY         ( tskIDLE_PRIORITY )\r
 \r
 #define mainGEN_QUEUE_TASK_PRIORITY    ( tskIDLE_PRIORITY )\r
 #define mainFLOP_TASK_PRIORITY         ( tskIDLE_PRIORITY )\r
 \r

-/* Stack sizes. */\r
-#define mainSTDOUT_TASK_STACK_SIZE             ( configMINIMAL_STACK_SIZE * 4 )\r
-\r
-/* File scope variables. */\r
-static volatile unsigned long ul1 = 0, ul2 = 0;\r
-static xQueueHandle xStdoutQueue = NULL;\r
+#define mainTIMER_TEST_PERIOD                  ( 50 )\r

 \r
 /* Task function prototypes. */\r
 static void prvCheckTask( void *pvParameters );\r
 \r
 \r
 /* Task function prototypes. */\r
 static void prvCheckTask( void *pvParameters );\r
 \r

+/* The variable into which error messages are latched. */\r
+static char *pcStatusMessage = "OK";\r
+\r
+/* This semaphore is created purely to test using the vSemaphoreDelete() and\r
+semaphore tracing API functions.  It has no other purpose. */\r
+static xSemaphoreHandle xMutexToDelete = NULL;\r
+\r

 /*-----------------------------------------------------------*/\r
 \r
 int main( void )\r
 /*-----------------------------------------------------------*/\r
 \r
 int main( void )\r


@@ -142,6 +143,19 @@ int main( void )
        vStartQueuePeekTasks();\r
        vStartMathTasks( mainFLOP_TASK_PRIORITY );\r
        vStartRecursiveMutexTasks();\r
        vStartQueuePeekTasks();\r
        vStartMathTasks( mainFLOP_TASK_PRIORITY );\r
        vStartRecursiveMutexTasks();\r

+       vStartTimerDemoTask( mainTIMER_TEST_PERIOD );\r
+       vStartCountingSemaphoreTasks();\r
+       vStartDynamicPriorityTasks();\r
+\r
+       /* The suicide tasks must be created last as they need to know how many\r
+       tasks were running prior to their creation.  This then allows them to \r
+       ascertain whether or not the correct/expected number of tasks are running at \r
+       any given time. */\r
+       vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );\r
+\r
+       /* Create the semaphore that will be deleted in the idle task hook.  This\r
+       is done purely to test the use of vSemaphoreDelete(). */\r
+       xMutexToDelete = xSemaphoreCreateMutex();\r

 \r
        /* Start the scheduler itself. */\r
        vTaskStartScheduler();\r
 \r
        /* Start the scheduler itself. */\r
        vTaskStartScheduler();\r


@@ -155,8 +169,7 @@ int main( void )
 static void prvCheckTask( void *pvParameters )\r
 {\r
 portTickType xNextWakeTime;\r
 static void prvCheckTask( void *pvParameters )\r
 {\r
 portTickType xNextWakeTime;\r

-const portTickType xCycleFrequency = 5000 / portTICK_RATE_MS;\r
-char *pcStatusMessage = "OK";\r
+const portTickType xCycleFrequency = 1000 / portTICK_RATE_MS;\r

 \r
        /* Just to remove compiler warning. */\r
        ( void ) pvParameters;\r
 \r
        /* Just to remove compiler warning. */\r
        ( void ) pvParameters;\r


@@ -170,7 +183,11 @@ char *pcStatusMessage = "OK";
                vTaskDelayUntil( &xNextWakeTime, xCycleFrequency );\r
 \r
                /* Check the standard demo tasks are running without error. */\r
                vTaskDelayUntil( &xNextWakeTime, xCycleFrequency );\r
 \r
                /* Check the standard demo tasks are running without error. */\r

-           if( xAreIntegerMathsTaskStillRunning() != pdTRUE )\r
+               if( xAreTimerDemoTasksStillRunning( xCycleFrequency ) != pdTRUE )\r
+               {\r
+                       pcStatusMessage = "Error: TimerDemo";\r
+               }\r
+           else if( xAreIntegerMathsTaskStillRunning() != pdTRUE )\r

            {\r
                        pcStatusMessage = "Error: IntMath";\r
            }   \r
            {\r
                        pcStatusMessage = "Error: IntMath";\r
            }   \r


@@ -202,6 +219,18 @@ char *pcStatusMessage = "OK";
            {\r
                        pcStatusMessage = "Error: RecMutex";\r
                }\r
            {\r
                        pcStatusMessage = "Error: RecMutex";\r
                }\r

+               else if( xAreCountingSemaphoreTasksStillRunning() != pdTRUE )\r
+               {\r
+                       pcStatusMessage = "Error: CountSem";\r
+               }\r
+               else if( xIsCreateTaskStillRunning() != pdTRUE )\r
+               {\r
+                       pcStatusMessage = "Error: Death";\r
+               }\r
+               else if( xAreDynamicPriorityTasksStillRunning() != pdPASS )\r
+               {\r
+                       pcStatusMessage = "Error: Dynamic\r\n";\r
+               }\r

 \r
                /* This is the only task that uses stdout so its ok to call printf() \r
                directly. */\r
 \r
                /* This is the only task that uses stdout so its ok to call printf() \r
                directly. */\r


@@ -212,19 +241,64 @@ char *pcStatusMessage = "OK";
 \r
 void vApplicationIdleHook( void )\r
 {\r
 \r
 void vApplicationIdleHook( void )\r
 {\r

-       /* Sleep to reduce CPU load, but don't sleep indefinitely if not using \r
-       preemption as as nothing will cause     a task switch. */\r
-       #if( configUSE_PREEMPTION != 0 )\r
+const unsigned long ulMSToSleep = 5;\r
+xTaskHandle xIdleTaskHandle, xTimerTaskHandle;\r
+signed char *pcTaskName;\r
+const unsigned char ucConstQueueNumber = 0xaaU, ucConstTaskNumber = 0x55U;\r
+\r
+/* These three functions are only meant for use by trace code, and not for\r
+direct use from application code, hence their prototypes are not in queue.h. */\r
+extern void vQueueSetQueueNumber( xQueueHandle pxQueue, unsigned char ucQueueNumber );\r
+extern unsigned char ucQueueGetQueueNumber( xQueueHandle pxQueue );\r
+extern unsigned char ucQueueGetQueueType( xQueueHandle pxQueue );\r
+extern void vTaskSetTaskNumber( xTaskHandle xTask, unsigned portBASE_TYPE uxHandle );\r
+extern unsigned portBASE_TYPE uxTaskGetTaskNumber( xTaskHandle xTask );\r
+\r
+       /* Sleep to reduce CPU load, but don't sleep indefinitely in case there are\r
+       tasks waiting to be terminated by the idle task. */\r
+       Sleep( ulMSToSleep );\r
+\r
+       /* Demonstrate the use of the xTimerGetTimerDaemonTaskHandle() and \r
+       xTaskGetIdleTaskHandle() functions.  Also try using the function that sets\r
+       the task number. */\r
+       xIdleTaskHandle = xTaskGetIdleTaskHandle();\r
+       xTimerTaskHandle = xTimerGetTimerDaemonTaskHandle();\r
+       vTaskSetTaskNumber( xIdleTaskHandle, ( unsigned long ) ucConstTaskNumber );\r
+       configASSERT( uxTaskGetTaskNumber( xIdleTaskHandle ) == ucConstTaskNumber );\r
+\r
+       /* This is the idle hook, so the current task handle should equal the \r
+       returned idle task handle. */\r
+       if( xTaskGetCurrentTaskHandle() != xIdleTaskHandle )\r

        {\r
        {\r

-               SleepEx( INFINITE, TRUE );\r
+               pcStatusMessage = "Error:  Returned idle task handle was incorrect";\r

        }\r
        }\r

-       #else\r
+\r
+       /* Check the timer task handle was returned correctly. */\r
+       pcTaskName = pcTaskGetTaskName( xTimerTaskHandle );\r
+       if( strcmp( pcTaskName, "Tmr Svc" ) != 0 )\r

        {\r
        {\r

-               const unsigned long ulMSToSleep = 5;\r
+               pcStatusMessage = "Error:  Returned timer task handle was incorrect";\r
+       }\r

 \r
 \r

-               SleepEx( ulMSToSleep, TRUE );\r
+       /* If xMutexToDelete has not already been deleted, then delete it now.\r
+       This is done purely to demonstrate the use of, and test, the \r
+       vSemaphoreDelete() macro.  Care must be taken not to delete a semaphore\r
+       that has tasks blocked on it. */\r
+       if( xMutexToDelete != NULL )\r
+       {\r
+               /* Before deleting the semaphore, test the function used to set its\r
+               number.  This would normally only be done from trace software, rather\r
+               than application code. */\r
+               vQueueSetQueueNumber( xMutexToDelete, ucConstQueueNumber );\r
+\r
+               /* Before deleting the semaphore, test the functions used to get its\r
+               type and number.  Again, these would normally only be done from trace\r
+               software, rather than application code. */\r
+               configASSERT( ucQueueGetQueueNumber( xMutexToDelete ) == ucConstQueueNumber );\r
+               configASSERT( ucQueueGetQueueType( xMutexToDelete ) == queueQUEUE_TYPE_MUTEX );\r
+               vSemaphoreDelete( xMutexToDelete );\r
+               xMutexToDelete = NULL;\r

        }\r
        }\r

-       #endif\r

 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r


@@ -240,4 +314,19 @@ void vApplicationStackOverflowHook( void )
        /* Can be implemented if required, but not required in this \r
        environment and running this demo. */\r
 }\r
        /* Can be implemented if required, but not required in this \r
        environment and running this demo. */\r
 }\r

+/*-----------------------------------------------------------*/\r
+\r
+void vApplicationTickHook( void )\r
+{\r
+       /* Call the periodic timer test, which tests the timer API functions that\r
+       can be called from an ISR. */\r
+       vTimerPeriodicISRTests();\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void vAssertCalled( void )\r
+{\r
+       taskDISABLE_INTERRUPTS();\r
+       for( ;; );\r
+}\r

 \r
 \r