]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/portISR.c
Update version number to 8.1.1 for patch release that re-enables mutexes to be given...
[freertos] / FreeRTOS / Source / portable / GCC / ARM7_AT91SAM7S / portISR.c
index ac40e1dedd0f6c93e373d50ee8f94936e3098dac..bc5cbb16ce96d8e148a0276ffbec844532af06e6 100644 (file)
@@ -1,48 +1,38 @@
 /*\r
-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.1 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+    All rights reserved\r
 \r
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT\r
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
 \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
+     *    FreeRTOS provides completely free yet professionally developed,    *\r
+     *    robust, strictly quality controlled, supported, and cross          *\r
+     *    platform software that has become a de facto standard.             *\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
+     *    Help yourself get started quickly and support the FreeRTOS         *\r
+     *    project by purchasing a FreeRTOS tutorial book, reference          *\r
+     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *\r
      *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *    Thank you!                                                         *\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
+    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \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.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more\r
-    details. You should have received a copy of the GNU General Public License\r
-    and the FreeRTOS license exception along with FreeRTOS; if not it can be\r
-    viewed here: http://www.freertos.org/a00114.html and also obtained by\r
-    writing to Real Time Engineers Ltd., contact details for whom are available\r
-    on the FreeRTOS WEB site.\r
+    FOR A PARTICULAR PURPOSE.  Full license text is available from the following\r
+    link: http://www.freertos.org/a00114.html\r
 \r
     1 tab == 4 spaces!\r
 \r
      *                                                                       *\r
     ***************************************************************************\r
 \r
-\r
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, \r
+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
     license and Real Time Engineers Ltd. contact details.\r
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
-    including FreeRTOS+Trace - an indispensable productivity tool, and our new\r
-    fully thread aware and reentrant UDP/IP stack.\r
-\r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High \r
-    Integrity Systems, who sell the code with commercial support, \r
-    indemnification and middleware, under the OpenRTOS brand.\r
-    \r
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety \r
-    engineered and independently SIL3 certified version for use in safety and \r
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
+\r
+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r
+    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
+    licenses offer ticketed support, indemnification and middleware.\r
+\r
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+    engineered and independently SIL3 certified version for use in safety and\r
     mission critical applications that require provable dependability.\r
+\r
+    1 tab == 4 spaces!\r
 */\r
 \r
 \r
 #include "AT91SAM7X256.h"\r
 \r
 /* Constants required to handle interrupts. */\r
-#define portTIMER_MATCH_ISR_BIT                ( ( unsigned char ) 0x01 )\r
-#define portCLEAR_VIC_INTERRUPT                ( ( unsigned long ) 0 )\r
+#define portTIMER_MATCH_ISR_BIT                ( ( uint8_t ) 0x01 )\r
+#define portCLEAR_VIC_INTERRUPT                ( ( uint32_t ) 0 )\r
 \r
 /* Constants required to handle critical sections. */\r
-#define portNO_CRITICAL_NESTING                ( ( unsigned long ) 0 )\r
-volatile unsigned long ulCriticalNesting = 9999UL;\r
+#define portNO_CRITICAL_NESTING                ( ( uint32_t ) 0 )\r
+volatile uint32_t ulCriticalNesting = 9999UL;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /* ISR to handle manual context switches (from a call to taskYIELD()). */\r
 void vPortYieldProcessor( void ) __attribute__((interrupt("SWI"), naked));\r
 \r
-/* \r
+/*\r
  * The scheduler can only be started from ARM mode, hence the inclusion of this\r
  * function here.\r
  */\r
