From 603b477835c4ff626696de397dc77632fc17fcd4 Mon Sep 17 00:00:00 2001
From: rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Thu, 9 Jan 2020 00:19:36 +0000
Subject: [PATCH] Work in progress update of LPC51U68 MCUXpresso project to
 rearrange the folder structure and names.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2799 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../.cproject                                 | 10 +--
 .../CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.project | 78 +++++++++----------
 .../.settings/language.settings.xml           |  4 +-
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.cproject b/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.cproject
index cafde17d7..bbcb6b11a 100644
--- a/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.cproject
+++ b/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.cproject
@@ -341,9 +341,9 @@
 					</folderInfo>
 					<sourceEntries>
 						<entry flags="LOCAL|VALUE_WORKSPACE_PATH" kind="sourcePath" name="CMSIS"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Demo_tasks"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="FreeRTOS_source"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="GCC_specific"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Minimal"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Source"/>
 						<entry flags="LOCAL|VALUE_WORKSPACE_PATH" kind="sourcePath" name="app"/>
 						<entry flags="LOCAL|VALUE_WORKSPACE_PATH" kind="sourcePath" name="board"/>
 						<entry flags="LOCAL|VALUE_WORKSPACE_PATH" kind="sourcePath" name="component"/>
@@ -718,8 +718,8 @@
 					</folderInfo>
 					<sourceEntries>
 						<entry flags="LOCAL|VALUE_WORKSPACE_PATH" kind="sourcePath" name="CMSIS"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Minimal"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Source"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Demo_tasks"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="FreeRTOS_source"/>
 						<entry flags="LOCAL|VALUE_WORKSPACE_PATH" kind="sourcePath" name="app"/>
 						<entry flags="LOCAL|VALUE_WORKSPACE_PATH" kind="sourcePath" name="board"/>
 						<entry flags="LOCAL|VALUE_WORKSPACE_PATH" kind="sourcePath" name="component"/>
@@ -738,7 +738,7 @@
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="com.nxp.mcuxpresso.core.datamodels">
 		<sdkName>SDK_2.x_LPCXpresso51U68</sdkName>
-		<sdkVersion>2.6.0</sdkVersion>
+		<sdkVersion>2.7.0</sdkVersion>
 		<sdkComponents>middleware.baremetal.LPC51U68;platform.drivers.clock.LPC51U68;device.LPC51U68_CMSIS.LPC51U68;platform.Include_common.LPC51U68;platform.Include_core_cm0plus.LPC51U68;platform.drivers.common.LPC51U68;platform.drivers.power.LPC51U68;platform.drivers.reset.LPC51U68;platform.drivers.flexcomm.LPC51U68;platform.drivers.flexcomm_usart.LPC51U68;platform.drivers.lpc_gpio.LPC51U68;platform.drivers.lpc_iocon.LPC51U68;platform.drivers.pint.LPC51U68;component.serial_manager.LPC51U68;component.lists.LPC51U68;component.serial_manager_uart.LPC51U68;component.usart_adapter.LPC51U68;platform.utilities.assert.LPC51U68;utility.debug_console.LPC51U68;device.LPC51U68_startup.LPC51U68;project_template.lpcxpresso51u68.LPC51U68;platform.drivers.ctimer.LPC51U68;</sdkComponents>
 		<boardId>lpcxpresso51u68</boardId>
 		<package>LPC51U68JBD64</package>
diff --git a/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.project b/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.project
index 21505b1a4..226716e4f 100644
--- a/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.project
+++ b/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.project
@@ -26,197 +26,197 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>Minimal</name>
+			<name>Demo_tasks</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
-			<name>Source</name>
+			<name>FreeRTOS_source</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
-			<name>Minimal/IntQueue.c</name>
+			<name>Demo_tasks/IntQueue.c</name>
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/Common/Minimal/IntQueue.c</locationURI>
 		</link>
 		<link>
-			<name>Minimal/blocktim.c</name>
+			<name>Demo_tasks/blocktim.c</name>
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/Common/Minimal/blocktim.c</locationURI>
 		</link>
 		<link>
-			<name>Minimal/countsem.c</name>
+			<name>Demo_tasks/countsem.c</name>
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/Common/Minimal/countsem.c</locationURI>
 		</link>
 		<link>
-			<name>Minimal/recmutex.c</name>
+			<name>Demo_tasks/recmutex.c</name>
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/Common/Minimal/recmutex.c</locationURI>
 		</link>
 		<link>
-			<name>Source/croutine.c</name>
+			<name>FreeRTOS_source/croutine.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/croutine.c</locationURI>
 		</link>
 		<link>
-			<name>Source/event_groups.c</name>
+			<name>FreeRTOS_source/event_groups.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/event_groups.c</locationURI>
 		</link>
 		<link>
-			<name>Source/include</name>
+			<name>FreeRTOS_source/include</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
-			<name>Source/list.c</name>
+			<name>FreeRTOS_source/list.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/list.c</locationURI>
 		</link>
 		<link>
-			<name>Source/portable</name>
+			<name>FreeRTOS_source/portable</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
-			<name>Source/queue.c</name>
+			<name>FreeRTOS_source/queue.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/queue.c</locationURI>
 		</link>
 		<link>
-			<name>Source/stream_buffer.c</name>
+			<name>FreeRTOS_source/stream_buffer.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/stream_buffer.c</locationURI>
 		</link>
 		<link>
