Slight mods to comments in STR75X GCC port and demo files.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@54 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/ARM7_STR75x_GCC/SystemFiles/crt0_STR75x_FreeRTOS.s b/Demo/ARM7_STR75x_GCC/SystemFiles/crt0_STR75x_FreeRTOS.s
index 4b79ed5b1e7a4a7ef1e6289e3f5f6552db7666c5..f0a69a94e96027edb7fbc81d4eb67a69c07b8dbf 100644 (file)
--- a/Demo/ARM7_STR75x_GCC/SystemFiles/crt0_STR75x_FreeRTOS.s
+++ b/Demo/ARM7_STR75x_GCC/SystemFiles/crt0_STR75x_FreeRTOS.s
@@ -1,7 +1,8 @@
 /*\r
 This is the default Startup for STR75x devices for the GNU toolchain\r
 \r
 /*\r
 This is the default Startup for STR75x devices for the GNU toolchain\r
 \r

-It has been designed by ST Microelectronics and modified by Raisonance.\r
+It has been designed by ST Microelectronics and modified by Raisonance\r
+and FreeRTOS.org.\r

 \r
 You can use it, modify it, distribute it freely but without any waranty.\r
 \r
 \r
 You can use it, modify it, distribute it freely but without any waranty.\r
 \r

diff --git a/Demo/ARM7_STR75x_GCC/serial/serial.c b/Demo/ARM7_STR75x_GCC/serial/serial.c
index 5d1a473755adcc3764cd3ab281066900078158eb..be4a987dd31c3703bfd09da1f49b1e2aaf6c5fe3 100644 (file)
--- a/Demo/ARM7_STR75x_GCC/serial/serial.c
+++ b/Demo/ARM7_STR75x_GCC/serial/serial.c
@@ -34,6 +34,15 @@
        BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER FOR UART0.\r
 */\r
 \r
        BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER FOR UART0.\r
 */\r
 \r

+\r
+/*-----------------------------------------------------------\r
+ * Components that can be compiled to either ARM or THUMB mode are\r
+ * contained in this file.c  The ISR routines, which can only be compiled\r
+ * to ARM mode, are contained in serialISR.c.\r
+ *----------------------------------------------------------*/\r
+\r
+\r
+\r

 /* Library includes. */\r
 #include "75x_uart.h"\r
 #include "75x_gpio.h"\r
 /* Library includes. */\r
 #include "75x_uart.h"\r
 #include "75x_gpio.h"\r

diff --git a/Demo/ARM7_STR75x_GCC/serial/serialISR.c b/Demo/ARM7_STR75x_GCC/serial/serialISR.c
index 0efa6c667ccce899a94f3051389765bb9d0b4459..a6556824373fd8a9e5a4222a160905dfa33c3d07 100644 (file)
--- a/Demo/ARM7_STR75x_GCC/serial/serialISR.c
+++ b/Demo/ARM7_STR75x_GCC/serial/serialISR.c
@@ -30,6 +30,14 @@
        ***************************************************************************\r
 */\r
 \r
        ***************************************************************************\r
 */\r
 \r

+/*-----------------------------------------------------------\r
+ * Components that can be compiled to either ARM or THUMB mode are\r
+ * contained in serial.c  The ISR routines, which can only be compiled\r
+ * to ARM mode, are contained in this file.\r
+ *----------------------------------------------------------*/\r
+\r
+\r
+\r

 /* Library includes. */\r
 #include "75x_uart.h"\r
 \r
 /* Library includes. */\r
 #include "75x_uart.h"\r
 \r

diff --git a/Source/include/portable.h b/Source/include/portable.h
index 8b815353c94e075a68b8ad8da3b4ee692efd9c4d..9d0dea101362968f0d2b53e6ed3706e2b7998a5a 100644 (file)
--- a/Source/include/portable.h
+++ b/Source/include/portable.h
@@ -113,6 +113,10 @@
        #include "..\..\Source\portable\IAR\STR75x\portmacro.h"\r
 #endif\r
        \r
        #include "..\..\Source\portable\IAR\STR75x\portmacro.h"\r
 #endif\r
        \r

+#ifdef STR75X_GCC\r
+       #include "..\..\Source\portable\GCC\STR75x\portmacro.h"\r
+#endif\r
+\r

 #ifdef STR91X_IAR\r
        #include "..\..\Source\portable\IAR\STR91x\portmacro.h"\r
 #endif\r
 #ifdef STR91X_IAR\r
        #include "..\..\Source\portable\IAR\STR91x\portmacro.h"\r
 #endif\r

diff --git a/Source/portable/GCC/STR75x/port.c b/Source/portable/GCC/STR75x/port.c
index a5bb07beb5cde49c35c92f5849edbd75710248c1..7e589a0b556798c6219684f4378975af9a9cb432 100644 (file)
--- a/Source/portable/GCC/STR75x/port.c
+++ b/Source/portable/GCC/STR75x/port.c
@@ -57,10 +57,9 @@
 \r
 /*-----------------------------------------------------------*/\r
 \r
 \r
 /*-----------------------------------------------------------*/\r
 \r

