Add resource filters to the Eclipse project used to build the Galileo demo.

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

diff --git a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.cproject b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.cproject
index f2e685fa5312797b7882b278b1a5d724f7ec9862..ee8957dd9063197c767a4703a9d793a6da8e3f04 100644 (file)
--- 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"/>\r
                                                        <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.850200804" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">\r
                                                                <option id="gnu.c.compiler.option.include.paths.369547224" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Full_Demo}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Full_Demo}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Support_Files}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Full_Demo/Standard_Demo_Tasks/include}&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/IA32_flat}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/IA32_flat}&quot;"/>\r
                                                                </option>\r
                                                                <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"/>\r
                                                                <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"/>\r
@@ -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">\r
                                                                <option id="gnu.both.asm.option.include.paths.1341458440" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/IA32_flat}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/IA32_flat}&quot;"/>\r
                                                                </option>\r
                                                                <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"/>\r
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.458498164" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>\r
                                                        </tool>\r
                                                </toolChain>\r
                                        </folderInfo>\r
+                                       <folderInfo id="cdt.managedbuild.config.gnu.cygwin.exe.debug.5899473.1173721081" name="/" resourcePath="Full_Demo/Standard_Demo_Tasks">\r
+                                               <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1555812406" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base" unusedChildren="">\r
+                                                       <option id="cdt.managedbuild.option.gnu.cross.prefix.1160671315.1680026821" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix.1160671315"/>\r
+                                                       <option id="cdt.managedbuild.option.gnu.cross.path.942625968.1399515051" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path.942625968"/>\r
+                                                       <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.100957841" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler.850200804">\r
+                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1496229673" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>\r
+                                                       </tool>\r
+                                                       <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1644078528" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1667900842"/>\r
+                                                       <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1073540094" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker.2047125905"/>\r
+                                                       <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.956115598" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker.1304180380"/>\r
+                                                       <tool id="cdt.managedbuild.tool.gnu.cross.archiver.520187407" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver.2001524857"/>\r
+                                                       <tool id="cdt.managedbuild.tool.gnu.cross.assembler.737789519" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler.500911803">\r
+                                                               <inputType id="cdt.managedbuild.tool.gnu.assembler.input.225651200" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>\r
+                                                       </tool>\r
+                                               </toolChain>\r
+                                       </folderInfo>\r
                                        <sourceEntries>\r
                                                <entry excluding="Support_Files/stdlib_functions.c|nops.c|Source|uart.c|early_uart.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
                                        </sourceEntries>\r

diff --git a/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.project b/FreeRTOS/Demo/IA32_flat_GCC_Galileo_Gen_2/.project
index cb166f05fc33b580b908c8bfea0b78c16da6b77e..e7ec93029a2562e5e67db94e188469ae901e74b1 100644 (file)
--- 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>\r
        <filteredResources>\r
                <filter>\r
-                       <id>1397138529515</id>\r
+                       <id>1438278124394</id>\r
                        <name>FreeRTOS_Source/portable</name>\r
                        <type>9</type>\r
                        <matcher>\r
                                <id>org.eclipse.ui.ide.multiFilter</id>\r
-                               <arguments>1.0-name-matches-false-false-IA32_flat</arguments>\r
+                               <arguments>1.0-name-matches-false-false-GCC</arguments>\r
                        </matcher>\r
                </filter>\r
                <filter>\r
-                       <id>1397138529531</id>\r
+                       <id>1438278124403</id>\r
                        <name>FreeRTOS_Source/portable</name>\r
                        <type>9</type>\r
                        <matcher>\r
@@ -54,6 +54,33 @@
                                <arguments>1.0-name-matches-false-false-MemMang</arguments>\r
                        </matcher>\r
                </filter>\r
+               <filter>\r
+                       <id>1438277863568</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks</name>\r
+                       <type>9</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-include</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438277863618</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks</name>\r
+                       <type>9</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-Minimal</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278142258</id>\r
+                       <name>FreeRTOS_Source/portable/GCC</name>\r
+                       <type>9</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-IA32_flat</arguments>\r
+                       </matcher>\r
+               </filter>\r
                <filter>\r
                        <id>1397138545742</id>\r
                        <name>FreeRTOS_Source/portable/MemMang</name>\r
