Change default vector number to 16.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@473 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 1389e4bda521343ab288f28a54b904bae492c778..c66cb3c210745d0de95552871433e3cb22e64125 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -97,7 +97,7 @@ to exclude the API function. */
 #define INCLUDE_vTaskDelay                                     1\r
 #define INCLUDE_uxTaskGetStackHighWaterMark    1\r
 \r
-#define configYIELD_INTERRUPT_VECTOR                   63UL\r
+#define configYIELD_INTERRUPT_VECTOR                   16UL\r
 #define configKERNEL_INTERRUPT_PRIORITY                1\r
 #define configMAX_SYSCALL_INTERRUPT_PRIORITY   4\r
 \r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
index ef6ce42418ea360d204fb1626969a43e125ca8ed..6627786ebc7da7ea10ae2ece684003f94b0beef7 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
@@ -59,7 +59,7 @@
 /*\r
  * FreeRTOS.org requires two interrupts - a tick interrupt generated from a\r
  * timer source, and a spare interrupt vector used for context switching.\r
- * The configuration below uses PIT0 for the former, and vector 63 for the\r
+ * The configuration below uses PIT0 for the former, and vector 16 for the\r
  * latter.  **IF YOUR APPLICATION HAS BOTH OF THESE INTERRUPTS FREE THEN YOU DO\r
  * NOT NEED TO CHANGE ANY OF THIS CODE** - otherwise instructions are provided\r
  * here for using alternative interrupt sources.\r
@@ -82,14 +82,15 @@
  *  1) Modify vApplicationSetupInterrupts() below to be correct for whichever\r
  *  interrupt vector is to be used.  Make sure you use a spare interrupt on interrupt\r
  *  controller 0, otherwise the register used to request context switches will also\r
- *  require modification.\r
+ *  require modification.  By default vector 16 is used which is free on most MCF52xxx\r
+ *  devices.\r
  *\r
  *  2) Change the definition of configYIELD_INTERRUPT_VECTOR within FreeRTOSConfig.h\r
  *  to be correct for your chosen interrupt vector.\r
  *\r
- *  3) Change the name of the function __cs3_isr_interrupt_127() within portasm.S\r
+ *  3) Change the name of the function __cs3_isr_interrupt_80() within portasm.S\r
  *  to be correct for whichever vector number is being used.  By default interrupt\r
- *  controller 0 number 63 is used, which corresponds to vector number 127.
+ *  controller 0 vector number 16 is used, which corresponds to vector number 80.
  */\r
 void vApplicationSetupInterrupts( void )\r
 {\r
@@ -99,11 +100,11 @@ const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRES
     MCF_INTC0_ICR55 = ( 1 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) );\r
     MCF_INTC0_IMRH &= ~( MCF_INTC_IMRH_INT_MASK55 );\r
 \r
-    /* Do the same for vector 63 (interrupt controller 0.  I don't think the\r
+    /* Do the same for vector 16 (interrupt controller 0).  I don't think the\r
     write to MCF_INTC0_IMRH is actually required here but is included for\r
     completeness. */\r
-    MCF_INTC0_ICR63 = ( 0 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) );\r
-    MCF_INTC0_IMRH &= ~( MCF_INTC_IMRH_INT_MASK63 );\r
+    MCF_INTC0_ICR16 = ( 0 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) );\r
+    MCF_INTC0_IMRH &= ~( MCF_INTC_IMRH_INT_MASK16 );\r
 \r
     /* Configure PIT0 to generate the RTOS tick. */\r
     MCF_PIT0_PCSR |= MCF_PIT_PCSR_PIF;\r