10.3.0-7

Author: feilipu

library.properties

@@ -1,8 +1,8 @@
 name=FreeRTOS
-version=10.3.0-6
+version=10.3.0-7
 author=Richard Barry <info@freertos.org>
 maintainer=Phillip Stevens <phillip.stevens@gmail.com>
-sentence=FreeRTOS Real Time Operating System implemented for AVR (Uno, Leonardo, Mega).
+sentence=<h3>FreeRTOS Real Time Operating System implemented for AVR (Uno, Nano, Leonardo, Mega).</h3>
 paragraph=The primary design goals are: Easy to use, Small footprint, Robust. Uses Watchdog Timer for 15ms resolution. Slow blink = stack overflow. Fast blink = heap malloc() failure.
 category=Timing
 url=https://github.com/feilipu/Arduino_FreeRTOS_Library

src/port.c

@@ -50,12 +50,6 @@ any details of its type. */
 typedef void TCB_t;
 extern volatile TCB_t * volatile pxCurrentTCB;
 
-/*-----------------------------------------------------------*/
-/*
- * Perform hardware setup to enable ticks from Watchdog Timer.
- */
-static void prvSetupTimerInterrupt( void );
-
 /*-----------------------------------------------------------*/
 
 /*
@@ -374,6 +368,11 @@ static void prvSetupTimerInterrupt( void );
 #endif
 /*-----------------------------------------------------------*/
 
+/*
+ * Perform hardware setup to enable ticks from Watchdog Timer.
+ */
+static void prvSetupTimerInterrupt( void );
+/*-----------------------------------------------------------*/
 
 /*
  * See header file for description.
@@ -397,36 +396,28 @@ uint16_t usAddress;
 
     /* The start of the task code will be popped off the stack last, so place
     it on first. */
+    usAddress = ( uint16_t ) pxCode;
+    *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );
+    pxTopOfStack--;
+
+    usAddress >>= 8;
+    *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );
+    pxTopOfStack--;
 
 #if defined(__AVR_3_BYTE_PC__)
     /* The AVR ATmega2560/ATmega2561 have 256KBytes of program memory and a 17-bit
-     * program counter.  When a code address is stored on the stack, it takes 3 bytes
+     * program counter. When a code address is stored on the stack, it takes 3 bytes
      * instead of 2 for the other ATmega* chips.
      *
      * Store 0 as the top byte since we force all task routines to the bottom 128K
      * of flash. We do this by using the .lowtext label in the linker script.
      *
      * In order to do this properly, we would need to get a full 3-byte pointer to
-     * pxCode.  That requires a change to GCC.  Not likely to happen any time soon.
+     * pxCode. That requires a change to GCC. Not likely to happen any time soon.
      */
-    usAddress = ( uint16_t ) pxCode;
-    *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );
-    pxTopOfStack--;
-
-    usAddress >>= 8;
-    *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );
-    pxTopOfStack--;
 
     *pxTopOfStack = 0;
     pxTopOfStack--;
-#else
-    usAddress = ( uint16_t ) pxCode;
-    *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );
-    pxTopOfStack--;
-
-    usAddress >>= 8;
-    *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );
-    pxTopOfStack--;
 #endif
 
     /* Next simulate the stack as if after a call to portSAVE_CONTEXT().
@@ -454,7 +445,7 @@ uint16_t usAddress;
     pxTopOfStack--;
 #endif
 
-    /* Now the remaining registers.   The compiler expects R1 to be 0. */
+    /* Now the remaining registers. The compiler expects R1 to be 0. */
     *pxTopOfStack = ( StackType_t ) 0x00;    /* R1 */
     pxTopOfStack--;
     *pxTopOfStack = ( StackType_t ) 0x02;    /* R2 */
@@ -521,7 +512,7 @@ uint16_t usAddress;
     pxTopOfStack--;
     *pxTopOfStack = ( StackType_t ) 0x30;    /* R30 Z */
     pxTopOfStack--;
-    *pxTopOfStack = ( StackType_t ) 0x031;    /* R31 */
+    *pxTopOfStack = ( StackType_t ) 0x031;   /* R31 */
     pxTopOfStack--;
 
     return pxTopOfStack;
