Revert Portable/CodeWarrior formatting (#831)

Revert the formatting on CodeWarrior ports

portable/CodeWarrior/ColdFire_V1/port.c

@@ -46,20 +46,17 @@ asm void interrupt VectorNumber_VL1swi vPortYieldISR( void );
 static void prvSetupTimerInterrupt( void );
 
 /* Used to keep track of the number of nested calls to taskENTER_CRITICAL().  This
- * will be set to 0 prior to the first task being started. */
+will be set to 0 prior to the first task being started. */
 static uint32_t ulCriticalNesting = 0x9999UL;
 
 /*-----------------------------------------------------------*/
 
-StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
+StackType_t *pxPortInitialiseStack( StackType_t * pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )
-                                     TaskFunction_t pxCode,
-                                     void * pvParameters )
 {
+
 uint32_t ulOriginalA5;
 
-    __asm {
+    __asm{ MOVE.L A5, ulOriginalA5 };
-        MOVE.L A5, ulOriginalA5
-    };
 
 
     *pxTopOfStack = (StackType_t) 0xDEADBEEF;
@@ -110,7 +107,7 @@ static void prvSetupTimerInterrupt( void )
     RTCMOD = portRTC_CLOCK_HZ / configTICK_RATE_HZ;
 
     /* Enable the RTC to generate interrupts - interrupts are already disabled
-     * when this code executes. */
+    when this code executes. */
     RTCSC_RTIE = 1;
 }
 /*-----------------------------------------------------------*/
@@ -126,20 +123,19 @@ void vPortEnterCritical( void )
     if( ulCriticalNesting == 0UL )
     {
         /* Guard against context switches being pended simultaneously with a
-         * critical section being entered. */
+        critical section being entered. */
         do
         {
             portDISABLE_INTERRUPTS();
-
             if( INTC_FRC == 0UL )
             {
                 break;
             }
 
             portENABLE_INTERRUPTS();
+
         } while( 1 );
     }
-
     ulCriticalNesting++;
 }
 /*-----------------------------------------------------------*/
