]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/portable/GCC/ARM7_LPC2000/portISR.c
Kernel changes:
[freertos] / FreeRTOS / Source / portable / GCC / ARM7_LPC2000 / portISR.c
index ab9646aeccb6d1022f43ffe9208ba8583504cf0c..cec38085d2bd78551893482496b6b2bb4293f371 100644 (file)
@@ -1,67 +1,66 @@
 /*\r
-    FreeRTOS V7.1.1 - Copyright (C) 2012 Real Time Engineers Ltd.\r
-       \r
+    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. \r
+    All rights reserved\r
+\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
-     *                                                                       *\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
+     *    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
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\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
-     *    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
-    >>>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
-    by writing to Richard Barry, contact details for whom are available on the\r
-    FreeRTOS WEB site.\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   !<<\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.  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
      *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?                                      *\r
+     *    not run, what could be wrong?"                                     *\r
      *                                                                       *\r
      *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
      *                                                                       *\r
     ***************************************************************************\r
 \r
-    \r
-    http://www.FreeRTOS.org - Documentation, training, latest information, \r
-    license and contact details.\r
-    \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.\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
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
-    the code with commercial support, indemnification, and middleware, under \r
-    the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also\r
-    provide a safety engineered and independently SIL3 certified version under \r
-    the SafeRTOS brand: http://www.SafeRTOS.com.\r
+    1 tab == 4 spaces!\r
 */\r
 \r
 \r
 \r
 /*\r
        Changes from V2.5.2\r
-               \r
+\r
        + The critical section management functions have been changed.  These no\r
          longer modify the stack and are safe to use at all optimisation levels.\r
          The functions are now also the same for both ARM and THUMB modes.\r
 \r
        Changes from V2.6.0\r
 \r
-       + Removed the 'static' from the definition of vNonPreemptiveTick() to \r
+       + Removed the 'static' from the definition of vNonPreemptiveTick() to\r
          allow the demo to link when using the cooperative scheduler.\r
 \r
        Changes from V3.2.4\r
 #include "FreeRTOS.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
@@ -124,15 +123,15 @@ 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
 \r
@@ -143,31 +142,34 @@ void vPortYieldProcessor( void )
        __asm volatile ( "bl 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.\r
  */\r
 void vTickISR( void ) __attribute__((naked));\r
 void vTickISR( void )\r
 {\r
        /* Save the context of the interrupted task. */\r
-       portSAVE_CONTEXT();     \r
+       portSAVE_CONTEXT();\r
 \r
-       /* Increment the RTOS tick count, then look for the highest priority \r
+       /* Increment the RTOS tick count, then look for the highest priority\r
        task that is ready to run. */\r
-       __asm volatile( "bl vTaskIncrementTick" );\r
-\r
-       #if configUSE_PREEMPTION == 1\r
-               __asm volatile( "bl vTaskSwitchContext" );\r
-       #endif\r
+       __asm volatile\r
+       (\r
+               "       bl xTaskIncrementTick   \t\n" \\r
+               "       cmp r0, #0                              \t\n" \\r
+               "       beq SkipContextSwitch   \t\n" \\r
+               "       bl vTaskSwitchContext   \t\n" \\r
+               "SkipContextSwitch:                     \t\n"\r
+       );\r
 \r
        /* Ready for the next interrupt. */\r
        T0_IR = portTIMER_MATCH_ISR_BIT;\r
        VICVectAddr = portCLEAR_VIC_INTERRUPT;\r
-       \r
+\r
        /* Restore the context of the new task. */\r
        portRESTORE_CONTEXT();\r
 }\r
@@ -186,7 +188,7 @@ void vTickISR( void )
 \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
@@ -194,14 +196,14 @@ void vTickISR( 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
@@ -215,14 +217,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
@@ -240,11 +242,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