From 25b911e0bdaa2a90762e482c18aec40068f2555d Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Thu, 30 Jul 2015 21:13:03 +0000
Subject: [PATCH] Add resource filters to the Eclipse project used to build the
 Galileo demo.

---
 .../IA32_flat_GCC_Galileo_Gen_2/.cproject     |  21 ++-
 .../Demo/IA32_flat_GCC_Galileo_Gen_2/.project | 177 +++++++++++++++++-
 .../.settings/language.settings.xml           |   2 +-
 .../Support_Files/HPET.c                      |   6 +-
 .../Demo/IA32_flat_GCC_Galileo_Gen_2/main.c   |   3 -
 5 files changed, 196 insertions(+), 13 deletions(-)

diff --git a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.cproject b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.cproject
index f2e685fa53..ee8957dd90 100644
--- a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.cproject
+++ b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.cproject
@@ -21,13 +21,12 @@
 							<builder buildPath="${workspace_loc:/RTOSDemo}/Debug" id="org.eclipse.cdt.build.core.internal.builder.1446204811" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" stopOnErr="true" superClass="org.eclipse.cdt.build.core.internal.builder"/>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.850200804" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
 								<option id="gnu.c.compiler.option.include.paths.369547224" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Full_Demo}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Full_Demo}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Support_Files}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Full_Demo/Standard_Demo_Tasks/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/IA32_flat}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/IA32_flat}&quot;"/>
 								</option>
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1628552532" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.c.optimization.level.none" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.debugging.level.1363374967" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
@@ -59,13 +58,29 @@
 							<tool command="gcc" id="cdt.managedbuild.tool.gnu.cross.assembler.500911803" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
 								<option id="gnu.both.asm.option.include.paths.1341458440" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/IA32_flat}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/IA32_flat}&quot;"/>
 								</option>
 								<option id="gnu.both.asm.option.flags.342663249" name="Assembler flags" superClass="gnu.both.asm.option.flags" value="-Wa,--gdwarf2 -Wa,-march=pentium -c" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.458498164" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<folderInfo id="cdt.managedbuild.config.gnu.cygwin.exe.debug.5899473.1173721081" name="/" resourcePath="Full_Demo/Standard_Demo_Tasks">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1555812406" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base" unusedChildren="">
+							<option id="cdt.managedbuild.option.gnu.cross.prefix.1160671315.1680026821" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix.1160671315"/>
+							<option id="cdt.managedbuild.option.gnu.cross.path.942625968.1399515051" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path.942625968"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.100957841" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler.850200804">
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1496229673" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1644078528" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1667900842"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1073540094" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker.2047125905"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.956115598" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker.1304180380"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.520187407" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver.2001524857"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.737789519" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler.500911803">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.225651200" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
 					<sourceEntries>
 						<entry excluding="Support_Files/stdlib_functions.c|nops.c|Source|uart.c|early_uart.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
diff --git a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.project b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.project
index cb166f05fc..e7ec93029a 100644
--- a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.project
+++ b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.project
@@ -37,16 +37,16 @@
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1397138529515</id>
+			<id>1438278124394</id>
 			<name>FreeRTOS_Source/portable</name>
 			<type>9</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-IA32_flat</arguments>
+				<arguments>1.0-name-matches-false-false-GCC</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1397138529531</id>
+			<id>1438278124403</id>
 			<name>FreeRTOS_Source/portable</name>
 			<type>9</type>
 			<matcher>
@@ -54,6 +54,33 @@
 				<arguments>1.0-name-matches-false-false-MemMang</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1438277863568</id>
+			<name>Full_Demo/Standard_Demo_Tasks</name>
+			<type>9</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-include</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438277863618</id>
+			<name>Full_Demo/Standard_Demo_Tasks</name>
+			<type>9</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-Minimal</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278142258</id>
+			<name>FreeRTOS_Source/portable/GCC</name>
+			<type>9</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-IA32_flat</arguments>
+			</matcher>
+		</filter>
 		<filter>
 			<id>1397138545742</id>
 			<name>FreeRTOS_Source/portable/MemMang</name>
@@ -63,6 +90,150 @@
 				<arguments>1.0-name-matches-false-false-heap_4.c</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1438278034257</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-BlockQ.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034267</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-blocktim.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034287</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-countsem.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034297</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-death.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034307</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-dynamic.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034317</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-EventGroupsDemo.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034327</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-flop.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034337</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-GenQTest.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034347</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-IntQueue.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034357</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-QPeek.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034367</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-QueueOverwrite.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034367</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-QueueSet.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034377</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-recmutex.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034387</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-semtest.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034397</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-TaskNotify.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1438278034407</id>
+			<name>Full_Demo/Standard_Demo_Tasks/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-TimerDemo.c</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 	<variableList>
 		<variable>
diff --git a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.settings/language.settings.xml b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.settings/language.settings.xml
index 07787ce942..4218c77f85 100644
--- a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.settings/language.settings.xml
+++ b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1445952490268027060" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1521042937261237789" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" 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>
diff --git a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/Support_Files/HPET.c b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/Support_Files/HPET.c
index c97d1f6c63..dbc93c159c 100644
--- a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/Support_Files/HPET.c
+++ b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/Support_Files/HPET.c
@@ -908,7 +908,7 @@ struct hpet_info *pi;
 			#if (hpetUSE_HPET_TIMER_NUMBER_0 == 1 )
 				if(TimerNumber == 0)
 				{
-					row = 8 ; col = 1;
+					row = 9 ; col = 1;
 					pi->comparator_h = hpetHPET_TMR0_COMPARATOR_HIGH;
 					pi->comparator_l = hpetHPET_TMR0_COMPARATOR_LOW;
 					execute = pdTRUE;
@@ -917,7 +917,7 @@ struct hpet_info *pi;
 			#if ( hpetUSE_HPET_TIMER_NUMBER_1 == 1 )
 				if(TimerNumber == 1)
 				{
-					row = 12 ; col = 1;
+					row = 13 ; col = 1;
 					pi->comparator_h = hpetHPET_TMR1_COMPARATOR_HIGH;
 					pi->comparator_l = hpetHPET_TMR1_COMPARATOR_LOW;
 					execute = pdTRUE;
@@ -926,7 +926,7 @@ struct hpet_info *pi;
 			#if ( hpetUSE_HPET_TIMER_NUMBER_2 == 1 )
 				if(TimerNumber == 2)
 				{
-					row = 16 ; col = 1;
+					row = 17 ; col = 1;
 					pi->comparator_h = hpetHPET_TMR2_COMPARATOR_HIGH;
 					pi->comparator_l = hpetHPET_TMR2_COMPARATOR_LOW;
 					execute = pdTRUE;
diff --git a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/main.c b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/main.c
index ff2401b6a3..7f9923354d 100644
--- a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/main.c
+++ b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/main.c
@@ -324,9 +324,6 @@ void vApplicationTickHook( void )
 
 static void prvSetupHardware( void )
 {
-	ClearScreen();
-	printf( ANSI_COLOR_WHITE );
-
 	/* Initialise the serial port and GPIO. */
 	vInitializeGalileoSerialPort( DEBUG_SERIAL_PORT );
 	vGalileoInitializeGpioController();