From aae8709c4c9072ec87f9b557d5fca7d57de72d10 Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Tue, 29 Sep 2009 19:37:19 +0000
Subject: [PATCH] Update to latest Rowley version.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@875 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp | 174 +++++++++++++-------------
 Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs |  47 ++-----
 Demo/ARM7_LPC2368_Rowley/main.c       |   3 +-
 3 files changed, 98 insertions(+), 126 deletions(-)

diff --git a/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp b/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp
index ab0dc7b71..42a7a4bf5 100644
--- a/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp
+++ b/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp
@@ -1,103 +1,103 @@
 <!DOCTYPE CrossStudio_Project_File>
-<solution version="1" Name="RTOSDemo" >
-  <project Name="RTOSDemo" >
-    <configuration arm_target_loader_parameter="12000000" Target="LPC2368" arm_target_flash_loader_file_path="$(StudioDir)/targets/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_simulator_memory_simulation_parameter="LPC23;0x80000;0x8000;0x10000;0x10000" property_groups_file_path="$(StudioDir)/targets/Philips_LPC210X/propertyGroups23xx.xml" oscillator_frequency="12MHz" linker_memory_map_file="$(StudioDir)/targets/Philips_LPC210X/Philips_LPC2368_MemoryMap.xml" gcc_entry_point="reset_handler" build_remove_unused_symbols="No" c_preprocessor_definitions="GCC_ARM7;SUPERVISOR_START;VECTORED_IRQ_INTERRUPTS;PACK_STRUCT_END=__attribute__((packed));ALIGN_STRUCT_END=__attribute__((aligned(4)))" arm_architecture="v4T" linker_additional_files="$(StudioDir)/lib/liblpc2000$(LibExt)$(LIB)" c_user_include_directories=".;$(ProjectDir)\\..\\..\\Source\\include;$(ProjectDir)\\..\\..\\Source\\GCC\\ARM7_LPC2000;$(ProjectDir)\\..\\Common\\Include;$(ProjectDir)\\LCD;$(ProjectDir)\\webserver;$(ProjectDir)\\..\\Common\\ethernet\\uIP\\uip-1.0\\uip" project_directory="" link_include_startup_code="No" gcc_optimization_level="Level 1" arm_target_flash_loader_type="LIBMEM RPC Loader" project_type="Executable" c_additional_options="" linker_printf_fmt_level="long" arm_linker_stack_size="10" Name="Common" c_system_include_directories="$(StudioDir)\include" arm_target_debug_interface_type="ARM7TDI" arm_core_type="ARM7TDMI-S" arm_simulator_memory_simulation_filename="$(StudioDir)/targets/Philips_LPC210X/LPC2000SimulatorMemory.dll" arm_linker_svc_stack_size="1024" />
-    <configuration linker_section_placement_file="$(StudioDir)/targets/sram_placement.xml" target_reset_script="SRAMReset()" Name="RAM" Placement="RAM" />
-    <configuration arm_target_flash_loader_file_path="$(StudioDir)/targets/Philips_LPC210X/Release/Loader_lpc2300.elf" linker_section_placement_file="$(StudioDir)/targets/flash_placement.xml" target_reset_script="FLASHReset()" arm_target_flash_loader_type="LIBMEM RPC Loader" Name="Flash" Placement="Flash" />
-    <folder Name="Demo Source" >
-      <configuration filter="c;cpp;cxx;cc;h;s;asm;inc" Name="Common" />
-      <file file_name="main.c" Name="main.c" />
-      <file file_name="LCD/portlcd.c" Name="portlcd.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
-      </file>
-      <file file_name="../Common/Minimal/blocktim.c" Name="blocktim.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
-      </file>
-      <file file_name="../Common/Minimal/integer.c" Name="integer.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
-      </file>
-      <file file_name="../Common/Minimal/BlockQ.c" Name="BlockQ.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
-      </file>
-      <file file_name="ParTest/ParTest.c" Name="ParTest.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
-      </file>
-      <file file_name="../Common/Minimal/flash.c" Name="flash.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
-      </file>
-      <file file_name="webserver/EMAC_ISR.c" Name="EMAC_ISR.c" >
-        <configuration arm_instruction_set="ARM" Name="THUMB" />
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
-      </file>
-      <file file_name="webserver/emac.c" Name="emac.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
-        <configuration asm_additional_options="" Name="Common" />
-      </file>
-      <file file_name="../Common/Minimal/death.c" Name="death.c" />
-      <file file_name="../Common/Minimal/PollQ.c" Name="PollQ.c" />
-      <file file_name="../Common/Minimal/semtest.c" Name="semtest.c" />
+<solution Name="RTOSDemo" version="2">
+  <project Name="RTOSDemo">
+    <configuration Name="Common" Target="LPC2368" arm_architecture="v4T" arm_core_type="ARM7TDMI-S" arm_linker_stack_size="10" arm_linker_svc_stack_size="1024" arm_simulator_memory_simulation_filename="$(TargetsDir)/Philips_LPC210X/LPC2000SimulatorMemory.dll" arm_simulator_memory_simulation_parameter="LPC23;0x80000;0x8000;0x10000;0x10000" arm_target_debug_interface_type="ARM7TDI" arm_target_flash_loader_file_path="$(TargetsDir)/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" arm_target_loader_parameter="12000000" build_remove_unused_symbols="No" c_additional_options="" c_preprocessor_definitions="GCC_ARM7;SUPERVISOR_START;VECTORED_IRQ_INTERRUPTS;PACK_STRUCT_END=__attribute__((packed));ALIGN_STRUCT_END=__attribute__((aligned(4)))" c_system_include_directories="$(StudioDir)\include;$(PackagesDir)\include" c_user_include_directories=".;$(ProjectDir)\\..\\..\\Source\\include;$(ProjectDir)\\..\\..\\Source\\GCC\\ARM7_LPC2000;$(ProjectDir)\\..\\Common\\Include;$(ProjectDir)\\LCD;$(ProjectDir)\\webserver;$(ProjectDir)\\..\\Common\\ethernet\\uIP\\uip-1.0\\uip" gcc_entry_point="reset_handler" gcc_optimization_level="Level 1" link_include_startup_code="No" linker_additional_files="$(PackagesDir)/lib/liblpc2000$(LibExt)$(LIB)" linker_memory_map_file="$(TargetsDir)/Philips_LPC210X/Philips_LPC2368_MemoryMap.xml" linker_printf_fmt_level="long" oscillator_frequency="12MHz" project_directory="" project_type="Executable" property_groups_file_path="$(TargetsDir)/Philips_LPC210X/propertyGroups23xx.xml" c_enforce_ansi_checking="No" />
+    <configuration Name="RAM" Placement="RAM" linker_section_placement_file="$(StudioDir)/targets/sram_placement.xml" target_reset_script="SRAMReset()"/>
+    <configuration Name="Flash" Placement="Flash" arm_target_flash_loader_file_path="$(TargetsDir)/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" linker_section_placement_file="$(StudioDir)/targets/flash_placement.xml" target_reset_script="FLASHReset()"/>
+    <folder Name="Demo Source">
+      <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;asm;inc"/>
+      <file Name="main.c" file_name="main.c"/>
+      <file Name="portlcd.c" file_name="LCD/portlcd.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
+      </file>
+      <file Name="blocktim.c" file_name="../Common/Minimal/blocktim.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
+      </file>
+      <file Name="integer.c" file_name="../Common/Minimal/integer.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
+      </file>
+      <file Name="BlockQ.c" file_name="../Common/Minimal/BlockQ.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
+      </file>
+      <file Name="ParTest.c" file_name="ParTest/ParTest.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
+      </file>
+      <file Name="flash.c" file_name="../Common/Minimal/flash.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
+      </file>
+      <file Name="EMAC_ISR.c" file_name="webserver/EMAC_ISR.c">
+        <configuration Name="THUMB" arm_instruction_set="ARM"/>
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
+      </file>
+      <file Name="emac.c" file_name="webserver/emac.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
+        <configuration Name="Common" asm_additional_options=""/>
+      </file>
+      <file Name="death.c" file_name="../Common/Minimal/death.c"/>
+      <file Name="PollQ.c" file_name="../Common/Minimal/PollQ.c"/>
+      <file Name="semtest.c" file_name="../Common/Minimal/semtest.c"/>
     </folder>