@@ -63,6 +90,150 @@
                                <arguments>1.0-name-matches-false-false-heap_4.c</arguments>\r
                        </matcher>\r
                </filter>\r
+               <filter>\r
+                       <id>1438278034257</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-BlockQ.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034267</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-blocktim.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034287</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-true-false-countsem.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034297</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-death.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034307</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-dynamic.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034317</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-EventGroupsDemo.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034327</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-flop.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034337</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-GenQTest.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034347</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-IntQueue.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034357</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-QPeek.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034367</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-QueueOverwrite.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034367</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-QueueSet.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034377</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-recmutex.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034387</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-semtest.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034397</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-TaskNotify.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
+               <filter>\r
+                       <id>1438278034407</id>\r
+                       <name>Full_Demo/Standard_Demo_Tasks/Minimal</name>\r
+                       <type>5</type>\r
+                       <matcher>\r
+                               <id>org.eclipse.ui.ide.multiFilter</id>\r
+                               <arguments>1.0-name-matches-false-false-TimerDemo.c</arguments>\r
+                       </matcher>\r
+               </filter>\r
        </filteredResources>\r
        <variableList>\r
                <variable>\r

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 07787ce94222b403f9c74be39f6ddc6a3c37215c..4218c77f85e35377fffa651bd01d03822310442a 100644 (file)
--- 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"/>\r
                        <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>\r
                        <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>\r
-                       <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">\r
+                       <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">\r
                                <language-scope id="org.eclipse.cdt.core.gcc"/>\r
                                <language-scope id="org.eclipse.cdt.core.g++"/>\r
                        </provider>\r

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 c97d1f6c638d8d37a2fc587d067ae45828b1b504..dbc93c159c3867947e496094eb267eef00322e6a 100644 (file)
--- 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 )\r
                                if(TimerNumber == 0)\r
                                {\r
-                                       row = 8 ; col = 1;\r
+                                       row = 9 ; col = 1;\r
                                        pi->comparator_h = hpetHPET_TMR0_COMPARATOR_HIGH;\r
                                        pi->comparator_l = hpetHPET_TMR0_COMPARATOR_LOW;\r
                                        execute = pdTRUE;\r
@@ -917,7 +917,7 @@ struct hpet_info *pi;
                        #if ( hpetUSE_HPET_TIMER_NUMBER_1 == 1 )\r
                                if(TimerNumber == 1)\r
                                {\r
-                                       row = 12 ; col = 1;\r
+                                       row = 13 ; col = 1;\r
                                        pi->comparator_h = hpetHPET_TMR1_COMPARATOR_HIGH;\r
                                        pi->comparator_l = hpetHPET_TMR1_COMPARATOR_LOW;\r
                                        execute = pdTRUE;\r
@@ -926,7 +926,7 @@ struct hpet_info *pi;
                        #if ( hpetUSE_HPET_TIMER_NUMBER_2 == 1 )\r
                                if(TimerNumber == 2)\r
                                {\r
-                                       row = 16 ; col = 1;\r
+                                       row = 17 ; col = 1;\r
                                        pi->comparator_h = hpetHPET_TMR2_COMPARATOR_HIGH;\r
                                        pi->comparator_l = hpetHPET_TMR2_COMPARATOR_LOW;\r
                                        execute = pdTRUE;\r

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 ff2401b6a3a26933eaf0f853ad7f32897b6288ee..7f9923354db6b11a89a4b94db18892eb49fdf0b2 100644 (file)
--- 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 )
 \r
 static void prvSetupHardware( void )\r
 {\r
-       ClearScreen();\r
-       printf( ANSI_COLOR_WHITE );\r
-\r
        /* Initialise the serial port and GPIO. */\r
        vInitializeGalileoSerialPort( DEBUG_SERIAL_PORT );\r
        vGalileoInitializeGpioController();\r