Add interrupt nesting test code into RX64M demo.

FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/IntQueueTimer.c

@@ -64,7 +64,7 @@
 */
 
 /*
- * This file contains the non-portable and therefore RX62N specific parts of
+ * This file contains the non-portable and therefore RX64M specific parts of
  * the IntQueue standard demo task - namely the configuration of the timers
  * that generate the interrupts and the interrupt entry points.
  */
@@ -79,16 +79,18 @@
 
 /* Renesas includes. */
 #include "r_cg_macrodriver.h"
+#include "RegisterWriteProtect.h"
 
 #define tmrTIMER_0_1_FREQUENCY	( 2000UL )
 #define tmrTIMER_2_3_FREQUENCY	( 2001UL )
 
 void vInitialiseTimerForIntQueueTest( void )
 {
-#if 0
 	/* Ensure interrupts do not start until full configuration is complete. */
 	portENTER_CRITICAL();
 	{
+		EnablePRCR( PRC1_BIT );
+
 		/* Cascade two 8bit timer channels to generate the interrupts. 
 		8bit timer unit 1 (TMR0 and TMR1) and 8bit timer unit 2 (TMR2 and TMR3 are
 		utilised for this test. */
@@ -120,41 +122,41 @@ void vInitialiseTimerForIntQueueTest( void )
 		/* Divide PCLK by 8. */
 		TMR1.TCCR.BIT.CKS = 2;
 		TMR3.TCCR.BIT.CKS = 2;
-#warning Need to enable and configure interrupts here.
+
 		/* Enable TMR 0, 2 interrupts. */
-//		IEN( TMR0, CMIA0 ) = 1;
+		TMR0.TCR.BIT.CMIEA = 1;
-//		IEN( TMR2, CMIA2 ) = 1;
+		TMR2.TCR.BIT.CMIEA = 1;
-// CMT		_IEN( _CMT0_CMI0 ) = 1;
 
-		/* ...and set its priority to the application defined kernel priority. */
+		/* Map TMR0 CMIA0 interrupt to vector slot B number 128 and set
-// CMT		_IPR( _CMT0_CMI0 ) = configKERNEL_INTERRUPT_PRIORITY;
+		priority above the kernel's priority, but below the max syscall
+		priority. */
+	    ICU.SLIBXR128.BYTE = 3; /* Three is TMR0 compare match A. */
+	    IPR( PERIB, INTB128 ) = configMAX_SYSCALL_INTERRUPT_PRIORITY - 1;
+		IEN( PERIB, INTB128 ) = 1;
 
+		/* Ensure that the flag is set to 0, otherwise the interrupt will not be
+		accepted. */
+		IR( PERIB, INTB128 ) = 0;
 
-
+		/* Do the same for TMR2, but to vector 129. */
-		/* Set the timer interrupts to be above the kernel.  The interrupts are
+	    ICU.SLIBXR129.BYTE = 9; /* Nine is TMR2 compare match A. */
-		assigned different priorities so they nest with each other. */
+	    IPR( PERIB, INTB129 ) = configMAX_SYSCALL_INTERRUPT_PRIORITY - 2;
-//		IPR( TMR0, CMIA0 ) = configMAX_SYSCALL_INTERRUPT_PRIORITY - 1;
+		IEN( PERIB, INTB129 ) = 1;
-//		IPR( TMR2, CMIA2 ) = ( configMAX_SYSCALL_INTERRUPT_PRIORITY - 2 );
+		IR( PERIB, INTB129 ) = 0;
 	}
 	portEXIT_CRITICAL();
-	
-	/* Ensure the interrupts are clear as they are edge detected. */
-//	IR( TMR0, CMIA0 ) = 0;
-//	IR( TMR2, CMIA2 ) = 0;
-#endif
 }
 /*-----------------------------------------------------------*/
 
-//#pragma interrupt ( vT0_1InterruptHandler( vect = VECT_TMR0_CMIA0, enable ) )
+#pragma interrupt ( Excep_PERIB_INTB128( vect = 128 ) )
-// CMT#pragma interrupt (vT0_1InterruptHandler( vect = _VECT( _CMT0_CMI0 ), enable ) )
+void Excep_PERIB_INTB128( void )
-void vT0_1InterruptHandler( void )
 {
 	portYIELD_FROM_ISR( xFirstTimerHandler() );
 }
 /*-----------------------------------------------------------*/
 
-//#pragma interrupt ( vT2_3InterruptHandler( vect = VECT_TMR2_CMIA2, enable ) )
+#pragma interrupt ( Excep_PERIB_INTB129( vect = 129 ) )
-void vT2_3InterruptHandler( void )
+void Excep_PERIB_INTB129( void )
 {
 	portYIELD_FROM_ISR( xSecondTimerHandler() );
 }

FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/RegisterWriteProtect.c

