]> git.sur5r.net Git - freertos/commitdiff
Replaced asm statements with __asm for building with CrossWorks V2.
authorrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Sat, 20 Jun 2009 16:39:47 +0000 (16:39 +0000)
committerrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Sat, 20 Jun 2009 16:39:47 +0000 (16:39 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@770 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

Source/portable/GCC/ARM_CM3/port.c

index d34871905abbabe79b0d01d09e46a1d1111b8bc4..f07fdc9185c4ad6a8a1aed2312d5179196d01d04 100644 (file)
@@ -9,7 +9,7 @@
        **NOTE** The exception to the GPL is included to allow you to distribute a\r
        combined work that includes FreeRTOS.org without being obliged to provide\r
        the source code for any proprietary components.  Alternative commercial\r
-       license and support terms are also available upon request.  See the \r
+       license and support terms are also available upon request.  See the\r
        licensing section of http://www.FreeRTOS.org for full details.\r
 \r
        FreeRTOS.org is distributed in the hope that it will be useful, but WITHOUT\r
@@ -128,7 +128,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
 \r
 void vPortSVCHandler( void )\r
 {\r
-       asm volatile (\r
+       __asm volatile (\r
                                        "       ldr     r3, pxCurrentTCBConst2          \n" /* Restore the context. */\r
                                        "       ldr r1, [r3]                                    \n" /* Use pxCurrentTCBConst to get the pxCurrentTCB address. */\r
                                        "       ldr r0, [r1]                                    \n" /* The first item in pxCurrentTCB is the task top of stack. */\r
@@ -147,7 +147,7 @@ void vPortSVCHandler( void )
 \r
 void vPortStartFirstTask( void )\r
 {\r
-       asm volatile(\r
+       __asm volatile(\r
                                        " ldr r0, =0xE000ED08   \n" /* Use the NVIC offset register to locate the stack. */\r
                                        " ldr r0, [r0]                  \n"\r
                                        " ldr r0, [r0]                  \n"\r
@@ -231,7 +231,7 @@ void xPortPendSVHandler( void )
        "       msr basepri, r0                                         \n"\r
        "       bl vTaskSwitchContext                           \n"\r
        "       mov r0, #0                                                      \n"\r
-       "       msr basepri, r0                                         \n"                     \r
+       "       msr basepri, r0                                         \n"\r
        "       ldmia sp!, {r3, r14}                            \n"\r
        "                                                                               \n"     /* Restore the context, including the critical nesting count. */\r
        "       ldr r1, [r3]                                            \n"\r