From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Thu, 6 Jun 2013 12:54:00 +0000 (+0000)
Subject: Ensure RM48 demo compiles in co-operative mode.
X-Git-Tag: V7.5.0~78
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8767b38d936cdc11205f9459e2d632801751598f;p=freertos

Ensure RM48 demo compiles in co-operative mode.

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

diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/startup/sys_startup.c b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/startup/sys_startup.c
index c4679c53e..66f0ffaba 100644
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/startup/sys_startup.c
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/startup/sys_startup.c
@@ -1,4 +1,4 @@
-/** @file sys_startup.c 
+/** @file sys_startup.c
 *   @brief Startup Source File
 *   @date 05.November.2010
 *   @version 1.01.001
@@ -23,6 +23,7 @@
 #include "sys_vim.h"
 #include "sys_core.h"
 #include "sys_memory.h"
+#include "FreeRTOS.h"
 
 
 /* External Functions */
@@ -43,7 +44,11 @@ static const t_isrFuncPTR s_vim_init[] =
     phantomInterrupt,
     esmHighLevelInterrupt,
     phantomInterrupt,
-    vPortPreemptiveTick,		/* RTI */
+	#if configUSE_PREEMPTION == 0
+		vPortNonPreemptiveTick, /* RTI */
+	#else
+		vPortPreemptiveTick,	/* RTI */
+	#endif
     phantomInterrupt,
     phantomInterrupt,
     phantomInterrupt,