-			<name>Source/tasks.c</name>
+			<name>FreeRTOS_source/tasks.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/tasks.c</locationURI>
 		</link>
 		<link>
-			<name>Source/timers.c</name>
+			<name>FreeRTOS_source/timers.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/timers.c</locationURI>
 		</link>
 		<link>
-			<name>Source/include/FreeRTOS.h</name>
+			<name>FreeRTOS_source/include/FreeRTOS.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/FreeRTOS.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/StackMacros.h</name>
+			<name>FreeRTOS_source/include/StackMacros.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/StackMacros.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/atomic.h</name>
+			<name>FreeRTOS_source/include/atomic.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/atomic.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/croutine.h</name>
+			<name>FreeRTOS_source/include/croutine.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/croutine.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/deprecated_definitions.h</name>
+			<name>FreeRTOS_source/include/deprecated_definitions.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/deprecated_definitions.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/event_groups.h</name>
+			<name>FreeRTOS_source/include/event_groups.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/event_groups.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/list.h</name>
+			<name>FreeRTOS_source/include/list.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/list.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/message_buffer.h</name>
+			<name>FreeRTOS_source/include/message_buffer.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/message_buffer.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/mpu_prototypes.h</name>
+			<name>FreeRTOS_source/include/mpu_prototypes.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/mpu_prototypes.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/mpu_wrappers.h</name>
+			<name>FreeRTOS_source/include/mpu_wrappers.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/mpu_wrappers.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/portable.h</name>
+			<name>FreeRTOS_source/include/portable.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/portable.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/projdefs.h</name>
+			<name>FreeRTOS_source/include/projdefs.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/projdefs.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/queue.h</name>
+			<name>FreeRTOS_source/include/queue.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/queue.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/semphr.h</name>
+			<name>FreeRTOS_source/include/semphr.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/semphr.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/stack_macros.h</name>
+			<name>FreeRTOS_source/include/stack_macros.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/stack_macros.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/stream_buffer.h</name>
+			<name>FreeRTOS_source/include/stream_buffer.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/stream_buffer.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/task.h</name>
+			<name>FreeRTOS_source/include/task.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/task.h</locationURI>
 		</link>
 		<link>
-			<name>Source/include/timers.h</name>
+			<name>FreeRTOS_source/include/timers.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/include/timers.h</locationURI>
 		</link>
 		<link>
-			<name>Source/portable/GCC</name>
+			<name>FreeRTOS_source/portable/GCC</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
-			<name>Source/portable/MemMang</name>
+			<name>FreeRTOS_source/portable/MemMang</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
-			<name>Source/portable/GCC/ARM_CM0</name>
+			<name>FreeRTOS_source/portable/GCC/ARM_CM0</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
-			<name>Source/portable/MemMang/heap_5.c</name>
+			<name>FreeRTOS_source/portable/MemMang/heap_5.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/portable/MemMang/heap_5.c</locationURI>
 		</link>
 		<link>
-			<name>Source/portable/GCC/ARM_CM0/port.c</name>
+			<name>FreeRTOS_source/portable/GCC/ARM_CM0/port.c</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/portable/GCC/ARM_CM0/port.c</locationURI>
 		</link>
 		<link>
-			<name>Source/portable/GCC/ARM_CM0/portmacro.h</name>
+			<name>FreeRTOS_source/portable/GCC/ARM_CM0/portmacro.h</name>
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/Source/portable/GCC/ARM_CM0/portmacro.h</locationURI>
 		</link>
diff --git a/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.settings/language.settings.xml b/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.settings/language.settings.xml
index b9880cafd..b0c0fd5d5 100644
--- a/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.settings/language.settings.xml
+++ b/FreeRTOS/Demo/CORTEX_M0+_LPC51U68_GCC_IAR_KEIL/.settings/language.settings.xml
@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="com.crt.advproject.GCCBuildCommandParser" keep-relative-paths="false" name="MCU GCC Build Output Parser" parameter="(arm-none-eabi-gcc)|(arm-none-eabi-[gc]\+\+)|(gcc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
-			<provider class="com.crt.advproject.specs.MCUGCCBuiltinSpecsDetector" console="false" env-hash="-1461237001128099450" id="com.crt.advproject.GCCBuildSpecCompilerParser" keep-relative-paths="false" name="MCU GCC Built-in Compiler Parser" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.crt.advproject.specs.MCUGCCBuiltinSpecsDetector" console="false" env-hash="-326822570324312585" id="com.crt.advproject.GCCBuildSpecCompilerParser" keep-relative-paths="false" name="MCU GCC Built-in Compiler Parser" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -15,7 +15,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider copy-of="extension" id="com.crt.advproject.GCCBuildCommandParser"/>
-			<provider class="com.crt.advproject.specs.MCUGCCBuiltinSpecsDetector" console="false" env-hash="-1411744523273428931" id="com.crt.advproject.GCCBuildSpecCompilerParser" keep-relative-paths="false" name="MCU GCC Built-in Compiler Parser" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.crt.advproject.specs.MCUGCCBuiltinSpecsDetector" console="false" env-hash="-277679898864469442" id="com.crt.advproject.GCCBuildSpecCompilerParser" keep-relative-paths="false" name="MCU GCC Built-in Compiler Parser" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
-- 
2.39.2