Change the force register from low to heigh.

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

diff --git a/Demo/ColdFire_MCF5282_Eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/RTOSDemo.launch b/Demo/ColdFire_MCF5282_Eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/RTOSDemo.launch
index a97a3beee36d94cb33572f1b8a6e28a0d17062ff..2cf87b3a0083923e8bb2c34a806f15e46a62812a 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/RTOSDemo.launch
+++ b/Demo/ColdFire_MCF5282_Eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/RTOSDemo.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <launchConfiguration type="org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">\r
 <stringAttribute key="org.eclipse.cdt.debug.gdbremote.core.imageFileName" value=""/>\r
-<stringAttribute key="org.eclipse.cdt.debug.gdbremote.core.initCommands" value="target remote | m68k-elf-sprite pe://ParallelPortCable m5282evb"/>\r
+<stringAttribute key="org.eclipse.cdt.debug.gdbremote.core.initCommands" value="target remote | m68k-elf-sprite pe: m5282evb"/>\r
 <stringAttribute key="org.eclipse.cdt.debug.gdbremote.core.ipAddress" value="localhost"/>\r
 <booleanAttribute key="org.eclipse.cdt.debug.gdbremote.core.loadImage" value="false"/>\r
 <intAttribute key="org.eclipse.cdt.debug.gdbremote.core.portNumber" value="10000"/>\r
@@ -13,10 +13,10 @@
 <stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>\r
 <booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="false"/>\r
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>\r
-<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;us-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;d0-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;d1-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;d4-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;d7-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;ps-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>\r
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;ps-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;d7-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;d4-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;d1-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;d0-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;us-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>\r
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>\r
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList/&gt;&#13;&#10;"/>\r
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\ColdFire_MCF5282_Eclipse\RTOSDemo\bin\RTOSDemo.elf"/>\r
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="bin/RTOSDemo.elf"/>\r
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RTOSDemo"/>\r
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.1348192838"/>\r
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">\r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/.cproject b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/.cproject
index 353b51a6bf3cd14ae0e4d5857f4fca4c93007bb1..74792ab2c702787af2bcc23daca6760033b94467 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/.cproject
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/.cproject
@@ -7,6 +7,7 @@
 <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1348192838" moduleId="org.eclipse.cdt.core.settings" name="Default">\r
 <externalSettings/>\r
 <extensions>\r
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
 <extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
 <extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
 <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
@@ -18,7 +19,7 @@
 <configuration artifactName="RTOSDemo" buildProperties="" description="" id="0.1348192838" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">\r
 <folderInfo id="0.1348192838." name="/" resourcePath="">\r
 <toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1423010524" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">\r
-<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1423010524.128743260" name=""/>\r
+<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.1423010524.128743260" name=""/>\r
 <builder command="cs-make" id="org.eclipse.cdt.build.core.settings.default.builder.1429594669" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>\r
 <tool id="org.eclipse.cdt.build.core.settings.holder.libs.1997217404" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>\r
 <tool id="org.eclipse.cdt.build.core.settings.holder.1053974197" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">\r
@@ -39,6 +40,10 @@
 </sourceEntries>\r
 </configuration>\r
 </storageModule>\r
+\r
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
 <storageModule moduleId="scannerConfiguration">\r
 <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>\r
 <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">\r
@@ -205,9 +210,6 @@
 </profile>\r
 </scannerConfigBuildInfo>\r
 </storageModule>\r
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
-<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
 </cconfiguration>\r
 </storageModule>\r
 <storageModule moduleId="cdtBuildSystem" version="4.0.0">\r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
index 7426559aca8fea63d53b3d411a3cf32cb030efa0..af31adc92241ad690740a01e3f4e4c4cecaa9680 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
@@ -104,7 +104,7 @@ const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRES
     write to MCF_INTC0_IMRH is actually required here but is included for\r
     completeness. */\r
     MCF_INTC0_ICR16 = ( 0 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) );\r
-    MCF_INTC0_IMRH &= ~( MCF_INTC_IMRH_INT_MASK16 );\r
+    MCF_INTC0_IMRH &= ~( MCF_INTC_IPRL_INT16 );\r
 \r
     /* Configure PIT0 to generate the RTOS tick. */\r
     MCF_PIT0_PCSR |= MCF_PIT_PCSR_PIF;\r