Revert Portable/BCC formatting (#828)

Revert Portable/BCC formatting

portable/BCC/16BitDOS/Flsh186/port.c

@@ -27,16 +27,16 @@
  */
 
 /*
- * Changes from V1.00:
+Changes from V1.00:
- *
+
     + Call to taskYIELD() from within tick ISR has been replaced by the more
- +    efficient portSWITCH_CONTEXT().
+      efficient portSWITCH_CONTEXT().
     + ISR function definitions renamed to include the prv prefix.
- +
+
- + Changes from V2.6.1
+Changes from V2.6.1
- +
+
     + Replaced the sUsingPreemption variable with the configUSE_PREEMPTION
- +    macro to be consistent with the later ports.
+      macro to be consistent with the later ports.
 */
 
 /*-----------------------------------------------------------
@@ -69,16 +69,14 @@ static void prvSetTickFrequency( uint32_t ulTickRateHz );
 static void prvExitFunction( void );
 
 /* The ISR used depends on whether the preemptive or cooperative scheduler
- * is being used. */
+is being used. */
 #if( configUSE_PREEMPTION == 1 )
-
     /* Tick service routine used by the scheduler when preemptive scheduling is
- * being used. */
+    being used. */
     static void __interrupt __far prvPreemptiveTick( void );
 #else
-
     /* Tick service routine used by the scheduler when cooperative scheduling is
- * being used. */
+    being used. */
     static void __interrupt __far prvNonPreemptiveTick( void );
 #endif
 
@@ -91,8 +89,8 @@ static void __interrupt __far prvYieldProcessor( void );
 static BaseType_t xSchedulerRunning = pdFALSE;
 
 /* Points to the original routine installed on the vector we use for manual
- * context switches.  This is then used to restore the original routine during
+context switches.  This is then used to restore the original routine during
- * prvExitFunction(). */
+prvExitFunction(). */
 static void ( __interrupt __far *pxOldSwitchISR )();
 
 /* Used to restore the original DOS context when the scheduler is ended. */
@@ -106,11 +104,11 @@ BaseType_t xPortStartScheduler( void )
     /* This is called with interrupts already disabled. */
 
     /* Remember what was on the interrupts we are going to use
-     * so we can put them back later if required. */
+    so we can put them back later if required. */
     pxOldSwitchISR = _dos_getvect( portSWITCH_INT_NUMBER );
 
     /* Put our manual switch (yield) function on a known
-     * vector. */
+    vector. */
     _dos_setvect( portSWITCH_INT_NUMBER, prvYieldProcessor );
 
     #if( configUSE_PREEMPTION == 1 )
@@ -146,7 +144,7 @@ BaseType_t xPortStartScheduler( void )
 /*-----------------------------------------------------------*/
 
 /* The ISR used depends on whether the preemptive or cooperative scheduler
- * is being used. */
+is being used. */
 #if( configUSE_PREEMPTION == 1 )
     static void __interrupt __far prvPreemptiveTick( void )
     {
@@ -160,15 +158,15 @@ BaseType_t xPortStartScheduler( void )
         /* Reset the PIC ready for the next time. */
         portRESET_PIC();
     }
-#else /* if ( configUSE_PREEMPTION == 1 ) */
+#else
     static void __interrupt __far prvNonPreemptiveTick( void )
     {
         /* Same as preemptive tick, but the cooperative scheduler is being used
-         * so we don't have to switch in the context of the next task. */
+        so we don't have to switch in the context of the next task. */
         xTaskIncrementTick();
         portRESET_PIC();
     }
-#endif /* if ( configUSE_PREEMPTION == 1 ) */
+#endif
 /*-----------------------------------------------------------*/
 
 static void __interrupt __far prvYieldProcessor( void )
@@ -181,8 +179,8 @@ static void __interrupt __far prvYieldProcessor( void )
 void vPortEndScheduler( void )
 {
     /* Jump back to the processor state prior to starting the
-     * scheduler.  This means we are not going to be using a
+    scheduler.  This means we are not going to be using a
-     * task stack frame so the task can be deleted. */
+    task stack frame so the task can be deleted. */
     longjmp( xJumpBuf, 1 );
 }
 /*-----------------------------------------------------------*/
@@ -193,19 +191,18 @@ static void prvExitFunction( void )
 uint16_t usTimer0Control;
 
     /* Interrupts should be disabled here anyway - but no
-     * harm in making sure. */
+    harm in making sure. */
     portDISABLE_INTERRUPTS();
-
     if( xSchedulerRunning == pdTRUE )
     {
         /* Put back the switch interrupt routines that was in place
-         * before the scheduler started. */
+        before the scheduler started. */
         _dos_setvect( portSWITCH_INT_NUMBER, pxOldSwitchISR );
     }
 
     /* Disable the timer used for the tick to ensure the scheduler is
-     * not called before restoring interrupts.  There was previously nothing
+    not called before restoring interrupts.  There was previously nothing
-     * on this timer so there is no old ISR to restore. */
+    on this timer so there is no old ISR to restore. */
     portOUTPUT_WORD( portTIMER_1_CONTROL_REGISTER, usTimerDisable );
 
     /* Restart the DOS tick. */

portable/BCC/16BitDOS/Flsh186/prtmacro.h

@@ -64,8 +64,7 @@ typedef unsigned short   UBaseType_t;
 /*-----------------------------------------------------------*/
 
 /* Critical section handling. */
-#define portENTER_CRITICAL() \
+#define portENTER_CRITICAL()            __asm{ pushf }  \
-    __asm { pushf }          \
                                         __asm{ cli   }  \
 
 #define portEXIT_CRITICAL()             __asm{ popf }

portable/BCC/16BitDOS/PC/port.c

@@ -27,15 +27,15 @@
  */
 
 /*
- * Changes from V2.6.1
+Changes from V2.6.1
- *
+
     + Replaced the sUsingPreemption variable with the configUSE_PREEMPTION
- +    macro to be consistent with the later ports.
+      macro to be consistent with the later ports.
- +
+
- + Changes from V4.0.1
+Changes from V4.0.1
- +
+
     + Add function prvSetTickFrequencyDefault() to set the DOS tick back to
- +    its proper value when the scheduler exits.
+      its proper value when the scheduler exits.
 */
 
 #include <stdlib.h>
@@ -62,21 +62,19 @@ static void prvSetTickFrequency( uint32_t ulTickRateHz );
 static void prvExitFunction( void );
 
 /* Either chain to the DOS tick (which itself clears the PIC) or clear the PIC
- * directly.  We chain to the DOS tick as close as possible to the standard DOS
+directly.  We chain to the DOS tick as close as possible to the standard DOS
- * tick rate. */
+tick rate. */
 static void prvPortResetPIC( void );
 
 /* The ISR used depends on whether the preemptive or cooperative
- * scheduler is being used. */
+scheduler is being used. */
 #if( configUSE_PREEMPTION == 1 )
-
     /* Tick service routine used by the scheduler when preemptive scheduling is
- * being used. */
+    being used. */
     static void __interrupt __far prvPreemptiveTick( void );
 #else
-
     /* Tick service routine used by the scheduler when cooperative scheduling is
- * being used. */
+    being used. */
     static void __interrupt __far prvNonPreemptiveTick( void );
 #endif
 
@@ -84,7 +82,7 @@ static void prvPortResetPIC( void );
 static void __interrupt __far prvYieldProcessor( void );
 
 /* Set the tick frequency back so the floppy drive works correctly when the
- * scheduler exits. */
+scheduler exits. */
 static void prvSetTickFrequencyDefault( void );
 
 /*lint -e956 File scopes necessary here. */
@@ -114,7 +112,7 @@ BaseType_t xPortStartScheduler( void )
     /* This is called with interrupts already disabled. */
 
     /* Remember what was on the interrupts we are going to use
-     * so we can put them back later if required. */
+    so we can put them back later if required. */
     pxOldSwitchISR = _dos_getvect( portSWITCH_INT_NUMBER );
     pxOriginalTickISR = _dos_getvect( portTIMER_INT_NUMBER );
     pxOldSwitchISRPlus1 = _dos_getvect( portSWITCH_INT_NUMBER + 1 );
@@ -122,15 +120,15 @@ BaseType_t xPortStartScheduler( void )
     prvSetTickFrequency( configTICK_RATE_HZ );
 
     /* Put our manual switch (yield) function on a known
-     * vector. */
+    vector. */
     _dos_setvect( portSWITCH_INT_NUMBER, prvYieldProcessor );
 
     /* Put the old tick on a different interrupt number so we can
-     * call it when we want. */
+    call it when we want. */
     _dos_setvect( portSWITCH_INT_NUMBER + 1, pxOriginalTickISR );
 
     /* The ISR used depends on whether the preemptive or cooperative
-     * scheduler is being used. */
+    scheduler is being used. */
     #if( configUSE_PREEMPTION == 1 )
     {
         /* Put our tick switch function on the timer interrupt. */
@@ -144,8 +142,8 @@ BaseType_t xPortStartScheduler( void )
     #endif
 
     /* Setup a counter that is used to call the DOS interrupt as close
-     * to it's original frequency as can be achieved given our chosen tick
+    to it's original frequency as can be achieved given our chosen tick
-     * frequency. */
+    frequency. */
     sDOSTickCounter = portTICKS_PER_DOS_TICK;
 
     /* Clean up function if we want to return to DOS. */
@@ -167,7 +165,7 @@ BaseType_t xPortStartScheduler( void )
 /*-----------------------------------------------------------*/
 
 /* The ISR used depends on whether the preemptive or cooperative
- * scheduler is being used. */
+scheduler is being used. */
 #if( configUSE_PREEMPTION == 1 )
     static void __interrupt __far prvPreemptiveTick( void )
     {
@@ -181,15 +179,15 @@ BaseType_t xPortStartScheduler( void )
         /* Reset the PIC ready for the next time. */
         prvPortResetPIC();
     }
-#else /* if ( configUSE_PREEMPTION == 1 ) */
+#else
     static void __interrupt __far prvNonPreemptiveTick( void )
     {
         /* Same as preemptive tick, but the cooperative scheduler is being used
-         * so we don't have to switch in the context of the next task. */
+        so we don't have to switch in the context of the next task. */
         xTaskIncrementTick();
         prvPortResetPIC();
     }
-#endif /* if ( configUSE_PREEMPTION == 1 ) */
+#endif
 /*-----------------------------------------------------------*/
 
 static void __interrupt __far prvYieldProcessor( void )
@@ -202,22 +200,19 @@ static void __interrupt __far prvYieldProcessor( void )
 static void prvPortResetPIC( void )
 {
     /* We are going to call the DOS tick interrupt at as close a
-     * frequency to the normal DOS tick as possible. */
+    frequency to the normal DOS tick as possible. */
 
     /* WE SHOULD NOT DO THIS IF YIELD WAS CALLED. */
     --sDOSTickCounter;
-
     if( sDOSTickCounter <= 0 )
     {
         sDOSTickCounter = ( int16_t ) portTICKS_PER_DOS_TICK;
-        __asm {
+        __asm{ int  portSWITCH_INT_NUMBER + 1 };
-            int portSWITCH_INT_NUMBER + 1
-        };
     }
     else
     {
         /* Reset the PIC as the DOS tick is not being called to
-         * do it. */
+        do it. */
         __asm
         {
             mov al, 20H
@@ -230,8 +225,8 @@ static void prvPortResetPIC( void )
 void vPortEndScheduler( void )
 {
     /* Jump back to the processor state prior to starting the
-     * scheduler.  This means we are not going to be using a
+    scheduler.  This means we are not going to be using a
-     * task stack frame so the task can be deleted. */
+    task stack frame so the task can be deleted. */
     longjmp( xJumpBuf, 1 );
 }
 /*-----------------------------------------------------------*/
@@ -241,9 +236,8 @@ static void prvExitFunction( void )
 void ( __interrupt __far *pxOriginalTickISR )();
 
     /* Interrupts should be disabled here anyway - but no
-     * harm in making sure. */
+    harm in making sure. */
     portDISABLE_INTERRUPTS();
-
     if( xSchedulerRunning == pdTRUE )
     {
         /* Set the DOS tick back onto the timer ticker. */
@@ -252,13 +246,12 @@ static void prvExitFunction( void )
         prvSetTickFrequencyDefault();
 
         /* Put back the switch interrupt routines that was in place
-         * before the scheduler started. */
+        before the scheduler started. */
         _dos_setvect( portSWITCH_INT_NUMBER, pxOldSwitchISR );
         _dos_setvect( portSWITCH_INT_NUMBER + 1, pxOldSwitchISRPlus1 );
     }
-
     /* The tick timer is back how DOS wants it.  We can re-enable
-     * interrupts without the scheduler being called. */
+    interrupts without the scheduler being called. */
     portENABLE_INTERRUPTS();
 }
 /*-----------------------------------------------------------*/

portable/BCC/16BitDOS/PC/prtmacro.h

@@ -64,8 +64,7 @@ typedef unsigned short   UBaseType_t;
 /*-----------------------------------------------------------*/
 
 /* Critical section management. */
-#define portENTER_CRITICAL() \
+#define portENTER_CRITICAL()            __asm{ pushf }  \
-    __asm { pushf }          \
                                         __asm{ cli   }  \
 
 #define portEXIT_CRITICAL()             __asm{ popf }

portable/BCC/16BitDOS/common/portasm.h

@@ -48,10 +48,10 @@ void portSWITCH_CONTEXT( void );
 void portFIRST_CONTEXT( void );
 
 /* There are slightly different versions depending on whether you are building
- * to include debugger information.  If debugger information is used then there
+to include debugger information.  If debugger information is used then there
- * are a couple of extra bytes left of the ISR stack (presumably for use by the
+are a couple of extra bytes left of the ISR stack (presumably for use by the
- * debugger).  The true stack pointer is then stored in the bp register.  We add
+debugger).  The true stack pointer is then stored in the bp register.  We add
- * 2 to the stack pointer to remove the extra bytes before we restore our context. */
+2 to the stack pointer to remove the extra bytes before we restore our context. */
 
 #define portSWITCH_CONTEXT()                                            \
                             asm { mov   ax, seg pxCurrentTCB        }   \
@@ -84,4 +84,4 @@ void portFIRST_CONTEXT( void );
                             __asm { iret                            }
 
 
-#endif /* ifndef PORT_ASM_H */
+#endif

portable/BCC/16BitDOS/common/portcomn.c

@@ -27,14 +27,14 @@
  */
 
 /*
- * Changes from V1.00:
+Changes from V1.00:
- *
+
     + pxPortInitialiseStack() now initialises the stack of new tasks to the
- +    same format used by the compiler.  This allows the compiler generated
+      same format used by the compiler.  This allows the compiler generated
- +    interrupt mechanism to be used for context switches.
+      interrupt mechanism to be used for context switches.
- +
+
- + Changes from V2.6.1
+Changes from V2.6.1
- +
+
     + Move usPortCheckFreeStackSpace() to tasks.c.
 */
 
@@ -46,14 +46,12 @@
 /*-----------------------------------------------------------*/
 
 /* 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 )
 {
 StackType_t DS_Reg = 0;
 
     /* Place a few bytes of known values on the bottom of the stack.
-     * This is just useful for debugging. */
+    This is just useful for debugging. */
 
     *pxTopOfStack = 0x1111;
     pxTopOfStack--;
@@ -70,8 +68,8 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
     /*lint -e950 -e611 -e923 Lint doesn't like this much - but nothing I can do about it. */
 
     /* We are going to start the scheduler using a return from interrupt
-     * instruction to load the program counter, so first there would be the
+    instruction to load the program counter, so first there would be the
-     * function call with parameters preamble. */
+    function call with parameters preamble. */
 
     *pxTopOfStack = FP_SEG( pvParameters );
     pxTopOfStack--;
@@ -91,8 +89,8 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
     pxTopOfStack--;
 
     /* The remaining registers would be pushed on the stack by our context
-     * switch function.  These are loaded with values simply to make debugging
+    switch function.  These are loaded with values simply to make debugging
-     * easier. */
+    easier. */
     *pxTopOfStack = ( StackType_t ) 0xAAAA; /* AX */
     pxTopOfStack--;
     *pxTopOfStack = ( StackType_t ) 0xBBBB; /* BX */
@@ -105,9 +103,7 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
     pxTopOfStack--;
 
     /* We need the true data segment. */
-    __asm {
+    __asm{  MOV DS_Reg, DS };
-        MOV DS_Reg, DS
-    };
 
     *pxTopOfStack = DS_Reg;                     /* DS */
     pxTopOfStack--;