1.change core file extension to .c from .cpp

2.add missing "extern C"
3.move under os files to NyLPC_os.h from NyLPC_stdlib.h
4.remove  mbed.h and rtos.h from core library.

git-svn-id: http://svn.osdn.jp/svnroot/mimic/trunk@218 47198e57-cb75-475f-84c4-a814cd6f29e0

diff --git a/lib/.cproject b/lib/.cproject
index cf5b6b5..35f9e78 100644 (file)
--- a/lib/.cproject
+++ b/lib/.cproject
@@ -9,7 +9,7 @@
                                        <externalSetting>\r
                                                <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/NyLPCLib"/>\r
                                                <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/NyLPCLib/Debug"/>\r
-                                               <entry flags="RESOLVED" kind="libraryFile" name="NyLPCLib" srcPrefixMapping="" srcRootPath=""/>\r
+                                               <entry flags="RESOLVED" kind="libraryFile" name="NyLPCLib"/>\r
                                        </externalSetting>\r
                                </externalSettings>\r
                                <extensions>\r
@@ -44,6 +44,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeRTOSLib/src}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeRTOSLib/src/FreeRTOS/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeRTOSLib/src/FreeRTOS/portable/GCC/ARM_CM3}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\nxp\LPCXpresso_4.3.0_1023\lpcxpresso\Tools\arm-none-eabi\include&quot;"/>\r
                                                                </option>\r
                                                                <inputType id="com.crt.advproject.compiler.input.1906899951" superClass="com.crt.advproject.compiler.input"/>\r
                                                        </tool>\r
@@ -51,6 +52,9 @@
                                                                <option id="com.crt.advproject.gas.arch.658982008" name="Architecture" superClass="com.crt.advproject.gas.arch" value="com.crt.advproject.gas.target.cm3" valueType="enumerated"/>\r
                                                                <option id="com.crt.advproject.gas.thumb.1412805303" name="Thumb mode" superClass="com.crt.advproject.gas.thumb" value="true" valueType="boolean"/>\r
                                                                <option id="gnu.both.asm.option.flags.crt.443104769" name="Assembler flags" superClass="gnu.both.asm.option.flags.crt" value="-c -x assembler-with-cpp -D__REDLIB__  -DDEBUG -D__CODE_RED " valueType="string"/>\r
+                                                               <option id="gnu.both.asm.option.include.paths.1808788506" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">\r
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\nxp\LPCXpresso_4.3.0_1023\lpcxpresso\Tools\arm-none-eabi\include&quot;"/>\r
+                                                               </option>\r
                                                                <inputType id="com.crt.advproject.assembler.input.1293828394" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>\r
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.985393812" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>\r
                                                        </tool>\r
@@ -66,6 +70,345 @@
                        <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=""/>\r
+                               <profile id="com.crt.advproject.GCCManagedMakePerProjectProfileCPP">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="false" filePath=""/>\r
+                                               <parser enabled="false"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-c++" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="com.crt.advproject.GCCManagedMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="false" filePath=""/>\r
+                                               <parser enabled="false"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file} " command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="com.crt.advproject.GASManagedMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="false" filePath=""/>\r
+                                               <parser enabled="false"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                               <runAction arguments="-x assembler-with-cpp -E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="makefileGenerator">\r
+                                               <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <scannerConfigBuildInfo instanceId="com.crt.advproject.config.lib.debug.1662820404;com.crt.advproject.config.lib.debug.1662820404.;com.crt.advproject.gas.lib.debug.876056797;com.crt.advproject.assembler.input.1293828394">\r
+                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>\r
+                                       <profile id="com.crt.advproject.GCCManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-c++" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="com.crt.advproject.GCCManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file} " command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="com.crt.advproject.GASManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-x assembler-with-cpp -E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="makefileGenerator">\r
+                                                       <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                               </scannerConfigBuildInfo>\r
+                               <scannerConfigBuildInfo instanceId="com.crt.advproject.config.lib.debug.1662820404;com.crt.advproject.config.lib.debug.1662820404.;com.crt.advproject.gcc.lib.debug.478949124;com.crt.advproject.compiler.input.1906899951">\r
+                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>\r
+                                       <profile id="com.crt.advproject.GCCManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-c++" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="com.crt.advproject.GCCManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file} " command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="com.crt.advproject.GASManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-x assembler-with-cpp -E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="makefileGenerator">\r
+                                                       <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                               </scannerConfigBuildInfo>\r
+                       </storageModule>\r
                </cconfiguration>\r
                <cconfiguration id="com.crt.advproject.config.lib.release.1269765214">\r
                        <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.lib.release.1269765214" moduleId="org.eclipse.cdt.core.settings" name="Release">\r
@@ -73,7 +416,7 @@
                                        <externalSetting>\r
                                                <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/NyLPCLib"/>\r
                                                <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/NyLPCLib/Release"/>\r
-                                               <entry flags="RESOLVED" kind="libraryFile" name="NyLPCLib" srcPrefixMapping="" srcRootPath=""/>\r
+                                               <entry flags="RESOLVED" kind="libraryFile" name="NyLPCLib"/>\r
                                        </externalSetting>\r
                                </externalSettings>\r
                                <extensions>\r
@@ -132,6 +475,345 @@
                        <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=""/>\r
+                               <profile id="com.crt.advproject.GCCManagedMakePerProjectProfileCPP">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="false" filePath=""/>\r
+                                               <parser enabled="false"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-c++" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="com.crt.advproject.GCCManagedMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="false" filePath=""/>\r
+                                               <parser enabled="false"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file} " command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="com.crt.advproject.GASManagedMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="false" filePath=""/>\r
+                                               <parser enabled="false"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                               <runAction arguments="-x assembler-with-cpp -E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="makefileGenerator">\r
+                                               <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">\r
+                                       <buildOutputProvider>\r
+                                               <openAction enabled="true" filePath=""/>\r
+                                               <parser enabled="true"/>\r
+                                       </buildOutputProvider>\r
+                                       <scannerInfoProvider id="specsFile">\r
+                                               <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>\r
+                                               <parser enabled="true"/>\r
+                                       </scannerInfoProvider>\r
+                               </profile>\r
+                               <scannerConfigBuildInfo instanceId="com.crt.advproject.config.lib.debug.1662820404;com.crt.advproject.config.lib.debug.1662820404.;com.crt.advproject.gas.lib.debug.876056797;com.crt.advproject.assembler.input.1293828394">\r
+                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>\r
+                                       <profile id="com.crt.advproject.GCCManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-c++" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="com.crt.advproject.GCCManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file} " command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="com.crt.advproject.GASManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-x assembler-with-cpp -E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="makefileGenerator">\r
+                                                       <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                               </scannerConfigBuildInfo>\r
+                               <scannerConfigBuildInfo instanceId="com.crt.advproject.config.lib.debug.1662820404;com.crt.advproject.config.lib.debug.1662820404.;com.crt.advproject.gcc.lib.debug.478949124;com.crt.advproject.compiler.input.1906899951">\r
+                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>\r
+                                       <profile id="com.crt.advproject.GCCManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-c++" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="com.crt.advproject.GCCManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file} " command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="com.crt.advproject.GASManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="false" filePath=""/>\r
+                                                       <parser enabled="false"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="com.crt.advproject.specsFile">\r
+                                                       <runAction arguments="-x assembler-with-cpp -E -P -v -dD ${plugin_state_location}/${specs_file}" command="arm-none-eabi-gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="makefileGenerator">\r
+                                                       <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">\r
+                                               <buildOutputProvider>\r
+                                                       <openAction enabled="true" filePath=""/>\r
+                                                       <parser enabled="true"/>\r
+                                               </buildOutputProvider>\r
+                                               <scannerInfoProvider id="specsFile">\r
+                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>\r
+                                                       <parser enabled="true"/>\r
+                                               </scannerInfoProvider>\r
+                                       </profile>\r
+                               </scannerConfigBuildInfo>\r
+                       </storageModule>\r
                </cconfiguration>\r
        </storageModule>\r
        <storageModule moduleId="cdtBuildSystem" version="4.0.0">\r
