From 7c2844601342d8c564b5566e543202252fe8bea0 Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Tue, 4 Jan 2011 14:36:35 +0000
Subject: [PATCH] Allow the register test asm code in the CCS4 MSP430X demo to
 use any data model.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1221 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../MSP430X_MSP430F5438_CCS4/Demo_Source/RegTest.asm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RegTest.asm b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RegTest.asm
index b1dbc87f3..e0e4197de 100644
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RegTest.asm
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RegTest.asm
@@ -55,6 +55,14 @@
 
 	.include data_model.h
 
+	.if $DEFINED( __LARGE_DATA_MODEL__ )
+		.define "cmp.a", cmp_x
+		.define "incx.w", inc_x
+	.else
+		.define "cmp.w", cmp_x
+		.define "inc.w", inc_x
+	.endif
+
 
 	.global usRegTest1Counter
 	.global usRegTest2Counter
@@ -113,7 +121,7 @@ prvRegTest1Loop:
 	
 	; This task is still running without jumping to vRegTest1Error, so increment
 	; the loop counter so the check task knows the task is running error free.
-	incx.w	&usRegTest1Counter
+	inc_x	&usRegTest1Counter
 	
 	; Loop again, performing the same tests.
 	jmp		prvRegTest1Loop
@@ -173,7 +181,7 @@ prvRegTest2Loop:
 	; Also perform a manual yield, just to increase the scope of the test.
 	call_x 	#vPortYield
 	
-	incx.w	&usRegTest2Counter
+	inc_x	&usRegTest2Counter
 	jmp		prvRegTest2Loop
 	nop
 
-- 
2.39.5