-    <folder Name="System Files" >
-      <file file_name="$(StudioDir)/source/crt0.s" Name="crt0.s" />
-      <file file_name="$(StudioDir)/targets/Philips_LPC210X/Philips_LPC230X_Startup.s" Name="Philips_LPC230X_Startup.s" />
-      <file file_name="$(StudioDir)/targets/Philips_LPC210X/LPC230x.c" Name="LPC230x.c" />
-      <file file_name="$(StudioDir)/targets/Philips_LPC210X/Philips_LPC210X_Target.js" Name="Philips_LPC210X_Target.js" >
-        <configuration Name="Common" file_type="Reset Script" />
-      </file>
-      <file file_name="$(StudioDir)/targets/Philips_LPC210X/VIC_PL192.c" Name="VIC_PL192.c" />
-      <file file_name="$(StudioDir)/targets/Philips_LPC210X/VIC_PL192_irq_handler.s" Name="VIC_PL192_irq_handler.s" />
+    <folder Name="System Files">
+      <file Name="crt0.s" file_name="$(StudioDir)/source/crt0.s"/>
+      <file Name="Philips_LPC230X_Startup.s" file_name="$(TargetsDir)/Philips_LPC210X/Philips_LPC230X_Startup.s"/>
+      <file Name="LPC230x.c" file_name="$(TargetsDir)/Philips_LPC210X/LPC230x.c"/>
+      <file Name="Philips_LPC210X_Target.js" file_name="$(TargetsDir)/Philips_LPC210X/Philips_LPC210X_Target.js">
+        <configuration Name="Common" file_type="Reset Script"/>
+      </file>
+      <file Name="VIC_PL192.c" file_name="$(TargetsDir)/Philips_LPC210X/VIC_PL192.c"/>
+      <file Name="VIC_PL192_irq_handler.s" file_name="$(TargetsDir)/Philips_LPC210X/VIC_PL192_irq_handler.s"/>
     </folder>