@@ -0,0 +1,72 @@
+/*
+ * RegisterWriteProtect.c
+ *
+ *  Created on: 4 Mar 2014
+ *      Author: WarnerR
+ */
+
+#include "r_cg_iodefine.h"
+#include "stdint.h"
+
+#define	PRC0_BIT	0x0001
+#define	PRC1_BIT	0x0002
+#define	PRC3_BIT	0x0008
+
+
+void EnablePRCR( uint16_t protect )
+{
+	/*
+	 * PRCR 	Bit Register to be Protected
+	 * -----------------------------------------------------------------------------------------------------------------------------------------
+	 * PRC0 	Registers related to the clock generation circuit:
+	 * 			SCKCR, SCKCR2, SCKCR3, PLLCR, PLLCR2, BCKCR, MOSCCR, SOSCCR, LOCOCR, ILOCOCR, HOCOCR, HOCOCR2, OSTDCR, OSTDSR
+	 *
+	 * PRC1 	Registers related to the operating modes:
+	 * 			SYSCR0, SYSCR1
+	 *
+	 * 			Registers related to the low power consumption functions:
+	 * 			SBYCR, MSTPCRA, MSTPCRB, MSTPCRC, MSTPCRD, OPCCR, RSTCKCR, DPSBYCR, DPSIER0 to DPSIER3, DPSIFR0 to DPSIFR3, DPSIEGR0 to DPSIEGR3
+	 *
+	 * 			Registers related to clock generation circuit:
+	 * 			MOSCWTCR, SOSCWTCR, MOFCR, HOCOPCR
+	 *
+	 * 			Software reset register:
+	 * 			SWRR
+	 *
+	 * PRC3 	Registers related to the LVD:
+	 * 			LVCMPCR, LVDLVLR, LVD1CR0, LVD1CR1, LVD1SR, LVD2CR0, LVD2CR1, LVD2SR
+	 */
+	SYSTEM.PRCR.WORD = (uint16_t)( 0xA500 | protect );
+}
+
+void DisablePRCR( uint16_t protect )
+{
+	/*
+	 * PRCR 	Bit Register to be Protected
+	 * -----------------------------------------------------------------------------------------------------------------------------------------
+	 * PRC0 	Registers related to the clock generation circuit:
+	 * 			SCKCR, SCKCR2, SCKCR3, PLLCR, PLLCR2, BCKCR, MOSCCR, SOSCCR, LOCOCR, ILOCOCR, HOCOCR, HOCOCR2, OSTDCR, OSTDSR
+	 *
+	 * PRC1 	Registers related to the operating modes:
+	 * 			SYSCR0, SYSCR1
+	 *
+	 * 			Registers related to the low power consumption functions:
+	 * 			SBYCR, MSTPCRA, MSTPCRB, MSTPCRC, MSTPCRD, OPCCR, RSTCKCR, DPSBYCR, DPSIER0 to DPSIER3, DPSIFR0 to DPSIFR3, DPSIEGR0 to DPSIEGR3
+	 *
+	 * 			Registers related to clock generation circuit:
+	 * 			MOSCWTCR, SOSCWTCR, MOFCR, HOCOPCR
+	 *
+	 * 			Software reset register:
+	 * 			SWRR
+	 *
+	 * PRC3 	Registers related to the LVD:
+	 * 			LVCMPCR, LVDLVLR, LVD1CR0, LVD1CR1, LVD1SR, LVD2CR0, LVD2CR1, LVD2SR
+	 */
+	uint16_t current_value;
+
+	current_value = (uint16_t)( SYSTEM.PRCR.WORD & 0x00ff );
+	current_value = (uint16_t)( current_value & ~protect );
+
+	SYSTEM.PRCR.WORD = (uint16_t)( 0xA500 | current_value );
+}
+

FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/RegisterWriteProtect.h

@@ -0,0 +1,22 @@
+/*
+ * RegisterWriteProtect.h
+ *
+ *  Created on: 4 Mar 2014
+ *      Author: WarnerR
+ */
+
+#ifndef REGISTERWRITEPROTECT_H_
+#define REGISTERWRITEPROTECT_H_
+
+#include "stdint.h"
+
+#define	PRC0_BIT	0x0001
+#define	PRC1_BIT	0x0002
+#define	PRC3_BIT	0x0008
+
+
+extern void EnablePRCR( uint16_t protect );
+extern void DisablePRCR( uint16_t protect );
+
+
+#endif /* REGISTERWRITEPROTECT_H_ */

FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/main_full.c

@@ -299,9 +299,9 @@ unsigned long ulErrorFound = pdFALSE;
 
 		/* Check all the demo tasks (other than the flash tasks) to ensure
 		that they are all still running, and that none have detected an error. */
-//		if( xAreIntQueueTasksStillRunning() != pdTRUE )
+		if( xAreIntQueueTasksStillRunning() != pdTRUE )
 		{
-//			ulErrorFound = pdTRUE;
+			ulErrorFound = pdTRUE;
 		}
 
 		if( xAreMathsTaskStillRunning() != pdTRUE )