From 9119dcc58157b15df6b0a83440596c47dfb3a6b9 Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Mon, 25 Mar 2013 17:00:13 +0000
Subject: [PATCH] RL78/IAR port - Allow the end user to define their own tick
 interrupt configuration by defining configSETUP_TIMER_INTERRUPT().

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1849 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 FreeRTOS/Source/portable/IAR/RL78/port.c | 25 ++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/FreeRTOS/Source/portable/IAR/RL78/port.c b/FreeRTOS/Source/portable/IAR/RL78/port.c
index b10aa52c7..bb39445d1 100644
--- a/FreeRTOS/Source/portable/IAR/RL78/port.c
+++ b/FreeRTOS/Source/portable/IAR/RL78/port.c
@@ -111,9 +111,17 @@ volatile unsigned short usCriticalNesting = portINITIAL_CRITICAL_NESTING;
 /*-----------------------------------------------------------*/
 
 /*
- * Sets up the periodic ISR used for the RTOS tick.
+ * Sets up the periodic ISR used for the RTOS tick using the interval timer.
+ * The application writer can define configSETUP_TIMER_INTERRUPT() (in
+ * FreeRTOSConfig.h) such that their own tick interrupt configuration is used
+ * in place of prvSetupTimerInterrupt().
  */
 static void prvSetupTimerInterrupt( void );
+#ifndef configSETUP_TIMER_INTERRUPT
+	/* The user has not provided their own tick interrupt configuration so use
+    the definition in this file (which uses the interval timer). */
+	#define configSETUP_TIMER_INTERRUPT() prvSetupTimerInterrupt()
+#endif /* configSETUP_TIMER_INTERRUPT */
 
 /*
  * Defined in portasm.s87, this function starts the scheduler by loading the
@@ -200,7 +208,7 @@ unsigned long *pulLocal;
 	first starts. */
 	*pxTopOfStack = ( portSTACK_TYPE ) portNO_CRITICAL_SECTION_NESTING;
 
-	/* Return a pointer to the top of the stack that has beene generated so it
+	/* Return a pointer to the top of the stack that has been generated so it
 	can	be stored in the task control block for the task. */
 	return pxTopOfStack;
 }
@@ -210,20 +218,25 @@ portBASE_TYPE xPortStartScheduler( void )
 {
 	/* Setup the hardware to generate the tick.  Interrupts are disabled when
 	this function is called. */
-	prvSetupTimerInterrupt();
+	configSETUP_TIMER_INTERRUPT();
 
 	/* Restore the context of the first task that is going to run. */
 	vPortStartFirstTask();
 
-	/* Execution should not reach here as the tasks are now running! */
+	/* Execution should not reach here as the tasks are now running!
+	prvSetupTimerInterrupt() is called here to prevent the compiler outputting
+	a warning about a statically declared function not being referenced in the
+	case that the application writer has provided their own tick interrupt
+	configuration routine (and defined configSETUP_TIMER_INTERRUPT() such that
+	their own routine will be called in place of prvSetupTimerInterrupt()). */
+	prvSetupTimerInterrupt();
 	return pdTRUE;
 }
 /*-----------------------------------------------------------*/
 
 void vPortEndScheduler( void )
 {
-	/* It is unlikely that the RL78/G13 port will get stopped.  If required simply
-	disable the tick interrupt here. */
+	/* It is unlikely that the RL78 port will get stopped. */
 }
 /*-----------------------------------------------------------*/
 
-- 
2.39.5