-    <folder Name="FreeRTOS.org Source" >
-      <file file_name="../../Source/tasks.c" Name="tasks.c" />
-      <file file_name="../../Source/list.c" Name="list.c" />
-      <file file_name="../../Source/queue.c" Name="queue.c" />
-      <file file_name="../../Source/portable/GCC/ARM7_LPC23xx/port.c" Name="port.c" />
-      <file file_name="../../Source/portable/GCC/ARM7_LPC23xx/portISR.c" Name="portISR.c" >
-        <configuration arm_instruction_set="ARM" Name="Common" />
-      </file>
-      <file file_name="../../Source/portable/MemMang/heap_2.c" Name="heap_2.c" />
+    <folder Name="FreeRTOS.org Source">
+      <file Name="tasks.c" file_name="../../Source/tasks.c"/>
+      <file Name="list.c" file_name="../../Source/list.c"/>
+      <file Name="queue.c" file_name="../../Source/queue.c"/>
+      <file Name="port.c" file_name="../../Source/portable/GCC/ARM7_LPC23xx/port.c"/>
+      <file Name="portISR.c" file_name="../../Source/portable/GCC/ARM7_LPC23xx/portISR.c">
+        <configuration Name="Common" arm_instruction_set="ARM"/>
+      </file>
+      <file Name="heap_2.c" file_name="../../Source/portable/MemMang/heap_2.c"/>
     </folder>
-    <configuration linker_scanf_fmt_level="int" linker_keep_symbols="_vectors" c_preprocessor_definitions="" gcc_optimization_level="Level 1" arm_target_flash_loader_type="LIBMEM RPC Loader" linker_scanf_character_group_matching_enabled="No" linker_printf_fmt_level="int" Name="ARM Flash Debug" />
-    <folder Name="uIP Source" >
-      <file file_name="webserver/uIP_Task.c" Name="uIP_Task.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+    <configuration Name="ARM Flash Debug" arm_target_flash_loader_type="LIBMEM RPC Loader" c_preprocessor_definitions="" gcc_optimization_level="Level 1" linker_keep_symbols="_vectors" linker_printf_fmt_level="int" linker_scanf_character_group_matching_enabled="No" linker_scanf_fmt_level="int"/>
+    <folder Name="uIP Source">
+      <file Name="uIP_Task.c" file_name="webserver/uIP_Task.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
-      <file file_name="webserver/httpd.c" Name="httpd.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+      <file Name="httpd.c" file_name="webserver/httpd.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
-      <file file_name="webserver/httpd-cgi.c" Name="httpd-cgi.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+      <file Name="httpd-cgi.c" file_name="webserver/httpd-cgi.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
-      <file file_name="webserver/httpd-fs.c" Name="httpd-fs.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+      <file Name="httpd-fs.c" file_name="webserver/httpd-fs.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
-      <file file_name="webserver/http-strings.c" Name="http-strings.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+      <file Name="http-strings.c" file_name="webserver/http-strings.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
-      <file file_name="../Common/ethernet/uIP/uip-1.0/uip/uip_arp.c" Name="uip_arp.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+      <file Name="uip_arp.c" file_name="../Common/ethernet/uIP/uip-1.0/uip/uip_arp.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
-      <file file_name="../Common/ethernet/uIP/uip-1.0/uip/psock.c" Name="psock.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+      <file Name="psock.c" file_name="../Common/ethernet/uIP/uip-1.0/uip/psock.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
-      <file file_name="../Common/ethernet/uIP/uip-1.0/uip/timer.c" Name="timer.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+      <file Name="timer.c" file_name="../Common/ethernet/uIP/uip-1.0/uip/timer.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
-      <file file_name="../Common/ethernet/uIP/uip-1.0/uip/uip.c" Name="uip.c" >
-        <configuration build_exclude_from_build="No" Name="ARM Flash Debug" />
+      <file Name="uip.c" file_name="../Common/ethernet/uIP/uip-1.0/uip/uip.c">
+        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
     </folder>
