Merge branch 'main' into fixSDCCFormatting

Author: aggarg

portable/MPLAB/PIC18F/port.c

@@ -40,67 +40,65 @@
  */
 
 /* Type definitions. */
-#define portCHAR          char
-#define portFLOAT         float
-#define portDOUBLE        double
-#define portLONG          long
-#define portSHORT         int
-#define portSTACK_TYPE    uint8_t
-#define portBASE_TYPE     char
+#define portCHAR        char
+#define portFLOAT       float
+#define portDOUBLE      double
+#define portLONG        long
+#define portSHORT       int
+#define portSTACK_TYPE  uint8_t
+#define portBASE_TYPE   char
 
-typedef portSTACK_TYPE   StackType_t;
-typedef signed char      BaseType_t;
-typedef unsigned char    UBaseType_t;
+typedef portSTACK_TYPE StackType_t;
+typedef signed char BaseType_t;
+typedef unsigned char UBaseType_t;
 
-#if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
-    typedef uint16_t     TickType_t;
-    #define portMAX_DELAY    ( TickType_t ) 0xffff
-#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
-    typedef uint32_t     TickType_t;
+#if( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
+    typedef uint16_t TickType_t;
+    #define portMAX_DELAY ( TickType_t ) 0xffff
+#elif ( configTICK_TYPE_WIDTH_IN_BITS  == TICK_TYPE_WIDTH_32_BITS )
+    typedef uint32_t             TickType_t;
     #define portMAX_DELAY    ( TickType_t ) 0xffffffffUL
 #else
     #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
 #endif
 /*-----------------------------------------------------------*/
 
 /* Hardware specifics. */
-#define portBYTE_ALIGNMENT           1
-#define portGLOBAL_INT_ENABLE_BIT    0x80
-#define portSTACK_GROWTH             1
-#define portTICK_PERIOD_MS           ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
+#define portBYTE_ALIGNMENT          1
+#define portGLOBAL_INT_ENABLE_BIT   0x80
+#define portSTACK_GROWTH            1
+#define portTICK_PERIOD_MS          ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
 /*-----------------------------------------------------------*/
 
 /* Critical section management. */
 #define portDISABLE_INTERRUPTS()    INTCONbits.GIEH = 0;
 #define portENABLE_INTERRUPTS()     INTCONbits.GIEH = 1;
 
 /* Push the INTCON register onto the stack, then disable interrupts. */
-#define portENTER_CRITICAL() \
-    POSTINC1 = INTCON;       \
-    INTCONbits.GIEH = 0;
+#define portENTER_CRITICAL()        POSTINC1 = INTCON;              \
+                                    INTCONbits.GIEH = 0;
 
 /* Retrieve the INTCON register from the stack, and enable interrupts
- * if they were saved as being enabled.  Don't modify any other bits
- * within the INTCON register as these may have legitimately have been
- * modified within the critical region. */
-#define portEXIT_CRITICAL()                 \
-    _asm                                    \
-    MOVF POSTDEC1, 1, 0                     \
-    _endasm                                 \
-    if( INDF1 & portGLOBAL_INT_ENABLE_BIT ) \
-    {                                       \
-        portENABLE_INTERRUPTS();            \
-    }
+if they were saved as being enabled.  Don't modify any other bits
+within the INTCON register as these may have legitimately have been
+modified within the critical region. */
+#define portEXIT_CRITICAL()         _asm                                    \
+                                        MOVF    POSTDEC1, 1, 0              \
+                                    _endasm                                 \
+                                    if( INDF1 & portGLOBAL_INT_ENABLE_BIT ) \
+                                    {                                       \
+                                        portENABLE_INTERRUPTS();            \
+                                    }
 /*-----------------------------------------------------------*/
 
 /* Task utilities. */
 extern void vPortYield( void );
-#define portYIELD()    vPortYield()
+#define portYIELD()             vPortYield()
 /*-----------------------------------------------------------*/
 
 /* Task function macros as described on the FreeRTOS.org WEB site. */
-#define portTASK_FUNCTION_PROTO( vFunction, pvParameters )    void vFunction( void * pvParameters )
-#define portTASK_FUNCTION( vFunction, pvParameters )          void vFunction( void * pvParameters )
+#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
+#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
 /*-----------------------------------------------------------*/
 
 /* Required by the kernel aware debugger. */
@@ -109,9 +107,8 @@ extern void vPortYield( void );
 #endif
 
 
-#define portNOP() \
-    _asm          \
-    NOP           \
-    _endasm
+#define portNOP()               _asm    \
+                                    NOP \
+                                _endasm
 
 #endif /* PORTMACRO_H */