@@ -140,7 +822,7 @@
        <storageModule moduleId="com.crt.config">\r
                <projectStorage>&lt;?xml version="1.0" encoding="UTF-8"?&gt;&#13;\r
 &lt;TargetConfig&gt;&#13;\r
-&lt;Properties property_0="" property_1="" property_2="" property_3="NXP" property_4="LPC1769" property_count="5" version="1"/&gt;&#13;\r
+&lt;Properties property_0="" property_3="NXP" property_4="LPC1769" property_count="5" version="1"/&gt;&#13;\r
 &lt;infoList vendor="NXP"&gt;&lt;info chip="LPC1769" match_id="0x26113F37" name="LPC1769" package="lpc17_lqfp100.xml"&gt;&lt;chip&gt;&lt;name&gt;LPC1769&lt;/name&gt;&#13;\r
 &lt;family&gt;LPC17xx&lt;/family&gt;&#13;\r
 &lt;vendor&gt;NXP (formerly Philips)&lt;/vendor&gt;&#13;\r

diff --git a/lib/src/NyLPC_stdlib.c b/lib/src/NyLPC_stdlib.c
index fc0affd..6565b96 100644 (file)
--- a/lib/src/NyLPC_stdlib.c
+++ b/lib/src/NyLPC_stdlib.c
@@ -24,6 +24,7 @@
  *\r
  *********************************************************************************/\r
 #include "NyLPC_stdlib.h"\r