-    <configuration c_preprocessor_definitions="THUMB_INTERWORK" Name="THUMB" />
-    <configuration c_preprocessor_definitions="STARTUP_FROM_RESET" gcc_optimization_level="Optimize For Size" Name="ARM Flash Release" />
-    <configuration arm_linker_fiq_stack_size="0" arm_linker_stack_size="0" Name="THUMB Flash Debug" arm_linker_svc_stack_size="512" arm_linker_heap_size="0" />
+    <configuration Name="THUMB" c_preprocessor_definitions="THUMB_INTERWORK"/>
+    <configuration Name="ARM Flash Release" c_preprocessor_definitions="STARTUP_FROM_RESET" gcc_optimization_level="Optimize For Size"/>
+    <configuration Name="THUMB Flash Debug" arm_linker_fiq_stack_size="0" arm_linker_heap_size="0" arm_linker_stack_size="0" arm_linker_svc_stack_size="512"/>
   </project>
-  <configuration inherited_configurations="ARM;Flash;Debug" Name="ARM Flash Debug" />
-  <configuration arm_library_instruction_set="ARM" c_preprocessor_definitions="__ARM" arm_instruction_set="ARM" hidden="Yes" Name="ARM" />
-  <configuration c_preprocessor_definitions="__FLASH_BUILD" hidden="Yes" Name="Flash" />
-  <configuration c_preprocessor_definitions="DEBUG" link_include_startup_code="No" gcc_optimization_level="None" build_debug_information="Yes" hidden="Yes" Name="Debug" />
-  <configuration inherited_configurations="ARM;Flash;Release" Name="ARM Flash Release" />
-  <configuration c_preprocessor_definitions="NDEBUG" link_include_startup_code="No" gcc_optimization_level="Level 1" build_debug_information="No" hidden="Yes" Name="Release" />
-  <configuration inherited_configurations="THUMB;Flash;Debug" Name="THUMB Flash Debug" />
-  <configuration arm_library_instruction_set="THUMB" c_preprocessor_definitions="__THUMB" arm_instruction_set="THUMB" hidden="Yes" Name="THUMB" />
-  <configuration arm_linker_stack_size="256" Name="Common" />
+  <configuration Name="ARM Flash Debug" inherited_configurations="ARM;Flash;Debug"/>
+  <configuration Name="ARM" arm_instruction_set="ARM" arm_library_instruction_set="ARM" c_preprocessor_definitions="__ARM" hidden="Yes"/>
+  <configuration Name="Flash" c_preprocessor_definitions="__FLASH_BUILD" hidden="Yes"/>
+  <configuration Name="Debug" build_debug_information="Yes" c_preprocessor_definitions="DEBUG" gcc_optimization_level="None" hidden="Yes" link_include_startup_code="No"/>
+  <configuration Name="ARM Flash Release" inherited_configurations="ARM;Flash;Release"/>
+  <configuration Name="Release" build_debug_information="No" c_preprocessor_definitions="NDEBUG" gcc_optimization_level="Level 1" hidden="Yes" link_include_startup_code="No"/>
+  <configuration Name="THUMB Flash Debug" inherited_configurations="THUMB;Flash;Debug"/>
+  <configuration Name="THUMB" arm_instruction_set="THUMB" arm_library_instruction_set="THUMB" c_preprocessor_definitions="__THUMB" hidden="Yes"/>
+  <configuration Name="Common" arm_linker_stack_size="256"/>
 </solution>
diff --git a/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs b/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs
index bb9fc297f..c15ec4bec 100644
--- a/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs
+++ b/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs
@@ -1,26 +1,7 @@
 <!DOCTYPE CrossStudio_for_ARM_Session_File>
 <session>
- <Autos>
-  <Watches active="0" />
- </Autos>
  <Bookmarks/>
