Change vTickISR() to vPortTickISR() in the new MicroBlaze demo.

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

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c
index 5a62d0cf78cf28b9a73dfd687b0bd6ae255365d7..49986600022dc892f0955a4eaac6d5869ab25f4f 100644 (file)
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c
@@ -466,14 +466,14 @@ will run on lots of different MicroBlaze and FPGA configurations - not all of
 which will have the same timer peripherals defined or available.  This example\r
 uses the AXI Timer 0.  If that is available on your hardware platform then this\r
 example callback implementation should not require modification.   The name of\r
-the interrupt handler that should be installed is vTickISR(), which the function\r
-below declares as an extern. */\r
+the interrupt handler that should be installed is vPortTickISR(), which the \r
+function below declares as an extern. */\r
 void vApplicationSetupTimerInterrupt( void )\r
 {\r
 portBASE_TYPE xStatus;\r
 const unsigned char ucTimerCounterNumber = ( unsigned char ) 0U;\r
 const unsigned long ulCounterValue = ( ( XPAR_AXI_TIMER_0_CLOCK_FREQ_HZ / configTICK_RATE_HZ ) - 1UL );\r
-extern void vTickISR( void *pvUnused );\r
+extern void vPortTickISR( void *pvUnused );\r
 \r
        /* Initialise the timer/counter. */\r
        xStatus = XTmrCtr_Initialize( &xTimer0Instance, XPAR_AXI_TIMER_0_DEVICE_ID );\r
@@ -483,7 +483,7 @@ extern void vTickISR( void *pvUnused );
                /* Install the tick interrupt handler as the timer ISR. \r
                *NOTE* The xPortInstallInterruptHandler() API function must be used for\r
                this purpose. */\r
-               xStatus = xPortInstallInterruptHandler( XPAR_INTC_0_TMRCTR_0_VEC_ID, vTickISR, NULL );\r
+               xStatus = xPortInstallInterruptHandler( XPAR_INTC_0_TMRCTR_0_VEC_ID, vPortTickISR, NULL );\r
        }\r
 \r
        if( xStatus == pdPASS )\r
@@ -494,7 +494,7 @@ extern void vTickISR( void *pvUnused );
                vPortEnableInterrupt( XPAR_INTC_0_TMRCTR_0_VEC_ID );\r
 \r
                /* Configure the timer interrupt handler. */\r
-               XTmrCtr_SetHandler( &xTimer0Instance, ( void * ) vTickISR, NULL );\r
+               XTmrCtr_SetHandler( &xTimer0Instance, ( void * ) vPortTickISR, NULL );\r
 \r
                /* Set the correct period for the timer. */\r
                XTmrCtr_SetResetValue( &xTimer0Instance, ucTimerCounterNumber, ulCounterValue );\r

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c
index b7cce545698b37ed5d5089003bb802e17cff1893..07671179a91fb941c70624499ae6db2401d794a8 100644 (file)
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c
@@ -80,10 +80,10 @@
  *\r
  * "Check" timer - The check timer period is initially set to five seconds.  \r
  * The check timer callback function checks that all the standard demo tasks,\r
- * and the register check tasks, are not only still execution, but are executing\r
+ * and the register check tasks, are not only still executing, but are executing\r
  * without reporting any errors.  If the check timer discovers that a task has\r
- * either stalled or reported an error, then it changes its own period from\r
- * the inital five seconds, to just 200ms.  The check timer callback function \r
+ * either stalled, or reported an error, then it changes its own period from\r
+ * the initial five seconds, to just 200ms.  The check timer callback function\r
  * also toggles an LED each time it is called.  This provides a visual\r
  * indication of the system status:  If the LED toggles every five seconds then\r
  * no issues have been discovered.  If the LED toggles every 200ms then an issue\r
@@ -386,14 +386,14 @@ will run on lots of different MicroBlaze and FPGA configurations - not all of
 which will have the same timer peripherals defined or available.  This example\r
 uses the AXI Timer 0.  If that is available on your hardware platform then this\r
 example callback implementation should not require modification.   The name of\r
-the interrupt handler that should be installed is vTickISR(), which the function\r
-below declares as an extern. */\r
+the interrupt handler that should be installed is vPortTickISR(), which the \r
+function below declares as an extern. */\r
 void vApplicationSetupTimerInterrupt( void )\r
 {\r
 portBASE_TYPE xStatus;\r
 const unsigned char ucTimerCounterNumber = ( unsigned char ) 0U;\r
 const unsigned long ulCounterValue = ( ( XPAR_AXI_TIMER_0_CLOCK_FREQ_HZ / configTICK_RATE_HZ ) - 1UL );\r
-extern void vTickISR( void *pvUnused );\r
+extern void vPortTickISR( void *pvUnused );\r
 \r
        /* Initialise the timer/counter. */\r
        xStatus = XTmrCtr_Initialize( &xTimer0Instance, XPAR_AXI_TIMER_0_DEVICE_ID );\r
@@ -403,7 +403,7 @@ extern void vTickISR( void *pvUnused );
                /* Install the tick interrupt handler as the timer ISR. \r
                *NOTE* The xPortInstallInterruptHandler() API function must be used for\r
                this purpose. */\r
-               xStatus = xPortInstallInterruptHandler( XPAR_INTC_0_TMRCTR_0_VEC_ID, vTickISR, NULL );\r
+               xStatus = xPortInstallInterruptHandler( XPAR_INTC_0_TMRCTR_0_VEC_ID, vPortTickISR, NULL );\r
        }\r
 \r
        if( xStatus == pdPASS )\r
@@ -414,7 +414,7 @@ extern void vTickISR( void *pvUnused );
                vPortEnableInterrupt( XPAR_INTC_0_TMRCTR_0_VEC_ID );\r
 \r
                /* Configure the timer interrupt handler. */\r
-               XTmrCtr_SetHandler( &xTimer0Instance, ( void * ) vTickISR, NULL );\r
+               XTmrCtr_SetHandler( &xTimer0Instance, ( void * ) vPortTickISR, NULL );\r
 \r
                /* Set the correct period for the timer. */\r
                XTmrCtr_SetResetValue( &xTimer0Instance, ucTimerCounterNumber, ulCounterValue );\r