@@ -123,17 +114,17 @@ void vPortISRStartFirstTask( void )
 /*\r
  * Called by portYIELD() or taskYIELD() to manually force a context switch.\r
  *\r
- * When a context switch is performed from the task level the saved task \r
+ * When a context switch is performed from the task level the saved task\r
  * context is made to look as if it occurred from within the tick ISR.  This\r
  * way the same restore context function can be used when restoring the context\r
  * saved from the ISR or that saved from a call to vPortYieldProcessor.\r
  */\r
 void vPortYieldProcessor( void )\r
 {\r
-       /* Within an IRQ ISR the link register has an offset from the true return \r
-       address, but an SWI ISR does not.  Add the offset manually so the same \r
+       /* Within an IRQ ISR the link register has an offset from the true return\r
+       address, but an SWI ISR does not.  Add the offset manually so the same\r
        ISR return code can be used in both cases. */\r
-       asm volatile ( "ADD             LR, LR, #4" );\r
+       __asm volatile ( "ADD           LR, LR, #4" );\r
 \r
        /* Perform the context switch.  First save the context of the current task. */\r
        portSAVE_CONTEXT();\r
@@ -142,32 +133,32 @@ void vPortYieldProcessor( void )
        vTaskSwitchContext();\r
 \r
        /* Restore the context of the new task. */\r
-       portRESTORE_CONTEXT();  \r
+       portRESTORE_CONTEXT();\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-/* \r
+/*\r
  * The ISR used for the scheduler tick depends on whether the cooperative or\r
  * the preemptive scheduler is being used.\r
  */\r
 \r
 #if configUSE_PREEMPTION == 0\r
 \r
-       /* The cooperative scheduler requires a normal IRQ service routine to \r
+       /* The cooperative scheduler requires a normal IRQ service routine to\r
        simply increment the system tick. */\r
        void vNonPreemptiveTick( void ) __attribute__ ((interrupt ("IRQ")));\r
        void vNonPreemptiveTick( void )\r
-       {               \r
-               unsigned long ulDummy;\r
-               \r
+       {\r
+               uint32_t ulDummy;\r
+\r
                /* Increment the tick count - which may wake some tasks but as the\r
                preemptive scheduler is not being used any woken task is not given\r
                processor time no matter what its priority. */\r
-               vTaskIncrementTick();\r
-               \r
+               xTaskIncrementTick();\r
+\r
                /* Clear the PIT interrupt. */\r
                ulDummy = AT91C_BASE_PITC->PITC_PIVR;\r
-               \r
+\r
                /* End the interrupt in the AIC. */\r
                AT91C_BASE_AIC->AIC_EOICR = ulDummy;\r
        }\r
@@ -180,17 +171,18 @@ void vPortYieldProcessor( void )
        void vPreemptiveTick( void )\r
        {\r
                /* Save the context of the current task. */\r
-               portSAVE_CONTEXT();                     \r
+               portSAVE_CONTEXT();\r
 \r
                /* Increment the tick count - this may wake a task. */\r
-               vTaskIncrementTick();\r
+               if( xTaskIncrementTick() != pdFALSE )\r
+               {\r
+                       /* Find the highest priority task that is ready to run. */\r
+                       vTaskSwitchContext();\r
+               }\r
 \r
-               /* Find the highest priority task that is ready to run. */\r
-               vTaskSwitchContext();\r
-               \r
                /* End the interrupt in the AIC. */\r
-               AT91C_BASE_AIC->AIC_EOICR = AT91C_BASE_PITC->PITC_PIVR;;\r
-               \r
+               AT91C_BASE_AIC->AIC_EOICR = AT91C_BASE_PITC->PITC_PIVR;\r
+\r
                portRESTORE_CONTEXT();\r
        }\r
 \r
@@ -208,7 +200,7 @@ void vPortEnableInterruptsFromThumb( void ) __attribute__ ((naked));
 \r
 void vPortDisableInterruptsFromThumb( void )\r
 {\r
-       asm volatile ( \r
+       __asm volatile (\r
                "STMDB  SP!, {R0}               \n\t"   /* Push R0.                                                                     */\r
                "MRS    R0, CPSR                \n\t"   /* Get CPSR.                                                            */\r
                "ORR    R0, R0, #0xC0   \n\t"   /* Disable IRQ, FIQ.                                            */\r
@@ -216,14 +208,14 @@ void vPortDisableInterruptsFromThumb( void )
                "LDMIA  SP!, {R0}               \n\t"   /* Pop R0.                                                                      */\r
                "BX             R14" );                                 /* Return back to thumb.                                        */\r
 }\r
-               \r
+\r
 void vPortEnableInterruptsFromThumb( void )\r
 {\r
-       asm volatile ( \r
-               "STMDB  SP!, {R0}               \n\t"   /* Push R0.                                                                     */      \r
-               "MRS    R0, CPSR                \n\t"   /* Get CPSR.                                                            */      \r
-               "BIC    R0, R0, #0xC0   \n\t"   /* Enable IRQ, FIQ.                                                     */      \r
-               "MSR    CPSR, R0                \n\t"   /* Write back modified value.                           */      \r
+       __asm volatile (\r
+               "STMDB  SP!, {R0}               \n\t"   /* Push R0.                                                                     */\r
+               "MRS    R0, CPSR                \n\t"   /* Get CPSR.                                                            */\r
+               "BIC    R0, R0, #0xC0   \n\t"   /* Enable IRQ, FIQ.                                                     */\r
+               "MSR    CPSR, R0                \n\t"   /* Write back modified value.                           */\r
                "LDMIA  SP!, {R0}               \n\t"   /* Pop R0.                                                                      */\r
                "BX             R14" );                                 /* Return back to thumb.                                        */\r
 }\r
@@ -236,14 +228,14 @@ in a variable, which is then saved as part of the stack context. */
 void vPortEnterCritical( void )\r
 {\r
        /* Disable interrupts as per portDISABLE_INTERRUPTS();                                                  */\r
-       asm volatile ( \r
+       __asm volatile (\r
                "STMDB  SP!, {R0}                       \n\t"   /* Push R0.                                                             */\r
                "MRS    R0, CPSR                        \n\t"   /* Get CPSR.                                                    */\r
                "ORR    R0, R0, #0xC0           \n\t"   /* Disable IRQ, FIQ.                                    */\r
                "MSR    CPSR, R0                        \n\t"   /* Write back modified value.                   */\r
                "LDMIA  SP!, {R0}" );                           /* Pop R0.                                                              */\r
 \r
-       /* Now interrupts are disabled ulCriticalNesting can be accessed \r
+       /* Now interrupts are disabled ulCriticalNesting can be accessed\r
        directly.  Increment ulCriticalNesting to keep a count of how many times\r
        portENTER_CRITICAL() has been called. */\r
        ulCriticalNesting++;\r
@@ -261,11 +253,11 @@ void vPortExitCritical( void )
                if( ulCriticalNesting == portNO_CRITICAL_NESTING )\r
                {\r
                        /* Enable interrupts as per portEXIT_CRITICAL().                                        */\r
-                       asm volatile ( \r
-                               "STMDB  SP!, {R0}               \n\t"   /* Push R0.                                             */      \r
-                               "MRS    R0, CPSR                \n\t"   /* Get CPSR.                                    */      \r
-                               "BIC    R0, R0, #0xC0   \n\t"   /* Enable IRQ, FIQ.                             */      \r
-                               "MSR    CPSR, R0                \n\t"   /* Write back modified value.   */      \r
+                       __asm volatile (\r
+                               "STMDB  SP!, {R0}               \n\t"   /* Push R0.                                             */\r
+                               "MRS    R0, CPSR                \n\t"   /* Get CPSR.                                    */\r
+                               "BIC    R0, R0, #0xC0   \n\t"   /* Enable IRQ, FIQ.                             */\r
+                               "MSR    CPSR, R0                \n\t"   /* Write back modified value.   */\r
                                "LDMIA  SP!, {R0}" );                   /* Pop R0.                                              */\r
                }\r
        }\r