diff --git a/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h b/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
index 45a9615b1..654e7c847 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
+++ b/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
@@ -102,11 +102,11 @@ to exclude the API function. */
/* The MSP430X port uses a callback function to configure its tick interrupt.
This allows the application to choose the tick interrupt source.
-configTICK_INTERRUPT_VECTOR must also be set in FreeRTOSConfig.h to the correct
+configTICK_VECTOR must also be set in FreeRTOSConfig.h to the correct
interrupt vector for the chosen tick interrupt source. This implementation of
vApplicationSetupTimerInterrupt() generates the tick from timer A0, so in this
-case configTICK_INTERRUPT_VECTOR is set to TIMER0_A0_VECTOR. */
-#define configTICK_INTERRUPT_VECTOR TIMER0_A0_VECTOR
+case configTICK__VECTOR is set to TIMER0_A0_VECTOR. */
+#define configTICK_VECTOR TIMER0_A0_VECTOR
/* Prevent the following definitions being included when FreeRTOSConfig.h
is included from an asm file. */
diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
index c8337cd83..0828b08a0 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
@@ -324,7 +324,7 @@
$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin
- 1
+ 0
$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin
diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
index 5411070b8..2d3fc825c 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
@@ -58,11 +58,11 @@
RTConfigPath
- $TOOLKIT_DIR$\LIB\DLIB\dl430xlff.h
+ $TOOLKIT_DIR$\LIB\DLIB\dl430xmff.h
RTLibraryPath
- $TOOLKIT_DIR$\LIB\DLIB\dl430xlff.r43
+ $TOOLKIT_DIR$\LIB\DLIB\dl430xmff.r43
Input variant
@@ -76,11 +76,11 @@
Output variant
0
- 4
+ 3
Output description
- No specifier a or A, no specifier n, no float or long long, no flags.
+ No specifier a or A, no specifier n, no float or long long.
GRuntimeLibSelectSlave
diff --git a/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c b/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c
index 94dd0f953..c0ec7be19 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c
+++ b/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c
@@ -78,8 +78,8 @@ void vConfigureTimerForRunTimeStats( void )
/* Ensure the timer is stopped. */
TA1CTL = 0;
- /* Run the timer from the ACLK/4. */
- TA1CTL = TASSEL_1 | ID__4;
+ /* Run the timer from the ACLK/2. */
+ TA1CTL = TASSEL_1 | ID__2;
/* Clear everything to start with. */
TA1CTL |= TACLR;
@@ -90,6 +90,9 @@ void vConfigureTimerForRunTimeStats( void )
/* Start up clean. */
TA1CTL |= TACLR;
+ /* No overflows can have occurred yet. */
+ ulStatsOverflowCount = 0UL;
+
/* Continuous mode. */
TA1CTL |= MC__CONTINOUS;
}
diff --git a/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl b/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
index 99dc499d9..999d1f6e0 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
+++ b/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
@@ -193,11 +193,11 @@
// Code
//
-// *** Modified to place code in high memory and insodoing, testing the port.
+// Can be modified to test the use of high memory.
// Original code
-//-P(CODE)CODE=5C00-FF7F,10000-45BFF
+-P(CODE)CODE=5C00-FF7F,10000-45BFF
// Modified code
--P(CODE)CODE=10000-45BFF
+//-P(CODE)CODE=10000-45BFF
-Z(CODE)CODE_ID
diff --git a/Demo/MSP430X_MSP430F5438_IAR/main.c b/Demo/MSP430X_MSP430F5438_IAR/main.c
index def4554a5..b904b10bd 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/main.c
+++ b/Demo/MSP430X_MSP430F5438_IAR/main.c
@@ -559,10 +559,10 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
/* The MSP430X port uses this callback function to configure its tick interrupt.
This allows the application to choose the tick interrupt source.
-configTICK_INTERRUPT_VECTOR must also be set in FreeRTOSConfig.h to the correct
+configTICK_VECTOR must also be set in FreeRTOSConfig.h to the correct
interrupt vector for the chosen tick interrupt source. This implementation of
vApplicationSetupTimerInterrupt() generates the tick from timer A0, so in this
-case configTICK_INTERRUPT_VECTOR is set to TIMER0_A0_VECTOR. */
+case configTICK_VECTOR is set to TIMER0_A0_VECTOR. */
void vApplicationSetupTimerInterrupt( void )
{
const unsigned short usACLK_Frequency_Hz = 32768;
diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
index 539f51b5b..a5ae7b67e 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
@@ -19,19 +19,19 @@
- 247 27 27 27
+ 117 27 27 27
2 0 0 1 1 1
- 2 0 0 3 0 0 1 0 {W}Watch-0:TA1CTL 4 {W}Watch-0:ulSP_PC_Combined 4 3 0 0 134 139 124 100 3 0 0 Debug-Log 3 0 0 200 100 100 100 100 100 100 150 1 10 $PROJ_DIR$\TermIOInput.txt 1 0 3 0 0 150 150 3 0 0 3 0 0 0 0 1 0 0 1
+ 2 0 0 3 0 0 1 0 {W}Watch-0:TA1CTL 4 {W}Watch-0:ulSP_PC_Combined 4 3 0 0 134 139 124 100 3 0 0 Debug-Log 3 0 0 200 100 100 100 100 100 100 150 1 10 $PROJ_DIR$\TermIOInput.txt 1 0 3 0 0 150 150 3 0 0 3 0 0 0 0 1 0 0 1 300 100 100 100 100 100 100
-
+
TabID-11539-27703
@@ -39,24 +39,24 @@
Workspace
- RTOSDemo RTOSDemo/FreeRTOS_Source RTOSDemo/FreeRTOS_Source/Portable
+ RTOSDemo
- 0 TabID-12395-27916 Terminal I/O TerminalIO 0 TabID-28694-31512 Debug Log Debug-Log 0
+ 0 TabID-12395-27916 Terminal I/O TerminalIO 0 TabID-26682-3495 Debug Log Debug-Log 0
- TextEditor $WS_DIR$\main.c 0 420 19246 19246 0 0 1000000 1000000 1
+ TextEditor $WS_DIR$\main.c 0 227 12065 12065 0 0 1000000 1000000 1
- iaridepm.enu1 430fet1 debuggergui.enu1 -2 -2 716 321 -2 -2 121 150 72024 152749 192262 731161 -2 -2 716 399 -2 -2 121 150 72024 152749 238690 731161 -2 -2 198 1682 -2 -2 1684 200 1002381 203666 119048 203666
+ iaridepm.enu1 430fet1 debuggergui.enu1 -2 -2 716 191 -2 -2 121 150 72024 152749 114881 731161 -2 -2 716 376 -2 -2 121 150 72024 152749 225000 731161 -2 -2 198 1682 -2 -2 1684 200 1002381 203666 119048 203666
diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
index 497f846d6..e460b1315 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
@@ -1,5 +1,5 @@
[DebugChecksum]
-Checksum=1076418874
+Checksum=-1276943022
[DisAssemblyWindow]
NumStates=_ 1
State 1=_ 1
@@ -39,7 +39,7 @@ LogFile=_ ""
Enabled=0
[DriverProfiling]
Enabled=0
-Mode=11405262
+Mode=20158624
Graph=0
Symbiont=0
[Breakpoints]
diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
index 184264a30..41f77d35e 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
@@ -12,7 +12,7 @@
- 401 27 27 27
+ 235 27 27 27
@@ -25,7 +25,7 @@
-
+
TabID-18858-27566
@@ -37,7 +37,7 @@
- 0
+ 0
TabID-25947-27638
@@ -47,20 +47,20 @@
TabID-5978-12679 Debug Log Debug-Log TabID-22019-23227 Find in Files Find-in-Files
- 0
+ 0
- TextEditor $WS_DIR$\main.c 0 420 19246 19246 0 0 1000000 1000000 1
+ TextEditor $WS_DIR$\main.c 0 227 12065 12065 0 0 1000000 1000000 1
- iaridepm.enu1 -2 -2 645 475 -2 -2 331 267 197024 271894 283929 658859 -2 -2 293 1682 -2 -2 1684 295 1002381 300407 197024 271894
+ iaridepm.enu1 -2 -2 645 309 -2 -2 331 267 197024 271894 185119 658859 -2 -2 293 1682 -2 -2 1684 295 1002381 300407 197024 271894