minor cleanups - no functional changes

Author: feilipu

src/FreeRTOSConfig.h

@@ -108,7 +108,6 @@
 
 #define configSUPPORT_DYNAMIC_ALLOCATION    1
 
-
 /* Timer definitions. */
 #define configUSE_TIMERS                    1
 #define configTIMER_TASK_PRIORITY           ( ( UBaseType_t ) 3 )
@@ -128,7 +127,7 @@ to exclude the API function. */
 #define INCLUDE_vTaskPrioritySet                1
 #define INCLUDE_uxTaskPriorityGet               1
 #define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
+#define INCLUDE_vTaskCleanUpResources           1
 #define INCLUDE_vTaskSuspend                    1
 #define INCLUDE_vResumeFromISR                  1
 #define INCLUDE_vTaskDelayUntil                 1

src/mpu_wrappers.h

@@ -191,7 +191,7 @@ only for ports that are using the MPU. */
 #else /* portUSING_MPU_WRAPPERS */
 
 #if defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)	// Mega with 2560
-	#define PRIVILEGED_FUNCTION		__attribute__ ((hot, flatten))
+	#define PRIVILEGED_FUNCTION		__attribute__ ((hot))
 	#define PRIVILEGED_DATA
 	#define portUSING_MPU_WRAPPERS 0
 #elif defined(__AVR_ATmega640__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega1281__) || defined(__AVR_ATmega664P__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284PA__) // Goldilocks with 1284p

src/port.c

@@ -552,9 +552,9 @@ void prvSetupTimerInterrupt( void )
 	 * use ISR_NOBLOCK where there is an important timer running, that should preempt the scheduler.
 	 *
 	 */
-//	ISR(portSCHEDULER_ISR, ISR_NAKED ISR_NOBLOCK)
+//	ISR(portSCHEDULER_ISR, ISR_NAKED ISR_NOBLOCK) __attribute__ ((hot, flatten));
 	ISR(portSCHEDULER_ISR, ISR_NAKED) __attribute__ ((hot, flatten));
-	ISR(portSCHEDULER_ISR, ISR_NAKED)
+	ISR(portSCHEDULER_ISR)
 	{
 		vPortYieldFromTick();
 		__asm__ __volatile__ ( "reti" );
@@ -568,7 +568,7 @@ void prvSetupTimerInterrupt( void )
 	 *
 	 * use ISR_NOBLOCK where there is an important timer running, that should preempt the scheduler.
 	 */
-//	ISR(portSCHEDULER_ISR, ISR_NOBLOCK)
+//	ISR(portSCHEDULER_ISR, ISR_NOBLOCK) __attribute__ ((hot, flatten));
 	ISR(portSCHEDULER_ISR) __attribute__ ((hot, flatten));
 	ISR(portSCHEDULER_ISR)
 	{

src/portmacro.h

@@ -134,6 +134,7 @@ typedef unsigned char UBaseType_t;
 #define portENABLE_INTERRUPTS()         __asm__ __volatile__ ( "sei" ::: "memory")
 
 /*-----------------------------------------------------------*/
+
 /**
 	Enable the watchdog timer, configuring it for expire after
 	(value) timeout (which is a combination of the WDP0
@@ -214,7 +215,6 @@ typedef unsigned char UBaseType_t;
  * from data sheet.
  */
 #define portTICK_PERIOD_MS              ( (TickType_t) _BV( portUSE_WDTO + 4 ) )	// Inaccurately assuming 128 kHz Watchdog Timer.
-// #define portTICK_PERIOD_MS           ( (TickType_t)( (uint32_t) _BV( portUSE_WDTO + 11 ) / 128 ) )	// If you want accuracy, read datasheet.
 
 /*-----------------------------------------------------------*/
 
@@ -228,15 +228,11 @@ extern void vPortYield( void )          __attribute__ ( ( naked ) );
 /* Task function macros as described on the FreeRTOS.org WEB site. */
 // This changed to add .lowtext tag for the linker for ATmega2560 and ATmega2561. To make sure they are loaded in low memory.
 #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) __attribute__ ((section (".lowtext")))
-#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
-
 #else
 #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
-#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
-
 #endif
 
-
+#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
 
 #ifdef __cplusplus
 }