@@ -147,7 +143,6 @@ void vPortEnterCritical( void )
 void vPortExitCritical( void )
 {
     ulCriticalNesting--;
-
     if( ulCriticalNesting == 0 )
     {
         portENABLE_INTERRUPTS();

portable/CodeWarrior/ColdFire_V1/portmacro.h

@@ -106,6 +106,7 @@ extern void vPortClearInterruptMaskFromISR( UBaseType_t );
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
 /*-----------------------------------------------------------*/
 
+
 #define portEND_SWITCHING_ISR( xSwitchRequired ) \
     do                                           \
     {                                            \

portable/CodeWarrior/ColdFire_V2/port.c

@@ -37,7 +37,7 @@
 #define portINITIAL_STATUS_REGISTER     ( ( StackType_t ) 0x2000)
 
 /* Used to keep track of the number of nested calls to taskENTER_CRITICAL().  This
- * will be set to 0 prior to the first task being started. */
+will be set to 0 prior to the first task being started. */
 static uint32_t ulCriticalNesting = 0x9999UL;
 
 
@@ -58,9 +58,7 @@ static uint32_t ulCriticalNesting = 0x9999UL;
 
 /*-----------------------------------------------------------*/
 
-StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
+StackType_t *pxPortInitialiseStack( StackType_t * pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )
-                                     TaskFunction_t pxCode,
-                                     void * pvParameters )
 {
     *pxTopOfStack = ( StackType_t ) pvParameters;
     pxTopOfStack--;
@@ -109,20 +107,19 @@ void vPortEnterCritical( void )
     if( ulCriticalNesting == 0UL )
     {
         /* Guard against context switches being pended simultaneously with a
-         * critical section being entered. */
+        critical section being entered. */
         do
         {
             portDISABLE_INTERRUPTS();
-
             if( MCF_INTC0_INTFRCH == 0UL )
             {
                 break;
             }
 
             portENABLE_INTERRUPTS();
+
         } while( 1 );
     }
-
     ulCriticalNesting++;
 }
 /*-----------------------------------------------------------*/
@@ -130,7 +127,6 @@ void vPortEnterCritical( void )
 void vPortExitCritical( void )
 {
     ulCriticalNesting--;
-
     if( ulCriticalNesting == 0 )
     {
         portENABLE_INTERRUPTS();

portable/CodeWarrior/HCS12/port.c

@@ -43,7 +43,7 @@
 static void prvSetupTimerInterrupt( void );
 
 /* Interrupt service routines have to be in non-banked memory - as does the
- * scheduler startup function. */
+scheduler startup function. */
 #pragma CODE_SEG __NEAR_SEG NON_BANKED
 
     /* Manual context switch function.  This is the SWI ISR. */
@@ -53,19 +53,19 @@ void interrupt vPortYield( void );
     void interrupt vPortTickInterrupt( void );
 
     /* Simply called by xPortStartScheduler().  xPortStartScheduler() does not
- * start the scheduler directly because the header file containing the
+    start the scheduler directly because the header file containing the
- * xPortStartScheduler() prototype is part of the common kernel code, and
+    xPortStartScheduler() prototype is part of the common kernel code, and
- * therefore cannot use the CODE_SEG pragma. */
+    therefore cannot use the CODE_SEG pragma. */
     static BaseType_t xBankedStartScheduler( void );
 
 #pragma CODE_SEG DEFAULT
 
 /* Calls to portENTER_CRITICAL() can be nested.  When they are nested the
- * critical section should not be left (i.e. interrupts should not be re-enabled)
+critical section should not be left (i.e. interrupts should not be re-enabled)
- * until the nesting depth reaches 0.  This variable simply tracks the nesting
+until the nesting depth reaches 0.  This variable simply tracks the nesting
- * depth.  Each task maintains it's own critical nesting depth variable so
+depth.  Each task maintains it's own critical nesting depth variable so
- * uxCriticalNesting is saved and restored from the task stack during a context
+uxCriticalNesting is saved and restored from the task stack during a context
- * switch. */
+switch. */
 volatile UBaseType_t uxCriticalNesting = 0xff;
 
 /*-----------------------------------------------------------*/
@@ -73,27 +73,25 @@ volatile UBaseType_t uxCriticalNesting = 0xff;
 /*
  * See header file for description.
  */
-StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
+StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )
-                                     TaskFunction_t pxCode,
-                                     void * pvParameters )
 {
     /*
-     *  Place a few bytes of known values on the bottom of the stack.
+        Place a few bytes of known values on the bottom of the stack.
-     *  This can be uncommented to provide useful stack markers when debugging.
+        This can be uncommented to provide useful stack markers when debugging.
-     *
+
         *pxTopOfStack = ( StackType_t ) 0x11;
-     *  pxTopOfStack--;
+        pxTopOfStack--;
         *pxTopOfStack = ( StackType_t ) 0x22;
-     *  pxTopOfStack--;
+        pxTopOfStack--;
         *pxTopOfStack = ( StackType_t ) 0x33;
-     *  pxTopOfStack--;
+        pxTopOfStack--;
     */
 
 
 
     /* Setup the initial stack of the task.  The stack is set exactly as
-     * expected by the portRESTORE_CONTEXT() macro.  In this case the stack as
+    expected by the portRESTORE_CONTEXT() macro.  In this case the stack as
-     * expected by the HCS12 RTI instruction. */
+    expected by the HCS12 RTI instruction. */
 
 
     /* The address of the task function is placed in the stack byte at a time. */
@@ -125,7 +123,7 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
     pxTopOfStack--;
 
     /* CCR: Note that when the task starts interrupts will be enabled since
-     * "I" bit of CCR is cleared */
+    "I" bit of CCR is cleared */
     *pxTopOfStack = ( StackType_t ) 0x00;
     pxTopOfStack--;
 
@@ -136,7 +134,7 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
     #endif
 
     /* Finally the critical nesting depth is initialised with 0 (not within
-     * a critical section). */
+    a critical section). */
     *pxTopOfStack = ( StackType_t ) 0x00;
 
     return pxTopOfStack;
@@ -159,10 +157,10 @@ static void prvSetupTimerInterrupt( void )
 BaseType_t xPortStartScheduler( void )
 {
     /* xPortStartScheduler() does not start the scheduler directly because
-     * the header file containing the xPortStartScheduler() prototype is part
+    the header file containing the xPortStartScheduler() prototype is part
-     * of the common kernel code, and therefore cannot use the CODE_SEG pragma.
+    of the common kernel code, and therefore cannot use the CODE_SEG pragma.
-     * Instead it simply calls the locally defined xBankedStartScheduler() -
+    Instead it simply calls the locally defined xBankedStartScheduler() -
-     * which does use the CODE_SEG pragma. */
+    which does use the CODE_SEG pragma. */
 
     return xBankedStartScheduler();
 }
@@ -173,7 +171,7 @@ BaseType_t xPortStartScheduler( void )
 static BaseType_t xBankedStartScheduler( void )
 {
     /* Configure the timer that will generate the RTOS tick.  Interrupts are
-     * disabled when this function is called. */
+    disabled when this function is called. */
     prvSetupTimerInterrupt();
 
     /* Restore the context of the first task. */
@@ -224,15 +222,15 @@ void interrupt vPortTickInterrupt( void )
         TFLG1 = 1;
 
         /* Restore the context of a task - which may be a different task
-         * to that interrupted. */
+        to that interrupted. */
         portRESTORE_CONTEXT();
     }
-    #else /* if configUSE_PREEMPTION == 1 */
+    #else
     {
         xTaskIncrementTick();
         TFLG1 = 1;
     }
-    #endif /* if configUSE_PREEMPTION == 1 */
+    #endif
 }
 
 #pragma CODE_SEG DEFAULT

portable/CodeWarrior/HCS12/portmacro.h

@@ -120,7 +120,6 @@ typedef unsigned char    UBaseType_t;
  */
 
 #ifdef BANKED_MODEL
-
     /*
      * Load the stack pointer for the task, then pull the critical nesting
      * count and PPAGE register from the stack.  The remains of the
@@ -156,7 +155,7 @@ typedef unsigned char    UBaseType_t;
         __asm( "ldx pxCurrentTCB" );                                \
         __asm( "sts 0, x" );                                        \
     }
-#else /* ifdef BANKED_MODEL */
+#else
 
     /*
      * These macros are as per the BANKED versions above, but without saving
@@ -184,7 +183,7 @@ typedef unsigned char    UBaseType_t;
         __asm( "ldx pxCurrentTCB" );                                \
         __asm( "sts 0, x" );                                        \
     }
-#endif /* ifdef BANKED_MODEL */
+#endif
 
 /*
  * Utility macro to call macros above in correct order in order to perform a