-/* Setup the watchdog to generate the tick interrupts. */\r
+/* Setup the TB to generate the tick interrupts. */\r

 static void prvSetupTimerInterrupt( void );\r
 \r
 static void prvSetupTimerInterrupt( void );\r
 \r

-\r

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

diff --git a/Source/portable/GCC/STR75x/portISR.c b/Source/portable/GCC/STR75x/portISR.c
index a9c20d2f503e5878000958d76d231e7a79298638..dadcf5d623603b554ad874b95c271acdcf95d278 100644 (file)
--- a/Source/portable/GCC/STR75x/portISR.c
+++ b/Source/portable/GCC/STR75x/portISR.c
@@ -40,15 +40,10 @@
 /*\r
 */\r
 \r
 /*\r
 */\r
 \r

-\r

 /* Scheduler includes. */\r
 #include "FreeRTOS.h"\r
 #include "task.h"\r
 \r
 /* Scheduler includes. */\r
 #include "FreeRTOS.h"\r
 #include "task.h"\r
 \r

-/* Constants required to handle interrupts. */\r
-#define portTIMER_MATCH_ISR_BIT                ( ( unsigned portCHAR ) 0x01 )\r
-#define portCLEAR_VIC_INTERRUPT                ( ( unsigned portLONG ) 0 )\r
-\r

 /* Constants required to handle critical sections. */\r
 #define portNO_CRITICAL_NESTING                ( ( unsigned portLONG ) 0 )\r
 \r
 /* Constants required to handle critical sections. */\r
 #define portNO_CRITICAL_NESTING                ( ( unsigned portLONG ) 0 )\r
 \r


@@ -91,13 +86,11 @@ void vPortISRStartFirstTask( void )
                                                                                                                                                \\r
        /* And return - correcting the offset in the LR to obtain the */        \\r
        /* correct address. */                                                                                          \\r
                                                                                                                                                \\r
        /* And return - correcting the offset in the LR to obtain the */        \\r
        /* correct address. */                                                                                          \\r

-       "SUBS PC, LR, #4 \n\t" \\r
-       );                                                                                                                                      \\r
+       "SUBS PC, LR, #4                                                                                        \n\t"   \\r
+       );                                                                                                                                      \r

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

-/* The preemptive scheduler is defined as "naked" as the full context is\r
-saved on entry as part of the context switch. */\r

 void vPortTickISR( void )\r
 {\r
        /* Increment the RTOS tick count, then look for the highest priority \r
 void vPortTickISR( void )\r
 {\r
        /* Increment the RTOS tick count, then look for the highest priority \r


@@ -148,11 +141,8 @@ void vPortTickISR( void )
        }\r
 \r
 #endif /* THUMB_INTERWORK */\r
        }\r
 \r
 #endif /* THUMB_INTERWORK */\r

+/*-----------------------------------------------------------*/\r

 \r
 \r

-/* The code generated by the GCC compiler uses the stack in different ways at\r
-different optimisation levels.  The interrupt flags can therefore not always\r
-be saved to the stack.  Instead the critical section nesting level is stored\r
-in a variable, which is then saved as part of the stack context. */\r

 void vPortEnterCritical( void )\r
 {\r
        /* Disable interrupts as per portDISABLE_INTERRUPTS();                                                  */\r
 void vPortEnterCritical( void )\r
 {\r
        /* Disable interrupts as per portDISABLE_INTERRUPTS();                                                  */\r


@@ -168,6 +158,7 @@ void vPortEnterCritical( void )
        portENTER_CRITICAL() has been called. */\r
        ulCriticalNesting++;\r
 }\r
        portENTER_CRITICAL() has been called. */\r
        ulCriticalNesting++;\r
 }\r

+/*-----------------------------------------------------------*/\r

 \r
 void vPortExitCritical( void )\r
 {\r
 \r
 void vPortExitCritical( void )\r
 {\r

diff --git a/Source/portable/IAR/STR75x/port.c b/Source/portable/IAR/STR75x/port.c
index c1332df585f4b47ab5db3f58f5038804a22c674e..909892565f5e12210ed3f1d0722713c83a7ed120 100644 (file)
--- a/Source/portable/IAR/STR75x/port.c
+++ b/Source/portable/IAR/STR75x/port.c
@@ -56,7 +56,7 @@
 \r
 /*-----------------------------------------------------------*/\r
 \r
 \r
 /*-----------------------------------------------------------*/\r
 \r

-/* Setup the watchdog to generate the tick interrupts. */\r
+/* Setup the TB to generate the tick interrupts. */\r

 static void prvSetupTimerInterrupt( void );\r
 \r
 /* ulCriticalNesting will get set to zero when the first task starts.  It\r
 static void prvSetupTimerInterrupt( void );\r
 \r
 /* ulCriticalNesting will get set to zero when the first task starts.  It\r