+\r
 NyLPC_TUInt32 NyLPC_TUInt32_bswap(NyLPC_TUInt32 n)\r
 {\r
        return(\r
@@ -113,13 +114,15 @@ NyLPC_TUInt8 NyLPC_TTextIdTbl_getMatchId(const NyLPC_TChar* i_str,const struct N
 \r
 \r
 /** ----------\r
- *\r
+ * Standard functions\r
  ---------- */\r
 \r
 \r
 \r
 \r
-\r
+/**\r
+ * same as itoa\r
+ */\r
 void NyLPC_itoa(int i_n,char* o_out,int i_digit)\r
 {\r
         int i, sign;\r
@@ -148,3 +151,47 @@ void NyLPC_reverse(char* s)
                *j-- = c;\r
        }\r
 }\r
+\r
+\r
+int NyLPC_stricmp(const char *i_s1, const char *i_s2)\r
+{\r
+  const char* s1 =i_s1;\r
+  const char* s2 =i_s2;\r
+  for (;NyLPC_tolower(*s1) == NyLPC_tolower(*s2) && *s1 != '\0';s1++, s2++);\r
+  return (int)((unsigned char)*s1) - (int)((unsigned char)(*s2));\r
+}\r
+\r
+int NyLPC_strnicmp(const char *i_s1, const char *i_s2,int n)\r
+{\r
+       char c;\r
+       int n2=n;\r
+       for(;n2>0;n2--)\r
+       {\r
+               c=(int)((unsigned char)NyLPC_tolower(*i_s1)) - (int)((unsigned char)NyLPC_tolower(*i_s2));\r
+               if(c!=0){\r
+                       return c;\r
+               }\r
+               i_s1++;\r
+               i_s2++;\r
+       }\r
+       return 0;\r
+}\r
+\r
+\r
+int NyLPC_ctoi(char i)\r
+{\r
+       if('0'<=i && i<='9') return (i-'0');\r
+       return 0;\r
+}\r
+int NyLPC_ctox(char i)\r
+{\r
+       if('0'<=i && i<='9') return (i-'0');\r
+       if('a'<=i && i<='f') return (i-'a'+10);\r
+       if('A'<=i && i<='F') return (i-'A'+10);\r
+       return 0;\r
+}\r
+\r
+\r
+\r
+\r
+\r

diff --git a/lib/src/driver/uip/EthDev_LPC17xx.c b/lib/src/driver/uip/EthDev_LPC17xx.c
index b8135a6..6e92274 100644 (file)
--- a/lib/src/driver/uip/EthDev_LPC17xx.c
+++ b/lib/src/driver/uip/EthDev_LPC17xx.c
@@ -6,7 +6,8 @@
  */\r
 \r
 #include "EthDev_LPC17xx.h"\r
-\r
+#include "LPC17xx.h"\r
+#include "NyLPC_os.h"\r
 /* If no buffers are available, then wait this long before looking again.... */\r
 #define emacBUFFER_WAIT_DELAY_MS               3\r
 #define emacBUFFER_WAIT_EMPTY_DELAY_MS 10\r

diff --git a/lib/src/driver/uip/EtherDev_DP83848C.c b/lib/src/driver/uip/EtherDev_DP83848C.c
index dd9e9cb..494161f 100644 (file)
--- a/lib/src/driver/uip/EtherDev_DP83848C.c
+++ b/lib/src/driver/uip/EtherDev_DP83848C.c
@@ -60,8 +60,9 @@
 \r
 /* Kernel includes. */\r
 #include "EtherDev_DP83848C_protected.h"\r
-#include "../os/NyLPC_cThread.h"\r
-#include "../os/NyLPC_cIsr.h"\r
+#include "LPC17xx.h"\r
+#include "NyLPC_os.h"\r
+\r
 \r
 #define DP83848C_ID         0x20005C90  /* PHY Identifier                    */\r
 \r

diff --git a/lib/src/driver/uip/EtherDev_LAN8720.c b/lib/src/driver/uip/EtherDev_LAN8720.c
index ee32af8..3dbae79 100644 (file)
--- a/lib/src/driver/uip/EtherDev_LAN8720.c
+++ b/lib/src/driver/uip/EtherDev_LAN8720.c
@@ -59,7 +59,8 @@
 \r
 \r
 #include "EtherDev_LAN8720_protected.h"\r
-#include "../os/NyLPC_cThread.h"\r
+#include "LPC17xx.h"\r
+#include "NyLPC_os.h"\r
 \r
 #define LAN8720_ID          0x0007C0F0  /* PHY Identifier                    */\r
 \r

diff --git a/lib/src/flash/NyLPC_cMiMicConfiglation.h b/lib/src/flash/NyLPC_cMiMicConfiglation.h
index 00bc31b..f1b56e1 100644 (file)
--- a/lib/src/flash/NyLPC_cMiMicConfiglation.h
+++ b/lib/src/flash/NyLPC_cMiMicConfiglation.h
@@ -9,22 +9,25 @@
 #ifndef NYLPC_CCONFIGLATIONSTORAGE_H_\r
 #define NYLPC_CCONFIGLATIONSTORAGE_H_\r
 \r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
 \r
 /**\r
  * IPアドレスはネットワークオーダーで格納する。\r
  */\r
 struct NyLPC_TMimicConfigulation{\r
-       /**\r
-        * ROM焼検出用。0xFFFFFFFFを書く\r
-        */\r
-       NyLPC_TUInt32   fast_boot;\r
-       NyLPC_TUInt32   mac_00_01_02_03;\r
-       NyLPC_TUInt32   mac_04_05_xx_xx;\r
-       NyLPC_TUInt32   ipv4_addr_net;\r
-       NyLPC_TUInt32   ipv4_mask_net;\r
-       NyLPC_TUInt32   ipv4_drut_net;\r
-       NyLPC_TUInt32   ipv4_port;\r
-       NyLPC_TUInt32   accessmode;\r
+    /**\r
+     * ROM焼検出用。0xFFFFFFFFを書く\r
+     */\r
+    NyLPC_TUInt32   fast_boot;\r
+    NyLPC_TUInt32   mac_00_01_02_03;\r
+    NyLPC_TUInt32   mac_04_05_xx_xx;\r
+    NyLPC_TUInt32   ipv4_addr_net;\r
+    NyLPC_TUInt32   ipv4_mask_net;\r
+    NyLPC_TUInt32   ipv4_drut_net;\r
+    NyLPC_TUInt32   ipv4_port;\r
+    NyLPC_TUInt32   accessmode;\r
 };\r
 \r
 /**\r
@@ -40,4 +43,8 @@ NyLPC_TBool NyLPC_cMiMicConfiglation_updateConfigulation(const struct NyLPC_TMim
 const struct NyLPC_TMimicConfigulation* NyLPC_cMiMicConfiglation_loadFromFlash(void);\r
 const struct NyLPC_TMimicConfigulation* NyLPC_cMiMicConfiglation_loadFactoryDefault(void);\r
 \r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
+\r
 #endif /* CCONFIGLATIONSTORAGE_H_ */\r

diff --git a/lib/src/include/NyLPC_stdlib.h b/lib/src/include/NyLPC_stdlib.h
index 09059c9..b239275 100644 (file)
--- a/lib/src/include/NyLPC_stdlib.h
+++ b/lib/src/include/NyLPC_stdlib.h
@@ -459,9 +459,40 @@ NyLPC_TUInt8 NyLPC_TTextIdTbl_getMatchId(const NyLPC_TChar* i_str,const struct N
 /*********************************************************************************\r
  * standard function\r
  *********************************************************************************/\r
+/**\r
+ * Same as tolower\r
+ */\r
+#define NyLPC_tolower(c) (((c) >= 'A' && (c) <= 'Z' )?((c)+'a' - 'A'):(c))\r
+\r
+/**\r
+ * Same as itoa\r
+ */\r
 void NyLPC_itoa(int i_n,char* o_out,int i_digit);\r
+\r
+/**\r
+ * Same as reverse\r
+ */\r
 void NyLPC_reverse(char* s);\r
 \r
+/**\r
+ * Same as stricmp\r
+ */\r
+int NyLPC_stricmp(const char *i_s1, const char *i_s2);\r
+\r
+/**\r
+ * Same as strnicmp\r
+ */\r
+int NyLPC_strnicmp(const char *i_s1, const char *i_s2,int n);\r
+\r
+/**\r
+ * Convert a charactor to integer.\r
+ */\r
+int NyLPC_ctoi(char i);\r
+\r
+/**\r
+ * Convert a character to 16 digit integer.\r
+ */\r
+int NyLPC_ctox(char i);\r
 \r
 \r
 \r
@@ -483,11 +514,6 @@ void NyLPC_reverse(char* s);
 #include "../NyLPC_cStr.h"\r
 \r
 \r
-#include "../os/NyLPC_cStopwatch.h"\r
-#include "../os/NyLPC_cMutex.h"\r
-#include "../os/NyLPC_cThread.h"\r
-#include "../os/NyLPC_cSemaphore.h"\r
-#include "../os/NyLPC_cIsr.h"\r
 \r
 \r
 \r

diff --git a/lib/src/net/NyLPC_cNet.h b/lib/src/net/NyLPC_cNet.h
index 85d2bb9..fb9bd34 100644 (file)
--- a/lib/src/net/NyLPC_cNet.h
+++ b/lib/src/net/NyLPC_cNet.h
@@ -4,7 +4,9 @@
 #include "NyLPC_stdlib.h"\r
 #include "NyLPC_uipService.h"\r
 #include "NyLPC_cNetConfig.h"\r
-\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
 /**\r
  * クラス型を定義します。\r
  */\r
@@ -34,5 +36,7 @@ void NyLPC_cNet_initialize(NyLPC_TcNet_t* i_inst);
  */\r
 void NyLPC_cNet_start(NyLPC_TcNet_t* i_inst,const NyLPC_TcNetConfig_t* i_ref_config);\r
 \r
-\r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 #endif /* NYLPC_CNET_H_ */\r

diff --git a/lib/src/net/NyLPC_cNetConfig.h b/lib/src/net/NyLPC_cNetConfig.h
index 87e5fbe..7d99ff2 100644 (file)
--- a/lib/src/net/NyLPC_cNetConfig.h
+++ b/lib/src/net/NyLPC_cNetConfig.h
@@ -3,7 +3,9 @@
 \r
 #include "NyLPC_stdlib.h"\r
 #include "NyLPC_uipService.h"\r
-\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
 #define NyLPC_cNetConfig_INTERFACE_TYPE_ETHERNET 1\r
 \r
 /**\r
@@ -49,4 +51,7 @@ void NyLPC_cNetConfig_initialize(NyLPC_TcNetConfig_t* i_inst,NyLPC_TBool i_is_fa
  */\r
 #define NyLPC_cNetConfig_finalize(i_inst);\r
 \r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 #endif /* NYLPC_CNETCONFIG_H_ */\r

diff --git a/lib/src/net/httpd/NyLPC_cHttpRequestPrefixParser.h b/lib/src/net/httpd/NyLPC_cHttpRequestPrefixParser.h
index 53f1ac0..72192f2 100644 (file)
--- a/lib/src/net/httpd/NyLPC_cHttpRequestPrefixParser.h
+++ b/lib/src/net/httpd/NyLPC_cHttpRequestPrefixParser.h
@@ -27,7 +27,9 @@
 #define NYLPC_cHttpRequestPrefixParser_H_\r
 \r
 #include "NyLPC_http.h"\r
-\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
 \r
 typedef struct NyLPC_TcHttpRequestPrefixParser NyLPC_TcHttpRequestPrefixParser_t;\r
 \r
@@ -53,4 +55,7 @@ NyLPC_TBool NyLPC_cHttpRequestPrefixParser_parse(NyLPC_TcHttpRequestPrefixParser
 \r
 const NyLPC_TChar* NyLPC_cHttpRequestPrefixParser_getUrlPrefix(const NyLPC_TcHttpRequestPrefixParser_t* i_inst);\r
 \r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 #endif /* NYLPC_CHTTPSHORTHTTPHEADERPARSER_H_ */\r

diff --git a/lib/src/net/httpd/NyLPC_cHttpd.h b/lib/src/net/httpd/NyLPC_cHttpd.h
index 2761783..c53777c 100644 (file)
--- a/lib/src/net/httpd/NyLPC_cHttpd.h
+++ b/lib/src/net/httpd/NyLPC_cHttpd.h
@@ -6,6 +6,11 @@
 #include "../NyLPC_cNetConfig.h"\r
 #include "NyLPC_cHttpd.h"\r
 #include "NyLPC_cHttpdThread.h"\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+\r
 #ifndef DEFINE_NyLPC_TcHttpdConnection_t\r
        typedef struct NyLPC_TcHttpdConnection NyLPC_TcHttpdConnection_t;\r
        #define DEFINE_NyLPC_TcHttpdConnection_t\r
@@ -42,6 +47,8 @@ void NyLPC_cHttpd_finalize(NyLPC_TcHttpd_t* i_inst);
 void NyLPC_cHttpd_loop(NyLPC_TcHttpd_t* i_inst);\r
 \r
 \r
-\r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 \r
 #endif /* NYLPC_CHTTPD_H_ */\r

diff --git a/lib/src/net/httpd/NyLPC_cHttpdConnection.h b/lib/src/net/httpd/NyLPC_cHttpdConnection.h
index b80f37e..9bd9da0 100644 (file)
--- a/lib/src/net/httpd/NyLPC_cHttpdConnection.h
+++ b/lib/src/net/httpd/NyLPC_cHttpdConnection.h
@@ -9,6 +9,11 @@
 #define NYLPC_CHTTPDCONNECTION_H_\r
 #include "NyLPC_stdlib.h"\r
 #include "NyLPC_cHttpRequestPrefixParser.h"\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+\r
 #ifndef DEFINE_NyLPC_TcHttpd_t\r
        typedef struct NyLPC_TcHttpd NyLPC_TcHttpd_t;\r
        #define DEFINE_NyLPC_TcHttpd_t\r
@@ -123,5 +128,8 @@ void NyLPC_cHttpdConnection_unlock(NyLPC_TcHttpdConnection_t* i_inst);
 #define NyLPC_cHttpdConnection_getMethod(i_inst) (i_inst->_pparser.method)\r
 #define NyLPC_cHttpdConnection_getReqStatus(i_inst) (i_inst->_req_status)\r
 \r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 \r
 #endif /* NYLPC_CHTTPDCONNECTION_H_ */\r

diff --git a/lib/src/net/httpd/NyLPC_cHttpdConnection_protected.h b/lib/src/net/httpd/NyLPC_cHttpdConnection_protected.h
index 36cfe73..f9f493c 100644 (file)
--- a/lib/src/net/httpd/NyLPC_cHttpdConnection_protected.h
+++ b/lib/src/net/httpd/NyLPC_cHttpdConnection_protected.h
@@ -11,6 +11,11 @@
 #include "NyLPC_cHttpdConnection.h"\r
 #include "NyLPC_stdlib.h"\r
 #include "./mod/NyLPC_cHttpModUtils_protected.h"\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+\r
 /**\r
  * コネクションモード\r
  */\r
@@ -94,4 +99,7 @@ void NyLPC_cHttpdConnection_setConnectionMode(NyLPC_TcHttpdConnection_t* i_inst,
 NyLPC_TUInt16 NyLPC_cHttpd_incNumOfConnection(NyLPC_TcHttpd_t* i_inst);\r
 NyLPC_TUInt16 NyLPC_cHttpd_decNumOfConnection(NyLPC_TcHttpd_t* i_inst);\r
 \r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 #endif /* NYLPC_CHTTPDCONNECTION_H_ */\r

diff --git a/lib/src/net/httpd/NyLPC_cHttpdThread.h b/lib/src/net/httpd/NyLPC_cHttpdThread.h
index eee96bc..ce95be9 100644 (file)
--- a/lib/src/net/httpd/NyLPC_cHttpdThread.h
+++ b/lib/src/net/httpd/NyLPC_cHttpdThread.h
@@ -10,6 +10,11 @@
 #include "NyLPC_stdlib.h"\r
 #include "../NyLPC_cNetConfig.h"\r
 #include "NyLPC_cHttpdConnection.h"\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+\r
 #ifndef DEFINE_NyLPC_TcHttpd_t\r
        typedef struct NyLPC_TcHttpd NyLPC_TcHttpd_t;\r
        #define DEFINE_NyLPC_TcHttpd_t\r
@@ -34,4 +39,7 @@ void NyLPC_cHttpdThread_initialize(NyLPC_TcHttpdThread_t* i_inst,NyLPC_TcHttpd_t
 void NyLPC_cHttpdThread_finalize(NyLPC_TcHttpdThread_t* i_inst);\r
 NyLPC_TBool NyLPC_cHttpdThread_start(NyLPC_TcHttpdThread_t* i_inst,NyLPC_TcTcpListener_t* i_listener);\r
 \r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 #endif /* NYLPC_TCHTTPDTHREAD_H_ */\r

diff --git a/lib/src/net/httpd/NyLPC_cHttpdThread_protected.h b/lib/src/net/httpd/NyLPC_cHttpdThread_protected.h
index eee96bc..ce95be9 100644 (file)
--- a/lib/src/net/httpd/NyLPC_cHttpdThread_protected.h
+++ b/lib/src/net/httpd/NyLPC_cHttpdThread_protected.h
@@ -10,6 +10,11 @@
 #include "NyLPC_stdlib.h"\r
 #include "../NyLPC_cNetConfig.h"\r
 #include "NyLPC_cHttpdConnection.h"\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+\r
 #ifndef DEFINE_NyLPC_TcHttpd_t\r
        typedef struct NyLPC_TcHttpd NyLPC_TcHttpd_t;\r
        #define DEFINE_NyLPC_TcHttpd_t\r
@@ -34,4 +39,7 @@ void NyLPC_cHttpdThread_initialize(NyLPC_TcHttpdThread_t* i_inst,NyLPC_TcHttpd_t
 void NyLPC_cHttpdThread_finalize(NyLPC_TcHttpdThread_t* i_inst);\r
 NyLPC_TBool NyLPC_cHttpdThread_start(NyLPC_TcHttpdThread_t* i_inst,NyLPC_TcTcpListener_t* i_listener);\r
 \r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 #endif /* NYLPC_TCHTTPDTHREAD_H_ */\r

diff --git a/lib/src/net/httpd/NyLPC_cHttpd_protected.h b/lib/src/net/httpd/NyLPC_cHttpd_protected.h
index da4d93f..22e6284 100644 (file)
--- a/lib/src/net/httpd/NyLPC_cHttpd_protected.h
+++ b/lib/src/net/httpd/NyLPC_cHttpd_protected.h
@@ -6,6 +6,10 @@
 #include "../NyLPC_cNetConfig.h"\r
 #include "NyLPC_cHttpd.h"\r
 #include "NyLPC_cHttpdThread.h"\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+\r
 #ifndef DEFINE_NyLPC_TcHttpdConnection_t\r
        typedef struct NyLPC_TcHttpdConnection NyLPC_TcHttpdConnection_t;\r
        #define DEFINE_NyLPC_TcHttpdConnection_t\r
@@ -22,4 +26,8 @@ void NyLPC_cHttpd_loop(NyLPC_TcHttpd_t* i_inst);
 void NyLPC_cHttpd_lock(NyLPC_TcHttpd_t* i_inst);\r
 void NyLPC_cHttpd_unlock(NyLPC_TcHttpd_t* i_inst);\r
 #define NyLPC_cHttpd_getNumOfConnection(i_inst) ((i_inst)->_num_of_active_connection)\r
+\r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 #endif /* NYLPC_CHTTPD_H_ */\r

diff --git a/lib/src/net/httpd/mod/NyLPC_cHttpModUtils_protected.h b/lib/src/net/httpd/mod/NyLPC_cHttpModUtils_protected.h
index 1c00663..6a8ad9f 100644 (file)
--- a/lib/src/net/httpd/mod/NyLPC_cHttpModUtils_protected.h
+++ b/lib/src/net/httpd/mod/NyLPC_cHttpModUtils_protected.h
@@ -11,7 +11,9 @@
 #include "NyLPC_stdlib.h"\r
 #include "NyLPC_http.h"\r
 #include "../NyLPC_cHttpdConnection.h"\r
-\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
 /**\r
  * Method文字列を返します。\r
  */\r
@@ -25,5 +27,7 @@ NyLPC_TBool NyLPC_cHttpdModUtils_sendFixedContentBatch(NyLPC_TcHttpdConnection_t
  */\r
 NyLPC_TBool NyLPC_cHttpdModUtils_sendJsonHeader(NyLPC_TcHttpdConnection_t* i_connection);\r
 \r
-\r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 #endif /* NYLPC_HTTPMOD_UTILS_PROTECTED_H_ */\r

diff --git a/lib/src/net/httpd/mod/NyLPC_cModRomFiles_protected.h b/lib/src/net/httpd/mod/NyLPC_cModRomFiles_protected.h
index fc7790c..24f2daa 100644 (file)
--- a/lib/src/net/httpd/mod/NyLPC_cModRomFiles_protected.h
+++ b/lib/src/net/httpd/mod/NyLPC_cModRomFiles_protected.h
@@ -9,6 +9,12 @@
 #define NYLPC_CMODROMFILES_PROTECTED_H_\r
 \r
 #include "NyLPC_cModRomFiles.h"\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
 \r
+#ifdef __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
 \r
 #endif /* NYLPC_CMODROMFILES_PROTECTED_H_ */\r

diff --git a/lib/src/os/NyLPC_cIsr.h b/lib/src/os/NyLPC_cIsr.h
index 109ac31..e8d8840 100644 (file)
--- a/lib/src/os/NyLPC_cIsr.h
+++ b/lib/src/os/NyLPC_cIsr.h
@@ -34,8 +34,7 @@
 #include "queue.h"\r
 #include "semphr.h"\r
 #elif NyLPC_ARCH==NyLPC_ARCH_MBEDRTOS\r
-#include "mbed.h"\r
-#include "rtos.h"\r
+\r
 #else\r
 #error Bad NyLPC_ARCH!\r
 #endif\r
@@ -54,11 +53,11 @@ typedef void (*NyLPC_cIsr_EventHandler)(unsigned long i_status);
 /**\r
  * 全ての割込みとタスクスイッチを停止します。\r
  */\r
-void NyLPC_cIsr_enterCritical();\r
+void NyLPC_cIsr_enterCritical(void);\r
 /**\r
  * 全ての割込みとタスクスイッチを再開します。\r
  */\r
-void NyLPC_cIsr_exitCritical();\r
+void NyLPC_cIsr_exitCritical(void);\r
 /**\r
  * イベントハンドラを登録します。\r
  * @param i_handler\r

diff --git a/lib/src/os/NyLPC_cMutex.h b/lib/src/os/NyLPC_cMutex.h
index 31c2f7d..188fd50 100644 (file)
--- a/lib/src/os/NyLPC_cMutex.h
+++ b/lib/src/os/NyLPC_cMutex.h
@@ -34,8 +34,6 @@
 #include "queue.h"\r
 #include "semphr.h"\r
 #elif NyLPC_ARCH==NyLPC_ARCH_MBEDRTOS\r
-#include "mbed.h"\r
-#include "rtos.h"\r
 #else\r
 #error Bad NyLPC_ARCH!\r
 #endif\r
@@ -62,7 +60,7 @@ struct NyLPC_TcMutex
 #elif NyLPC_ARCH==NyLPC_ARCH_MBEDRTOS\r
 struct NyLPC_TcMutex\r
 {\r
-    rtos::Mutex _mutex;\r
+    void* _mutex;//rtos::Mutex*\r
     NyLPC_TUInt8 _lock_count;\r
 };\r
 #endif\r

diff --git a/lib/src/os/NyLPC_cSemaphore.h b/lib/src/os/NyLPC_cSemaphore.h
index 30f743f..2eaf01f 100644 (file)
--- a/lib/src/os/NyLPC_cSemaphore.h
+++ b/lib/src/os/NyLPC_cSemaphore.h
@@ -34,8 +34,6 @@
 #include "queue.h"\r
 #include "semphr.h"\r
 #elif NyLPC_ARCH==NyLPC_ARCH_MBEDRTOS\r
-#include "mbed.h"\r
-#include "rtos.h"\r
 #else\r
 #error Bad NyLPC_ARCH!\r
 #endif\r
@@ -59,11 +57,9 @@ struct NyLPC_TcSemaphore
     xSemaphoreHandle _handle;\r
 };\r
 #elif NyLPC_ARCH==NyLPC_ARCH_MBEDRTOS\r
-#include "mbed.h"\r
-#include "rtos.h"\r
 struct NyLPC_TcSemaphore\r
 {\r
-    Semaphore* _handle;\r
+    void* _handle;//Semaphore*\r
 };\r
 #else\r
 #error Bad NyLPC_ARCH!\r

diff --git a/lib/src/os/NyLPC_cThread.h b/lib/src/os/NyLPC_cThread.h
index f9a7722..4e42a21 100644 (file)
--- a/lib/src/os/NyLPC_cThread.h
+++ b/lib/src/os/NyLPC_cThread.h
@@ -34,8 +34,6 @@
 #include "FreeRTOS.h"\r
 #include "task.h"\r
 #elif NyLPC_ARCH==NyLPC_ARCH_MBEDRTOS\r
-#include "mbed.h"\r
-#include "rtos.h"\r
 #else\r
 #error Bad NyLPC_ARCH!\r
 #endif\r
@@ -74,21 +72,19 @@ typedef int (*NyLPC_TcThread_ThreadFunc)(void* i_param);
 #if NyLPC_ARCH==NyLPC_ARCH_FREERTOS\r
 \r
 struct NyLPC_TcThread {\r
-       NyLPC_TUInt32 _sbit;\r
-       xTaskHandle _taskid;\r
-       NyLPC_TcThread_ThreadFunc _func;\r
-       void* _param;\r
+    NyLPC_TUInt32 _sbit;\r
+    xTaskHandle _taskid;\r
+    NyLPC_TcThread_ThreadFunc _func;\r
+    void* _param;\r
 };\r
 #elif NyLPC_ARCH==NyLPC_ARCH_MBEDRTOS\r
-#include "mbed.h"\r
-#include "rtos.h"\r
 \r
 struct NyLPC_TcThread\r
 {\r
-       NyLPC_TUInt32 _sbit;\r
-       Thread* _thread;\r
-       NyLPC_TcThread_ThreadFunc _func;\r
-       void* _arg;\r
+    NyLPC_TUInt32 _sbit;\r
+    void* _thread; //Thread* type.\r
+    NyLPC_TcThread_ThreadFunc _func;\r
+    void* _arg;\r
 };\r
 \r
 #else\r
@@ -106,9 +102,9 @@ struct NyLPC_TcThread
 void NyLPC_cThread_initialize(NyLPC_TcThread_t* i_inst, NyLPC_TInt32 i_stack,NyLPC_TInt32 i_prio);\r
 void NyLPC_cThread_finalize(NyLPC_TcThread_t* i_inst);\r
 void NyLPC_cThread_start(NyLPC_TcThread_t* i_inst,\r
-               NyLPC_TcThread_ThreadFunc i_func, void* i_param);\r
+        NyLPC_TcThread_ThreadFunc i_func, void* i_param);\r
 void NyLPC_cThread_join(NyLPC_TcThread_t* i_inst);\r
-void NyLPC_cThread_yield();\r
+void NyLPC_cThread_yield(void);\r
 /**\r
  * 一定時間、スレッドをスリープする。\r
  * この関数はstatic関数です。\r

diff --git a/lib/src/uip/NyLPC_cTcpListener.h b/lib/src/uip/NyLPC_cTcpListener.h
index fb5107b..a82540f 100644 (file)
--- a/lib/src/uip/NyLPC_cTcpListener.h
+++ b/lib/src/uip/NyLPC_cTcpListener.h
@@ -32,6 +32,7 @@ typedef struct NyLPC_TcTcpListener NyLPC_TcTcpListener_t;
 #include "../include/NyLPC_stdlib.h"\r
 #include "NyLPC_cTcpSocket.h"\r
 #include "NyLPC_stdlib.h"\r
+#include "NyLPC_os.h"\r
 /**********************************************************************\r
  *\r
  * NyLPC_TcTcpListener class\r

diff --git a/lib/src/uip/NyLPC_cTcpSocket.h b/lib/src/uip/NyLPC_cTcpSocket.h
index 3bf1f48..a66372e 100644 (file)
--- a/lib/src/uip/NyLPC_cTcpSocket.h
+++ b/lib/src/uip/NyLPC_cTcpSocket.h
@@ -29,8 +29,10 @@
 \r
 \r
 #include "NyLPC_uip.h"\r
+#include "NyLPC_os.h"\r
 #include "NyLPC_cIPv4Payload.h"\r
 \r
+\r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif /* __cplusplus */\r

diff --git a/lib/src/utils/NyLPC_cFormatTextReader.c b/lib/src/utils/NyLPC_cFormatTextReader.c
new file mode 100644 (file)
index 0000000..4b1a28c
--- /dev/null
+++ b/lib/src/utils/NyLPC_cFormatTextReader.c
@@ -0,0 +1,99 @@
+/**\r
+ * @file\r
+ * NyLPC_cFormatTextReader.c\r
+ * このクラスは、書式テキスト読み出し関数を集約します。\r
+ *  Created on: 2013/04/18\r
+ *      Author: nyatla\r
+ */\r
+#include <ctype.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include "NyLPC_cFormatTextReader.h"\r
+/**\r
+ * [a-zA-Z0-9_-]で構成されるワードを取得します。\r
+ * This function peek a word from string.\r
+ * @return\r
+ * size of seeked.\r
+ */\r
+NyLPC_TInt32 NyLPC_cFormatTextReader_readWord(const NyLPC_TChar* buf,const NyLPC_TChar** top)\r
+{\r
+    const NyLPC_TChar* p=buf;\r
+    *top=p;\r
+    for(;*p!='\0' && (isalnum(*p)|| (strchr("_-",*p)!=NULL));p++);//skip words\r
+       return p-(*top);\r
+}\r
+\r
+/**\r
+ * 文字列からIPアドレスを取得します。\r
+ * [:number:]\.[:number:]\.[:number:]\.[:number:]\r
+ * [:number:]は0-255までに制限されます。\r
+ * @return\r
+ * next pointer\r
+ */\r
+NyLPC_TInt32 NyLPC_cFormatTextReader_readIpAddr(const NyLPC_TChar* buf,NyLPC_TUInt8 v[4])\r
+{\r
+       NyLPC_TInt32 t;\r
+    const NyLPC_TChar* p=buf;\r
+    NyLPC_TInt32 i;\r
+    for(i=0;i<4;i++){\r
+        t=0;\r
+               for(;isdigit(*p);p++){\r
+                       t=t*10+NyLPC_ctoi(*p);\r
+                       if(t>255){\r
+                               return 0;\r
+                       }\r
+        }\r
+               v[i]=t;\r
+               if(i<3){\r
+                       if(*p!='.'){\r
+                               return 0;\r
+                       }\r
+                       p++;\r
+               }else if(!isspace(*p) && *p!='\0'){\r
+                       return 0;\r
+               }\r
+    }\r
+       return (p-buf);\r
+}\r
+/**\r
+ * 文字列からMACアドレスを取得します。\r
+ * [:hex:]:[:hex:]:[:hex:]:[:hex:]\r
+ */\r
+NyLPC_TInt32 NyLPC_cFormatTextReader_readMacAddr(const NyLPC_TChar* buf,NyLPC_TUInt8 v[6])\r
+{\r
+       NyLPC_TInt32 t,i;\r
+    const NyLPC_TChar* p=buf;\r
+    for(i=0;i<6;i++){\r
+        t=0;\r
+               for(;isxdigit(*p);p++){\r
+                       t=t*16+NyLPC_ctox(*p);\r
+                       if(t>255){\r
+                               return 0;\r
+                       }\r
+        }\r
+               v[i]=t;\r
+               if(i<5){\r
+                       if(*p!=':'){\r
+                               return 0;\r
+                       }\r
+                       p++;\r
+               }else if(!isspace(*p) && *p!='\0'){\r
+                       return 0;\r
+               }\r
+    }\r
+       return (p-buf);\r
+}\r
+/**\r
+ * 連続するスペースを読み飛ばします。\r
+ * @return\r
+ * 読み飛ばしたスペース\r
+ */\r
+NyLPC_TInt32 NyLPC_cFormatTextReader_seekSpace(const NyLPC_TChar* s)\r
+{\r
+       const NyLPC_TChar* p=s;\r
+       for(;*p!='\0' && isspace(*p);p++);\r
+       return p-s;\r
+}\r
+\r
+\r
+\r

diff --git a/lib/src/utils/NyLPC_cFormatTextReader.h b/lib/src/utils/NyLPC_cFormatTextReader.h
new file mode 100644 (file)
index 0000000..c5cc745
--- /dev/null
+++ b/lib/src/utils/NyLPC_cFormatTextReader.h
@@ -0,0 +1,45 @@
+/**\r
+ * @file\r
+ * NyLPC_cFormattextReader.h\r
+ * 書式テキストを読み出す為の関数群です。\r
+ *  Created on: 2013/04/20\r
+ *      Author: nyatla\r
+ */\r
+#include "NyLPC_stdlib.h"\r
+\r
+#ifndef NYLPC_CFORMATTEXTREADER_H_\r
+#define NYLPC_CFORMATTEXTREADER_H_\r
+\r
+\r
+/**\r
+ * [a-zA-Z0-9_-]で構成されるワードを取得します。\r
+ * This function peek a word from string.\r
+ * @return\r
+ * size of seeked.\r
+ */\r
+NyLPC_TInt32 NyLPC_cFormatTextReader_readWord(const NyLPC_TChar* buf,const NyLPC_TChar** top);\r
+\r
+/**\r
+ * 文字列からIPアドレスを取得します。\r
+ * [:number:]\.[:number:]\.[:number:]\.[:number:]\r
+ * [:number:]は0-255までに制限されます。\r
+ * @return\r
+ * next pointer\r
+ */\r
+NyLPC_TInt32 NyLPC_cFormatTextReader_readIpAddr(const NyLPC_TChar* buf,NyLPC_TUInt8 v[4]);\r
+\r
+/**\r
+ * 文字列からMACアドレスを取得します。\r
+ * [:hex:]:[:hex:]:[:hex:]:[:hex:]\r
+ */\r
+NyLPC_TInt32 NyLPC_cFormatTextReader_readMacAddr(const NyLPC_TChar* buf,NyLPC_TUInt8 v[6]);\r
+\r
+/**\r
+ * 連続するスペースを読み飛ばします。\r
+ * @return\r
+ * 読み飛ばしたスペース\r
+ */\r
+NyLPC_TInt32 NyLPC_cFormatTextReader_seekSpace(const NyLPC_TChar* s);\r
+\r
+\r
+#endif /* NYLPC_CFORMATTEXTREADER_H_ */\r

diff --git a/misc/html.mbed/MiMicJSEditor.html b/misc/html.mbed/MiMicJSEditor.html
index 051bcac..70ea19e 100644 (file)
--- a/misc/html.mbed/MiMicJSEditor.html
+++ b/misc/html.mbed/MiMicJSEditor.html
@@ -267,8 +267,8 @@ function init()
 <textarea id="src"><!DOCTYPE html>\r
 <html><head>\r
 <meta charset="UTF-8">\r
-<script src="/rom/MiMicCore-mini.js"></script> \r
-<script src="/rom/MbedM3.All-mini.js"></script>        \r
+<script src="/rom/m/MiMicCore-mini.js"></script>       \r
+<script src="/rom/m/MbedM3.All-mini.js"></script>      \r
 <script type="text/javascript">\r
 function start()\r
 {\r

diff --git a/misc/html.mbed/index.html b/misc/html.mbed/index.html
index e570dc5..6ae0c32 100644 (file)
--- a/misc/html.mbed/index.html
+++ b/misc/html.mbed/index.html
@@ -40,7 +40,14 @@ Hello, This is MiMic Remote MCU. If you can see this page, MiMic RemoteMCU serve
 <li><a href="http://mimic.sourceforge.jp/doc/current/">JavascriptAPI reference</a><br/>MiMic Javascript API reference.</li>\r
 <li><a href="http://sourceforge.jp/projects/mimic/">MiMic project(SorceForge)</a><br/>MiMic for LPCXpresso and APIsfor other languages(PHP,Unit3D) . This is core library of MiMic.</li>\r
 <li><a href="http://jsdo.it/tag/MiMic">MiMic online samples(jsdo.it)</a><br/>Online sample programs using MiMic Javascript API.Those are tagged 'MiMic' programs at jsdo.it. jsdo.it is JavaScript sharing service.</li>\r
+</ul>\r
 \r
+<h2>Modules</h2>\r
+The following modules are included in this software.\r
+<ul>\r
+<li><a href="http://sourceforge.jp/projects/mimic/">MiMic SDK</a><br/>This software.</li>\r
+<li><a href="http://codemirror.net/">CodeMirror</a><br/>Javascript code editor.</li>\r
+<li><a href="https://github.com/adamdunkels/uip">uIP</a><br/>MiMicIP stack is created in reference to uIP 1.0.</li>\r
 </ul>\r
 \r
 <div class="footer">\r

diff --git a/projects/app.RemoteMCU/src/sketch.c b/projects/app.RemoteMCU/src/sketch.c
index 046df5f..d5ee073 100644 (file)
--- a/projects/app.RemoteMCU/src/sketch.c
+++ b/projects/app.RemoteMCU/src/sketch.c
@@ -78,7 +78,7 @@ void setup(void)
 void loop(void)\r
 {\r
        NyLPC_TcNetConfig_t c2;\r
-       NyLPC_cNetConfig_initialize(&c2);\r
+       NyLPC_cNetConfig_initialize(&c2,NyLPC_TBool_FALSE);\r
        NyLPC_cNet_start(&net,&c2);\r
        NyLPC_cHttpd_loop(&httpd.super);\r
        for(;;);\r

diff --git a/projects/example/sample.net.simplehttpd/src/fsdata.c b/projects/example/sample.net.simplehttpd/src/fsdata.c
index e5d7729..8813181 100644 (file)
--- a/projects/example/sample.net.simplehttpd/src/fsdata.c
+++ b/projects/example/sample.net.simplehttpd/src/fsdata.c
@@ -8,7 +8,7 @@ const struct NyLPC_TRomFileData file_cat_jpg={
 };\r
 const struct NyLPC_TRomFileData file_index_html={\r
 "index.html",\r
-242,\r
+2420,\r
 "text/html",\r
 "\x3C\x68\x74\x6D\x6C\x3E\x0D\x0A\x3C\x62\x6F\x64\x79\x3E\x0D\x0A\x3C\x68\x31\x3E\x54\x68\x69\x73\x20\x70\x61\x67\x65\x20\x69\x73\x20\x68\x6F\x73\x74\x65\x64\x20\x62\x79\x20\x4D\x69\x4D\x69\x63\x20\x68\x74\x74\x70\x64\x3C\x2F\x68\x31\x3E\x0D\x0A\x3C\x68\x72\x2F\x3E\x0D\x0A\x3C\x69\x6D\x67\x20\x73\x72\x63\x3D\x22\x2F\x72\x66\x2E\x61\x70\x69\x3F\x6C\x6F\x67\x6F\x2E\x70\x6E\x67\x22\x20\x2F\x3E\x0D\x0A\x3C\x62\x72\x2F\x3E\x0D\x0A\x3C\x62\x72\x2F\x3E\x0D\x0A\x3C\x64\x69\x76\x3E\x43\x6F\x70\x79\x72\x69\x67\x68\x74\x20\x28\x43\x29\x20\x32\x30\x31\x30\x2D\x32\x30\x31\x33\x20\x3C\x61\x20\x68\x72\x65\x66\x3D\x22\x68\x74\x74\x70\x3A\x2F\x2F\x6E\x79\x61\x74\x6C\x61\x2E\x6A\x70\x2F\x6D\x69\x6D\x69\x63\x2F\x77\x70\x2F\x22\x3E\x4D\x69\x6D\x69\x63\x20\x70\x72\x6F\x6A\x65\x63\x74\x3C\x2F\x61\x3E\x20\x41\x6C\x6C\x20\x52\x69\x67\x68\x74\x73\x20\x52\x65\x73\x65\x72\x76\x65\x64\x2E\x3C\x2F\x64\x69\x76\x3E\x0D\x0A\x3C\x2F\x62\x6F\x64\x79\x3E\x0D\x0A\x3C\x2F\x68\x74\x6D\x6C\x3E"\r
 };\r

diff --git a/projects/example/sample.romfsmod/src/sketch.c b/projects/example/sample.romfsmod/src/sketch.c
index 50c6294..779ebe5 100644 (file)
--- a/projects/example/sample.romfsmod/src/sketch.c
+++ b/projects/example/sample.romfsmod/src/sketch.c
@@ -8,6 +8,7 @@
 #include "NyLPC_http.h"\r
 #include "NyLPC_utils.h"\r
 #include <stdio.h>\r
+#include <ctype.h>\r
 \r
 \r
 NyLPC_TcNet_t net;\r
@@ -59,7 +60,7 @@ void handler(NyLPC_TcHttpdConnection_t* i_connection)
        }\r
        NyLPC_cModRomFiles_finalize(&mod.rom);\r
 \r
-\r
+       isalpha(1);\r
 \r
        //SHORT URL\r
        NyLPC_cModShortUrl_initialize(&mod.surl);\r

diff --git a/projects/example/test/.cproject b/projects/example/test/.cproject
index c474604..161e604 100644 (file)
--- a/projects/example/test/.cproject
+++ b/projects/example/test/.cproject
@@ -1339,11 +1339,8 @@
        <storageModule moduleId="com.crt.config">\r
                <projectStorage>&lt;?xml version="1.0" encoding="UTF-8"?&gt;&#13;\r
 &lt;TargetConfig&gt;&#13;\r
-&lt;Properties property_0="" property_1="" property_2="" property_3="NXP" property_4="LPC1768" property_count="5" version="1"/&gt;&#13;\r
-&lt;infoList vendor="NXP"&gt;&#13;\r
-&lt;info chip="LPC1768" match_id="0x00013f37,0x26013F37,0x26113F37" name="LPC1768" package="lpc17_lqfp100.xml"&gt;&#13;\r
-&lt;chip&gt;&#13;\r
-&lt;name&gt;LPC1768&lt;/name&gt;&#13;\r
+&lt;Properties property_0="" property_3="NXP" property_4="LPC1768" property_count="5" version="1"/&gt;&#13;\r
+&lt;infoList vendor="NXP"&gt;&lt;info chip="LPC1768" match_id="0x00013f37,0x26013F37,0x26113F37" name="LPC1768" package="lpc17_lqfp100.xml"&gt;&lt;chip&gt;&lt;name&gt;LPC1768&lt;/name&gt;&#13;\r
 &lt;family&gt;LPC17xx&lt;/family&gt;&#13;\r
 &lt;vendor&gt;NXP (formerly Philips)&lt;/vendor&gt;&#13;\r
 &lt;reset board="None" core="Real" sys="Real"/&gt;&#13;\r
@@ -1404,8 +1401,7 @@
 &lt;peripheralInstance derived_from="LPC17_CANCON" determined="infoFile" enable="SYSCTL.PCONP.PCCAN2&amp;amp;0x1" id="CANCON2" location="0x40048000"/&gt;&#13;\r
 &lt;peripheralInstance derived_from="LPC17_MCPWM" determined="infoFile" enable="SYSCTL.PCONP.PCMCPWM&amp;amp;0x1" id="MCPWM" location="0x400B8000"/&gt;&#13;\r
 &lt;/chip&gt;&#13;\r
-&lt;processor&gt;&#13;\r
-&lt;name gcc_name="cortex-m3"&gt;Cortex-M3&lt;/name&gt;&#13;\r
+&lt;processor&gt;&lt;name gcc_name="cortex-m3"&gt;Cortex-M3&lt;/name&gt;&#13;\r
 &lt;family&gt;Cortex-M&lt;/family&gt;&#13;\r
 &lt;/processor&gt;&#13;\r
 &lt;link href="nxp_lpcxxxx_peripheral.xme" show="embed" type="simple"/&gt;&#13;\r

diff --git a/projects/example/test/src/sketch.c b/projects/example/test/src/sketch.c
index 5adf06b..b0db8d1 100644 (file)
--- a/projects/example/test/src/sketch.c
+++ b/projects/example/test/src/sketch.c
@@ -3,6 +3,7 @@
  */\r
 #include "boot/sketch.h"\r
 #include "NyLPC_uipService.h"\r
+#include <string.h>\r
 //イーサネット用の初期化情報\r
 const struct NyLPC_TEthAddr ethaddr=NyLPC_TEthAddr_pack(0x00,0x01,0x02,0x03,0x04,0x05);\r
 const struct NyLPC_TIPv4Addr ipaddr=NyLPC_TIPv4Addr_pack(192,168,128,201);\r