@@ -536,7 +527,7 @@ BaseType_t xPortStartScheduler( void )
     /* Restore the context of the first task that is going to run. */
     portRESTORE_CONTEXT();
 
-    /* Simulate a function call end as generated by the compiler.  We will now
+    /* Simulate a function call end as generated by the compiler. We will now
     jump to the start of the task the context of which we have just restored. */
     __asm__ __volatile__ ( "ret" );
 
@@ -550,12 +541,12 @@ void vPortEndScheduler( void )
     /* It is unlikely that the AVR port will get stopped.  If required simply
     disable the tick interrupt here. */
 
-    wdt_disable();    // disable Watchdog Timer
+        wdt_disable();      /* disable Watchdog Timer */
 }
 /*-----------------------------------------------------------*/
 
 /*
- * Manual context switch.  The first thing we do is save the registers so we
+ * Manual context switch. The first thing we do is save the registers so we
  * can use a naked attribute.
  */
 void vPortYield( void ) __attribute__ ( ( hot, flatten, naked ) );
@@ -570,23 +561,20 @@ void vPortYield( void )
 /*-----------------------------------------------------------*/
 
 /*
- * Context switch function used by the tick.  This must be identical to
- * vPortYield() from the call to vTaskSwitchContext() onwards.  The only
+ * Context switch function used by the tick. This must be identical to
+ * vPortYield() from the call to vTaskSwitchContext() onwards. The only
  * difference from vPortYield() is the tick count is incremented as the
  * call comes from the tick ISR.
  */
 void vPortYieldFromTick( void ) __attribute__ ( ( hot, flatten, naked ) );
 void vPortYieldFromTick( void )
 {
     portSAVE_CONTEXT();
-
-    sleep_reset();        // reset the sleep_mode() faster than sleep_disable();
-
+    sleep_reset();        /* reset the sleep_mode() faster than sleep_disable(); */
     if( xTaskIncrementTick() != pdFALSE )
     {
         vTaskSwitchContext();
     }
-
     portRESTORE_CONTEXT();
 
     __asm__ __volatile__ ( "ret" );
@@ -604,14 +592,13 @@ void prvSetupTimerInterrupt( void )
     /* set up WDT Interrupt (rather than the WDT Reset). */
     wdt_interrupt_enable( portUSE_WDTO );
 }
-
 /*-----------------------------------------------------------*/
 
 #if configUSE_PREEMPTION == 1
 
     /*
-     * Tick ISR for preemptive scheduler.  We can use a naked attribute as
-     * the context is saved at the start of vPortYieldFromTick().  The tick
+     * Tick ISR for preemptive scheduler. We can use a naked attribute as
+     * the context is saved at the start of vPortYieldFromTick(). The tick
      * count is incremented after the context is saved.
      *
      * use ISR_NOBLOCK where there is an important timer running, that should preempt the scheduler.
@@ -628,8 +615,8 @@ void prvSetupTimerInterrupt( void )
 #else
 
     /*
-     * Tick ISR for the cooperative scheduler.  All this does is increment the
-     * tick count.  We don't need to switch context, this can only be done by
+     * Tick ISR for the cooperative scheduler. All this does is increment the
+     * tick count. We don't need to switch context, this can only be done by
      * manual calls to taskYIELD();
      *
      * use ISR_NOBLOCK where there is an important timer running, that should preempt the scheduler.

src/portmacro.h

@@ -76,12 +76,11 @@ typedef uint8_t                     UBaseType_t;
 
 #define portDISABLE_INTERRUPTS()    __asm__ __volatile__ ( "cli" ::: "memory")
 #define portENABLE_INTERRUPTS()     __asm__ __volatile__ ( "sei" ::: "memory")
-
 /*-----------------------------------------------------------*/
 
 /* Architecture specifics. */
 
-#define sleep_reset()                   do { _SLEEP_CONTROL_REG = 0; } while(0)     // reset all sleep_mode() configurations.
+#define sleep_reset()                   do { _SLEEP_CONTROL_REG = 0; } while(0)     /* reset all sleep_mode() configurations. */
 
 #define portSTACK_GROWTH            ( -1 )