- <Breakpoints>
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="D_Abort" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="FIQ" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="IRQ" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="P_Abort" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="Reset" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="SWI" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="Undef" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="BusFault" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="ExceptionEntryReturnFault" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="HardFault" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="MemManage" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="Reset" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_CheckingError" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_Coprocessor" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_StateError" filename="" />
- </Breakpoints>
+ <Breakpoints/>
  <ExecutionCountWindow/>
  <Memory1>
   <MemoryWindow autoEvaluate="0" addressText="0x4000592c" numColumns="8" sizeText="2000" dataSize="1" radix="16" addressSpace="" />
@@ -34,17 +15,10 @@
  <Memory4>
   <MemoryWindow autoEvaluate="0" addressText="" numColumns="8" sizeText="" dataSize="1" radix="16" addressSpace="" />
  </Memory4>
- <MemoryUsageWindow>
-  <ProjectSessionItem path="RTOSDemo" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;Demo Source" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;uIP Source" name="unnamed" />
- </MemoryUsageWindow>
  <Project>
   <ProjectSessionItem path="RTOSDemo" name="unnamed" />
   <ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" />
   <ProjectSessionItem path="RTOSDemo;RTOSDemo;Demo Source" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;uIP Source" name="unnamed" />
  </Project>
  <Register1>
   <RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="CPU - Current Mode" decimalNodes="" octalNodes="" asciiNodes="" />
@@ -58,29 +32,26 @@
  <Register4>
   <RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
  </Register4>
- <SourceNavigatorWindow/>
+ <TargetWindow programAction="" uploadFileType="" programLoadAddress="" programSize="" uploadFileName="" uploadMemoryInterface="" programFileName="" uploadStartAddress="" programFileType="" uploadSize="" programMemoryInterface="" />
  <TraceWindow>
-  <Trace wrap="Yes" type="1" enabled="Yes" />
+  <Trace enabled="Yes" />
  </TraceWindow>
  <Watch1>
-  <Watches active="0" />
+  <Watches active="0" update="Never" />
  </Watch1>
  <Watch2>
-  <Watches active="0" />
+  <Watches active="0" update="Never" />
  </Watch2>
  <Watch3>
-  <Watches active="0" />
+  <Watches active="0" update="Never" />
  </Watch3>
  <Watch4>
-  <Watches active="1" >
+  <Watches active="1" update="Never" >
    <Watchpoint linenumber="0" radix="-1" name="xStart" expression="xStart" filename="" />
   </Watches>
  </Watch4>
  <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\FreeRTOSConfig.h" y="72" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\FreeRTOSConfig.h" left="0" selected="0" name="unnamed" top="47" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\main.c" y="117" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\main.c" left="0" selected="0" name="unnamed" top="80" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="27" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\uIP_Task.c" y="261" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\uIP_Task.c" left="0" selected="0" name="unnamed" top="225" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="33" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\emac.c" y="7" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\emac.c" left="0" selected="1" name="unnamed" top="0" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_LPC2368_Rowley\main.c" y="125" path="C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_LPC2368_Rowley\main.c" left="0" selected="1" name="unnamed" top="108" />
  </Files>
- <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="/USB CrossConnect for ARM-RTCK" debugSearchFileMap="" fileDialogInitialDirectory="C:\E\Dev\FreeRTOS\Demo\ARM7_LPC2368_Rowley\webserver" fileDialogDefaultFilter="*.cpp;*.cxx;*.cc;*.c;*.h;*.hpp;*.hxx" autoConnectCapabilities="1407" debugSearchPath="" buildConfiguration="ARM Flash Debug" />
+ <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="/USB CrossConnect for ARM-RTCK" debugSearchFileMap="" fileDialogInitialDirectory="C:\E\Dev\FreeRTOS\Demo\ARM7_LPC2368_Rowley\webserver" fileDialogDefaultFilter="*.c" autoConnectCapabilities="1407" debugSearchPath="" buildConfiguration="ARM Flash Debug" />
 </session>
diff --git a/Demo/ARM7_LPC2368_Rowley/main.c b/Demo/ARM7_LPC2368_Rowley/main.c
index e94cf5263..389ff3530 100644
--- a/Demo/ARM7_LPC2368_Rowley/main.c
+++ b/Demo/ARM7_LPC2368_Rowley/main.c
@@ -122,7 +122,8 @@ int main (void)
 	/* Create the lwIP task.  This uses the lwIP RTOS abstraction layer.*/
     xTaskCreate( vuIP_Task, ( signed portCHAR * ) "uIP", mainBASIC_WEB_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );
 
-	/* Start the standard demo tasks. */
+	/* Start the standard demo tasks - these serve no useful purpose other than
+	to demonstrate the FreeRTOS API being used and to test the port. */
 	vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
     vCreateBlockTimeTasks();
     vStartLEDFlashTasks( mainFLASH_PRIORITY );
-- 
2.39.5