Ethernetドライバの依存関係修正。

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

diff --git a/lib/.cproject b/lib/.cproject
index 77fd479..6348889 100644 (file)
--- a/lib/.cproject
+++ b/lib/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?fileVersion 4.0.0?>\r
-\r
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">\r
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">\r
        <storageModule moduleId="org.eclipse.cdt.core.settings">\r
                <cconfiguration id="com.crt.advproject.config.lib.debug.1662820404">\r
                        <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.lib.debug.1662820404" moduleId="org.eclipse.cdt.core.settings" name="Debug">\r
@@ -9,18 +7,18 @@
                                        <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"/>\r
+                                               <entry flags="RESOLVED" kind="libraryFile" name="NyLPCLib" srcPrefixMapping="" srcRootPath=""/>\r
                                        </externalSetting>\r
                                </externalSettings>\r
                                <extensions>\r
-                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
-                                       <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
                                        <extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>\r
+                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
+                                       <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
                                </extensions>\r
                        </storageModule>\r
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">\r
@@ -72,345 +70,6 @@
                        <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
@@ -418,18 +77,18 @@
                                        <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"/>\r
+                                               <entry flags="RESOLVED" kind="libraryFile" name="NyLPCLib" srcPrefixMapping="" srcRootPath=""/>\r
                                        </externalSetting>\r
                                </externalSettings>\r
                                <extensions>\r
-                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
-                                       <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
                                        <extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
                                        <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>\r
+                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
+                                       <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
                                </extensions>\r
                        </storageModule>\r
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">\r
@@ -477,345 +136,6 @@
                        <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
@@ -824,8 +144,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_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;Properties property_0="" property_2="LPC175x_6x_512.cfx" property_3="NXP" property_4="LPC1769" property_count="5" version="70002"/&gt;&#13;\r
+&lt;infoList vendor="NXP"&gt;&lt;info chip="LPC1769" flash_driver="LPC175x_6x_512.cfx" match_id="0x26113F37" name="LPC1769" package="lpc17_lqfp100.xml" stub="crt_emu_cm3_nxp"&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
 &lt;reset board="None" core="Real" sys="Real"/&gt;&#13;\r
@@ -884,6 +204,8 @@
 &lt;peripheralInstance derived_from="LPC17_CANWAKESLEEP" determined="infoFile" id="CANWAKESLEEP" location="0x400FC110"/&gt;&#13;\r
 &lt;peripheralInstance derived_from="LPC17_CANCON" determined="infoFile" enable="SYSCTL.PCONP.PCCAN1&amp;amp;0x1" id="CANCON1" location="0x40044000"/&gt;&#13;\r
 &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;peripheralInstance derived_from="LPC17_FMC" determined="infoFile" id="FMC" location="0x40084000"/&gt;&#13;\r
 &lt;/chip&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
@@ -1459,4 +781,5 @@
                </scannerConfigBuildInfo>\r
        </storageModule>\r
        <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>\r
+       <storageModule moduleId="refreshScope"/>\r
 </cproject>\r

diff --git a/lib/Debug/makefile b/lib/Debug/makefile
index 56c17c3..5fdf9ed 100644 (file)
--- a/lib/Debug/makefile
+++ b/lib/Debug/makefile
@@ -8,7 +8,6 @@ RM := rm -rf
 \r
 # All of the sources participating in the build are defined here\r
 -include sources.mk\r
--include subdir.mk\r
 -include src/utils/sha1/subdir.mk\r
 -include src/utils/subdir.mk\r
 -include src/uip/subdir.mk\r
@@ -27,10 +26,11 @@ RM := rm -rf
 -include src/http/subdir.mk\r
 -include src/flash/subdir.mk\r
 -include src/econetlite/subdir.mk\r
--include src/driver/uip/subdir.mk\r
 -include src/driver/irq/subdir.mk\r
 -include src/driver/flash/subdir.mk\r
+-include src/driver/ethernet/subdir.mk\r
 -include src/subdir.mk\r
+-include subdir.mk\r
 -include objects.mk\r
 \r
 ifneq ($(MAKECMDGOALS),clean)\r
@@ -50,7 +50,7 @@ all: libNyLPCLib.a
 libNyLPCLib.a: $(OBJS) $(USER_OBJS)\r
        @echo 'Building target: $@'\r
        @echo 'Invoking: MCU Archiver'\r
-       arm-none-eabi-ar -r "libNyLPCLib.a" $(OBJS) $(USER_OBJS) $(LIBS)\r
+       arm-none-eabi-ar -r  "libNyLPCLib.a" $(OBJS) $(USER_OBJS) $(LIBS)\r
        @echo 'Finished building target: $@'\r
        @echo ' '\r
        $(MAKE) --no-print-directory post-build\r

diff --git a/lib/Debug/sources.mk b/lib/Debug/sources.mk
index 36dbf18..484a3db 100644 (file)
--- a/lib/Debug/sources.mk
+++ b/lib/Debug/sources.mk
@@ -32,8 +32,8 @@ src/include/boot \
 src/http \
 src/flash \
 src/econetlite \
-src/driver/uip \
 src/driver/irq \
 src/driver/flash \
+src/driver/ethernet \
 src \
 \r

diff --git a/lib/src/driver/ethernet/EthDev.h b/lib/src/driver/ethernet/EthDev.h
index 99189bd..94bf6ec 100644 (file)
--- a/lib/src/driver/ethernet/EthDev.h
+++ b/lib/src/driver/ethernet/EthDev.h
@@ -26,13 +26,13 @@
 #ifndef _ETHDEV__H\r
 #define _ETHDEV__H\r
 #include "NyLPC_stdlib.h"\r
-#include "../../uip/NyLPC_uip.h"\r
 #include "IEthernetDevice.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif /* __cplusplus */\r
 \r
+#ifdef NONONONONO\r
 \r
 #ifndef NULL\r
  #define NULL   0\r
@@ -99,7 +99,7 @@ typedef struct {
    void          (*UnLock)     (void);\r
    EthDev_STATUS (*LinkChk)    (void);\r
 } EthDev_IOB;\r
-\r
+#endif\r
 \r
 const struct TiEthernetDevice* getEthernetDevicePnP(void);\r
 \r

diff --git a/lib/src/driver/ethernet/EthDev_LPC17xx.h b/lib/src/driver/ethernet/EthDev_LPC17xx.h
index 67663ff..7aaa73c 100644 (file)
--- a/lib/src/driver/ethernet/EthDev_LPC17xx.h
+++ b/lib/src/driver/ethernet/EthDev_LPC17xx.h
@@ -34,7 +34,6 @@
 \r
 #include <stdint.h>\r
 #include "IEthernetDevice.h"\r
-#include "../../uip/NyLPC_uip.h"\r
 #include "NyLPC_stdlib.h"\r
 \r
 #ifdef __cplusplus\r

diff --git a/lib/src/driver/ethernet/EthDev_protected.h b/lib/src/driver/ethernet/EthDev_protected.h
new file mode 100644 (file)
index 0000000..3cfe3d7
--- /dev/null
+++ b/lib/src/driver/ethernet/EthDev_protected.h
@@ -0,0 +1,13 @@
+/*\r
+ * EthDev_protected.h\r
+ *\r
+ *  Created on: 2014/05/19\r
+ *      Author: nyatla\r
+ */\r
+\r
+#ifndef ETHDEV_PROTECTED_H_\r
+#define ETHDEV_PROTECTED_H_\r
+\r
+\r
+\r
+#endif /* ETHDEV_PROTECTED_H_ */\r

diff --git a/lib/src/driver/ethernet/EtherDev_DP83848C.c b/lib/src/driver/ethernet/EtherDev_DP83848C.c
index e0df933..12fd8ae 100644 (file)
--- a/lib/src/driver/ethernet/EtherDev_DP83848C.c
+++ b/lib/src/driver/ethernet/EtherDev_DP83848C.c
@@ -146,7 +146,7 @@ static unsigned short prvReadPHY( unsigned int ucPhyReg, long *plStatus );
 \r
 \r
 \r
-static NyLPC_TBool start(const struct NyLPC_TEthAddr* i_eth_addr);\r
+static NyLPC_TBool start(const struct NyLPC_TEthAddr* i_eth_addr,NyLPC_TiEthernetDevice_onEvent i_handler,void* i_param);\r
 static void stop(void);\r
 \r
 /*-----------------------------------------------------------*/\r
@@ -163,7 +163,15 @@ const static struct TiEthernetDevice _interface=
     EthDev_LPC17xx_allocTxBuf,\r
     EthDev_LPC17xx_releaseTxBuf,\r
     EthDev_LPC17xx_sendTxEthFrame,\r
-    EthDev_LPC17xx_processTx};\r
+    EthDev_LPC17xx_processTx\r
+};\r
+\r
+static void* _event_param;\r
+NyLPC_TiEthernetDevice_onEvent _event_handler;\r
+\r
+/** EMAC ISRハンドラ*/\r
+static void emacIsrHandler(unsigned long i_status);\r
+\r
 /*\r
  * EthernetDeviceのファクトリー関数\r
  */\r
@@ -189,9 +197,12 @@ NyLPC_TBool EthDev_DP83848C_getInterface(
 }\r
 \r
 \r
-static NyLPC_TBool start(const struct NyLPC_TEthAddr* i_eth_addr)\r
+static NyLPC_TBool start(const struct NyLPC_TEthAddr* i_eth_addr,NyLPC_TiEthernetDevice_onEvent i_handler,void* i_param)\r
 {\r
-    /* Set the Ethernet MAC Address registers */\r
+       _event_handler=i_handler;\r
+       _event_param=i_param;\r
+       NyLPC_cIsr_setEnetISR(emacIsrHandler);\r
+       /* Set the Ethernet MAC Address registers */\r
     LPC_EMAC->SA0 = (((uint32_t)(i_eth_addr->addr[0])) << 8 ) | i_eth_addr->addr[1];\r
     LPC_EMAC->SA1 = (((uint32_t)(i_eth_addr->addr[2])) << 8 ) | i_eth_addr->addr[3];\r
     LPC_EMAC->SA2 = (((uint32_t)(i_eth_addr->addr[4])) << 8 ) | i_eth_addr->addr[5];\r
@@ -246,6 +257,8 @@ static void stop(void)
     NyLPC_cIsr_exitCritical();\r
        LPC_EMAC->Command &= ~( CR_RX_EN | CR_TX_EN );\r
        LPC_EMAC->MAC1 &= ~MAC1_REC_EN;\r
+       //ISR割り込み解除\r
+       NyLPC_cIsr_setEnetISR(NULL);\r
     return;\r
 }\r
 \r
@@ -471,4 +484,17 @@ static NyLPC_TBool prvSetupLinkStatus( void )
     return lReturn;\r
 }\r
 \r
-\r
+/**\r
+ * EMACからのハンドラ\r
+ */\r
+static void emacIsrHandler(unsigned long i_status)\r
+{\r
+       if( i_status & INT_RX_DONE )\r
+       {\r
+               _event_handler(_event_param,TiEthernetDevice_EVENT_ON_RX);\r
+       }\r
+       if( i_status & INT_TX_DONE )\r
+       {\r
+               _event_handler(_event_param,TiEthernetDevice_EVENT_ON_TX);\r
+       }\r
+}\r

diff --git a/lib/src/driver/ethernet/EtherDev_DP83848C.h b/lib/src/driver/ethernet/EtherDev_DP83848C.h
index ef0018f..9b7349f 100644 (file)
--- a/lib/src/driver/ethernet/EtherDev_DP83848C.h
+++ b/lib/src/driver/ethernet/EtherDev_DP83848C.h
@@ -8,7 +8,6 @@
 \r
 #include "EthDev_LPC17xx.h"\r
 #include "IEthernetDevice.h"\r
-#include "../../uip/NyLPC_uip.h"\r
 #include "NyLPC_stdlib.h"\r
 \r
 #ifdef __cplusplus\r

diff --git a/lib/src/driver/ethernet/EtherDev_LAN8720.c b/lib/src/driver/ethernet/EtherDev_LAN8720.c
index 0ca0b81..cd16580 100644 (file)
--- a/lib/src/driver/ethernet/EtherDev_LAN8720.c
+++ b/lib/src/driver/ethernet/EtherDev_LAN8720.c
@@ -57,7 +57,6 @@
  * http://nyatla.jp/mimic\r
  */\r
 \r
-\r
 #include "EtherDev_LAN8720_protected.h"\r
 #include "LPC17xx.h"\r
 #include "NyLPC_os.h"\r
@@ -133,11 +132,11 @@ static long prvWritePHY( long lPhyReg, long lValue );
 static unsigned short prvReadPHY( unsigned int ucPhyReg, NyLPC_TBool* o_status);\r
 \r
 \r
-\r
-\r
-static NyLPC_TBool start(const struct NyLPC_TEthAddr* i_eth_addr);\r
+static NyLPC_TBool start(const struct NyLPC_TEthAddr* i_eth_addr,NyLPC_TiEthernetDevice_onEvent i_handler,void* i_param);\r
 static void stop(void);\r
 \r
+/** EMAC ISRハンドラ*/\r
+static void emacIsrHandler(unsigned long i_status);\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -152,7 +151,11 @@ const static struct TiEthernetDevice _interface=
        EthDev_LPC17xx_allocTxBuf,\r
        EthDev_LPC17xx_releaseTxBuf,\r
        EthDev_LPC17xx_sendTxEthFrame,\r
-       EthDev_LPC17xx_processTx};\r
+       EthDev_LPC17xx_processTx\r
+};\r
+static void* _event_param;\r
+NyLPC_TiEthernetDevice_onEvent _event_handler;\r
+\r
 /*\r
  * EthernetDeviceのファクトリー関数。インターフェイスを生成できればtrue\r
  *\r
@@ -183,8 +186,13 @@ NyLPC_TBool EthDev_LAN8720_getInterface(
  * RXバッファ関連の定義\r
  ***********************************************************************/\r
 \r
-static NyLPC_TBool start(const struct NyLPC_TEthAddr* i_eth_addr)\r
+\r
+static NyLPC_TBool start(const struct NyLPC_TEthAddr* i_eth_addr,NyLPC_TiEthernetDevice_onEvent i_handler,void* i_param)\r
 {\r
+       //ISRw割り込み設定\r
+       NyLPC_cIsr_setEnetISR(emacIsrHandler);\r
+       _event_handler=i_handler;\r
+       _event_param=i_param;\r
        /* Set the Ethernet MAC Address registers */\r
        LPC_EMAC->SA0 = (((uint32_t)(i_eth_addr->addr[0])) << 8 ) | i_eth_addr->addr[1];\r
        LPC_EMAC->SA1 = (((uint32_t)(i_eth_addr->addr[2])) << 8 ) | i_eth_addr->addr[3];\r
@@ -238,7 +246,8 @@ static void stop(void)
        NyLPC_cIsr_exitCritical();\r
        LPC_EMAC->Command &= ~( CR_RX_EN | CR_TX_EN );\r
        LPC_EMAC->MAC1 &= ~MAC1_REC_EN;\r
-\r
+       //ISR割り込み解除\r
+       NyLPC_cIsr_setEnetISR(NULL);\r
 }\r
 \r
 \r
@@ -454,6 +463,23 @@ static long prvSetupLinkStatus( void )
        }\r
        return lReturn;\r
 }\r
+//--------------------------------------------------------------------------------\r
+// ISR\r
+//--------------------------------------------------------------------------------\r
 \r
+/**\r
+ * EMACからのハンドラ\r
+ */\r
+static void emacIsrHandler(unsigned long i_status)\r
+{\r
+       if( i_status & INT_RX_DONE )\r
+       {\r
+               _event_handler(_event_param,TiEthernetDevice_EVENT_ON_RX);\r
+       }\r
+       if( i_status & INT_TX_DONE )\r
+       {\r
+               _event_handler(_event_param,TiEthernetDevice_EVENT_ON_TX);\r
+       }\r
+}\r
 \r
 \r

diff --git a/lib/src/driver/ethernet/EtherDev_LAN8720.h b/lib/src/driver/ethernet/EtherDev_LAN8720.h
index 8509592..b26be79 100644 (file)
--- a/lib/src/driver/ethernet/EtherDev_LAN8720.h
+++ b/lib/src/driver/ethernet/EtherDev_LAN8720.h
@@ -7,7 +7,6 @@
 \r
 #include "EthDev_LPC17xx.h"\r
 #include "IEthernetDevice.h"\r
-#include "../../uip/NyLPC_uip.h"\r
 #include "NyLPC_stdlib.h"\r
 \r
 \r

diff --git a/lib/src/driver/ethernet/IEthernetDevice.h b/lib/src/driver/ethernet/IEthernetDevice.h
index 18d50e7..56b7f9c 100644 (file)
--- a/lib/src/driver/ethernet/IEthernetDevice.h
+++ b/lib/src/driver/ethernet/IEthernetDevice.h
@@ -6,15 +6,25 @@
  */\r
 #ifndef IEthernetDevice_h\r
 #define IEthernetDevice_h\r
-#include "../../uip/NyLPC_uip.h"\r
 #include "NyLPC_stdlib.h"\r
-//#include "../../uip/NyLPC_uip_ethernet.h"\r
-\r
+#include "NyLPC_uipService.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif /* __cplusplus */\r
 \r
+typedef struct TiEthernetDevice TiEthernetDevice_t;\r
+\r
+/**非同期イベントのメッセージタイプ*/\r
+typedef unsigned int TiEthernetDevice_EVENT;\r
+/**TXが到達した*/\r
+#define TiEthernetDevice_EVENT_ON_TX 1\r
+/**RXが到達した*/\r
+#define TiEthernetDevice_EVENT_ON_RX 2\r
+\r
+\r
+typedef void (*NyLPC_TiEthernetDevice_onEvent)(void* i_param,TiEthernetDevice_EVENT i_type);\r
+\r
 /**\r
  * 送信バッフメモリのヘッダ。\r
  * この構造体は、TXバッファメモリブロックのヘッダーです。\r
@@ -25,14 +35,16 @@ extern "C" {
  */\r
 struct NyLPC_TTxBufferHeader\r
 {\r
+       //メモリブロックの参照カウンタ。\r
        NyLPC_TInt8  ref;\r
        //送信用にロックしたかを示すフラグ\r
        NyLPC_TUInt8 is_lock;\r
-       //32ã\83\93ã\83\83ã\83\88å¢\83ç\95\8cã\81«å\90\88ã\82\8fã\81\9bã\82\8bã\81\9fã\82\81ã\81®ã\83\91ã\83\87ã\82£ã\83³ã\82°ã\81§ã\81\99ã\80\82\r
+       //32ビット境界に合わせるためのパディング。\r
        NyLPC_TUInt16 padding;\r
 };\r
 \r
 \r
+\r
 /**\r
  * 受信キューの先頭にあるデータを返す。\r
  * 関数は、受信キューのポインタを操作しない。続けて読み出したとしても、同じポインターを返す。\r
@@ -42,12 +54,16 @@ struct NyLPC_TTxBufferHeader
  * 成功した場合、受信データを格納したバッファポインタ。返却値は、nextRxEthFrameをコールするまで有効である。\r
  * 存在しない場合NULL。\r
  */\r
+#define NyLPC_iEthernetDevice_getRxEthFrame(i,p) (i)->getRxEthFrame(p)\r
 typedef void* (*NyLPC_TiEthernetDevice_getRxEthFrame)(unsigned short* o_len_of_data);\r
 \r
+\r
+\r
 /**\r
  * getRxEthFrameで得たメモリを破棄して、次のRXデータを準備する。\r
  * getRxEthFrameで返したメモリの内容の有効期間はここで終了するので注意すること。\r
  */\r
+#define NyLPC_iEthernetDevice_nextRxEthFrame(i) (i)->nextRxEthFrame()\r
 typedef void (*NyLPC_TiEthernetDevice_nextRxEthFrame)(void);\r
 \r
 \r
@@ -61,14 +77,19 @@ typedef void (*NyLPC_TiEthernetDevice_nextRxEthFrame)(void);
  * @return\r
  * 割り当てたメモリブロックのヘッダ。\r
  */\r
+#define NyLPC_iEthernetDevice_allocTxBuf(i,h,s) (i)->allocTxBuf((h),(s))\r
 typedef struct NyLPC_TTxBufferHeader* (*NyLPC_TiEthernetDevice_allocTxBuf)(NyLPC_TUInt16 i_hint,NyLPC_TUInt16* o_size);\r
 \r
 \r
 /**\r
  * alloc_TxBufで得た送信バッファを開放する。\r
+ * 関数は、メモリブロックの参照カウンタを1減算する。\r
  */\r
+#define NyLPC_iEthernetDevice_releaseTxBuf(i,b) (i)->releaseTxBuf(b)\r
 typedef void (*NyLPC_TiEthernetDevice_releaseTxBuf)(struct NyLPC_TTxBufferHeader* i_buf);\r
 \r
+\r
+\r
 /**\r
  * イーサネットパケット構造体i_bufの内容を送信する。\r
  * @param i_buf\r
@@ -78,23 +99,53 @@ typedef void (*NyLPC_TiEthernetDevice_releaseTxBuf)(struct NyLPC_TTxBufferHeader
  * @oaram i_size\r
  * i_bufの後ろに連結されているデータメモリの長さ\r
  */\r
+#define NyLPC_iEthernetDevice_sendTxEthFrame(i,b,s) (i)->sendTxEthFrame((b),(s))\r
 typedef void (*NyLPC_TiEthernetDevice_sendTxEthFrame)(struct NyLPC_TTxBufferHeader* i_buf,unsigned short i_size);\r
+\r
+\r
 /**\r
  * この関数は、送信キューの状態を進行させるタイミングを与える。\r
  * 外部関数が、送信キューにセットしたパケットの送信待ちをするときに呼び出す。\r
  */\r
+#define NyLPC_iEthernetDevice_processTx(i) (i)->processTx()\r
 typedef void (*NyLPC_TiEthernetDevice_processTx)(void);\r
 \r
-typedef NyLPC_TBool(*NyLPC_TiEthernetDevice_start)(const struct NyLPC_TEthAddr* i_eth_addr);\r
+\r
+\r
+/**\r
+ * この関数は、ドライバを開始します。\r
+ * @param i_eth_addr\r
+ * イーサネットアドレス\r
+ * @param i_handler\r
+ * 通知ハンドラ\r
+ * @param i_param\r
+ * 通知ハンドラに渡るパラメータ\r
+ */\r
+#define NyLPC_iEthernetDevice_start(i,a,h,p) (i)->start((a),(h),(p))\r
+typedef NyLPC_TBool(*NyLPC_TiEthernetDevice_start)(const struct NyLPC_TEthAddr* i_eth_addr,NyLPC_TiEthernetDevice_onEvent i_handler,void* i_param);\r
+\r
+\r
+/**\r
+ * この関数はドライバを停止します。\r
+ */\r
+#define NyLPC_iEthernetDevice_stop(i) (i)->stop()\r
 typedef void(*NyLPC_TiEthernetDevice_stop)(void);\r
 \r
+\r
 /**\r
- * イーサネットデバイスのアクセスインターフェイス構造体。\r
+ * デバイス名を返します。\r
+ */\r
+#define NyLPC_iEthernetDevice_getDevicName(i) ((i)->_device_name)\r
+\r
+/**\r
+ * イーサネットデバイスのアクセスインターフェイス\r
  * イーサネットデバイスの管理するメモリブロック、ペリフェラル制御のインタフェイスを提供する。\r
+ *\r
  */\r
 struct TiEthernetDevice\r
 {\r
-       const char* device_name;//pointer to device name.\r
+       /** NyLPC_iEthernetDevice_getDevicNameで返却する値*/\r
+       const char* _device_name;//pointer to device name.\r
        NyLPC_TiEthernetDevice_start start;\r
        NyLPC_TiEthernetDevice_stop stop;\r
        NyLPC_TiEthernetDevice_getRxEthFrame getRxEthFrame;\r
@@ -105,6 +156,9 @@ struct TiEthernetDevice
        NyLPC_TiEthernetDevice_processTx processTx;\r
 };\r
 \r
+\r
+\r
+\r
 #ifdef __cplusplus\r
 }\r
 #endif /* __cplusplus */\r

diff --git a/lib/src/driver/ethernet/uip-conf.h b/lib/src/driver/ethernet/uip-conf.h
deleted file mode 100644 (file)
index 796eb2b..0000000
--- a/lib/src/driver/ethernet/uip-conf.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**\r
- * \addtogroup uipopt\r
- * @{\r
- */\r
-\r
-/**\r
- * \name Project-specific configuration options\r
- * @{\r
- *\r
- * uIP has a number of configuration options that can be overridden\r
- * for each project. These are kept in a project-specific uip-conf.h\r
- * file and all configuration names have the prefix UIP_CONF.\r
- */\r
-\r
-/*\r
- * Copyright (c) 2006, Swedish Institute of Computer Science.\r
- * All rights reserved.\r
- *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions\r
- * are met:\r
- * 1. Redistributions of source code must retain the above copyright\r
- *    notice, this list of conditions and the following disclaimer.\r
- * 2. Redistributions in binary form must reproduce the above copyright\r
- *    notice, this list of conditions and the following disclaimer in the\r
- *    documentation and/or other materials provided with the distribution.\r
- * 3. Neither the name of the Institute nor the names of its contributors\r
- *    may be used to endorse or promote products derived from this software\r
- *    without specific prior written permission.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND\r
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE\r
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\r
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\r
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\r
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\r
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\r
- * SUCH DAMAGE.\r
- *\r
- * This file is part of the uIP TCP/IP stack\r
- *\r
- * $Id: uip-conf.h,v 1.6 2006/06/12 08:00:31 adam Exp $\r
- */\r
-\r
-/**\r
- * \file\r
- *         An example uIP configuration file\r
- * \author\r
- *         Adam Dunkels <adam@sics.se>\r
- */\r
-/*\r
- * Modified for MiMic by R.Iizuka. 2011.08.27\r
- * http://nyatla.jp/mimic\r
- */\r
-\r
-#ifndef __UIP_CONF_H__\r
-#define __UIP_CONF_H__\r
-\r
-#include <stdint.h>\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif /* __cplusplus */\r
-\r
-/**\r
- * 8 bit datatype\r
- *\r
- * This typedef defines the 8-bit type used throughout uIP.\r
- *\r
- * \hideinitializer\r
- */\r
-typedef uint8_t u8_t;\r
-\r
-/**\r
- * 16 bit datatype\r
- *\r
- * This typedef defines the 16-bit type used throughout uIP.\r
- *\r
- * \hideinitializer\r
- */\r
-typedef uint16_t u16_t;\r
-\r
-\r
-typedef uint32_t u32_t;\r
-/**\r
- * Statistics datatype\r
- *\r
- * This typedef defines the dataype used for keeping statistics in\r
- * uIP.\r
- *\r
- * \hideinitializer\r
- */\r
-typedef unsigned short uip_stats_t;\r
-\r
-\r
-\r
-\r
-\r
-/* Here we include the header file for the application(s) we use in our project. */\r
-extern void NyLPC_cUipService_tcpAppProc(void);\r
-#define UIP_APPCALL NyLPC_cUipService_tcpAppProc\r
-\r
-#endif /* __UIP_CONF_H__ */\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif /* __cplusplus */\r

diff --git a/lib/src/include/NyLPC_uipService.h b/lib/src/include/NyLPC_uipService.h
index f24e671..a16744d 100644 (file)
--- a/lib/src/include/NyLPC_uipService.h
+++ b/lib/src/include/NyLPC_uipService.h
@@ -35,6 +35,7 @@
 #include "../uip/NyLPC_cTcpSocket.h"\r
 #include "../uip/NyLPC_cUdpSocket.h"\r
 #include "../uip/NyLPC_cUipService.h"\r
+#include "../uip/NyLPC_uip_ethernet.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/lib/src/uip/NyLPC_cUipService.c b/lib/src/uip/NyLPC_cUipService.c
index 0b47369..7cee813 100644 (file)
--- a/lib/src/uip/NyLPC_cUipService.c
+++ b/lib/src/uip/NyLPC_cUipService.c
@@ -62,25 +62,7 @@
 \r
 \r
 \r
-/****************************************************\r
- * UipServiceに関する宣言:タスクメッセージ\r
- ***************************************************/\r
-/*\r
-#define TTaskMsg_NOP 0\r
-#define TTaskMsg_START 1\r
-#define TTaskMsg_STOP 2\r
-*/\r
-/**\r
- * サービスの起動メッセージです。\r
- *//*\r
-struct TTaskMsg{\r
-       NyLPC_TUInt16 msg;\r
-       union{\r
-               struct{\r
-                       const NyLPC_TcIPv4Config_t* ref_config;\r
-               }start;\r
-       };\r
-};*/\r
+\r
 \r
 /****************************************************\r
  * UipServiceに関する宣言:その他\r
@@ -117,6 +99,9 @@ static NyLPC_TcUipService_t _service_instance;
  */\r
 static int uipTask(void *pvParameters);\r
 \r
+/** イーサネットドライバからのハンドラ*/\r
+static void ethernet_handler(void* i_param,TiEthernetDevice_EVENT i_type);\r
+\r
 //--------------------------------------------------------------\r
 \r
 \r
@@ -124,7 +109,6 @@ static NyLPC_TBool sendIPv4Tx(struct NyLPC_TTxBufferHeader* i_eth_buf);
 static void copyAndSendIPv4Tx(const struct TEthPacket* i_buf);\r
 //static void sendArpReqest(const struct TEthPacket* i_eth_packet);\r
 static void sendRawEthFrame(void* i_buf,NyLPC_TUInt16 i_len);\r
-static void emacIsrHandler(unsigned long i_status);\r
 \r
 /**メッセージなし*/\r
 #define TTaskMessage_MSG_NULL    0x0000\r
@@ -143,8 +127,6 @@ NyLPC_TBool NyLPC_cUipService_initialize(void)
        NyLPC_Assert(!NyLPC_TcUipService_isInitService());\r
        //IP処理部分の初期化\r
        NyLPC_cIPv4_initialize(&(inst->_tcpv4));\r
-       //EMACからの割込処理\r
-       NyLPC_cIsr_setEnetISR(emacIsrHandler);\r
        //EMAC割込セマフォ\r
        NyLPC_cSemaphore_initialize(&inst->_emac_semapho);\r
 \r
@@ -219,7 +201,7 @@ void NyLPC_cUipService_stop(void)
 const char* NyLPC_cUipService_refDeviceName(void)\r
 {\r
        NyLPC_TcUipService_t* inst=&_service_instance;\r
-       return NyLPC_cUipService_isRun()?inst->_ethif->device_name:NULL;\r
+       return NyLPC_cUipService_isRun()?NyLPC_iEthernetDevice_getDevicName(inst->_ethif):NULL;\r
 }\r
 const NyLPC_TcIPv4Config_t* NyLPC_cUipService_refCurrentConfig(void)\r
 {\r
@@ -232,23 +214,6 @@ const NyLPC_TcIPv4Config_t* NyLPC_cUipService_refCurrentConfig(void)
  *\r
  *********************************************************************/\r
 \r
-/**\r
- * EMACからのハンドラ\r
- */\r
-static void emacIsrHandler(unsigned long i_status)\r
-{\r
-       NyLPC_TcUipService_t* inst=&_service_instance;\r
-\r
-       if( i_status & INT_RX_DONE )\r
-       {\r
-               //受信系のセマフォブロックの解除\r
-               NyLPC_cSemaphore_giveFromISR(&inst->_emac_semapho);\r
-       }\r
-       if( i_status & INT_TX_DONE )\r
-       {\r
-       }\r
-}\r
-\r
 \r
 //PERIODIC rate\r
 #define PERIODIC_TIMER (1*200)\r
@@ -270,7 +235,7 @@ static NyLPC_TBool updateTaskStatus()
                if(NyLPC_TUInt16_isBitOn(inst->_status,NyLPC_TcUipService_ORDER_STOP))\r
                {\r
                        //停止操作\r
-                       inst->_ethif->stop();\r
+                       NyLPC_iEthernetDevice_stop(inst->_ethif);\r
                        NyLPC_cIPv4_stop(&(inst->_tcpv4));\r
                        NyLPC_cIPv4IComp_finalize(&(inst->_icomp));\r
                        NyLPC_cIPv4Arp_finalize(&(inst->_arp));\r
@@ -295,7 +260,7 @@ static NyLPC_TBool updateTaskStatus()
                        inst->stx.h.is_lock=NyLPC_TUInt8_FALSE;\r
                        inst->stx.h.ref=0;\r
                        //EtherNETデバイス初期化\r
-                       while(!inst->_ethif->start(&(inst->_ref_config->eth_mac)));\r
+                       while(!NyLPC_iEthernetDevice_start(inst->_ethif,&(inst->_ref_config->eth_mac),ethernet_handler,inst));\r
                        NyLPC_TUInt16_setBit(inst->_status,NyLPC_TcUipService_STATUSBIT_IS_RUNNING);\r
                        NyLPC_TUInt16_unsetBit(inst->_status,NyLPC_TcUipService_ORDER_START);\r
                        return NyLPC_TBool_TRUE;\r
@@ -326,7 +291,7 @@ static int uipTask(void *pvParameters)
                //イーサネットフレームの取得\r
                //Ethernet Device Lock(ARPを含む)\r
                NyLPC_cMutex_lock(&(inst->_mutex));\r
-               ethbuf= (struct TEthPacket*)inst->_ethif->getRxEthFrame(&rx_len);\r
+               ethbuf= (struct TEthPacket*)NyLPC_iEthernetDevice_getRxEthFrame(inst->_ethif,&rx_len);\r
                tx_len=0;\r
                while(ethbuf != NULL){\r
                        if(rx_len>0)\r
@@ -370,9 +335,9 @@ static int uipTask(void *pvParameters)
                                }\r
                        }\r
                        //受信キューを進行。\r
-                       inst->_ethif->nextRxEthFrame();\r
+                       NyLPC_iEthernetDevice_nextRxEthFrame(inst->_ethif);\r
                        //受信処理\r
-                       ethbuf= (struct TEthPacket*)inst->_ethif->getRxEthFrame(&rx_len);\r
+                       ethbuf= (struct TEthPacket*)NyLPC_iEthernetDevice_getRxEthFrame(inst->_ethif,&rx_len);\r
                }\r
                //データが無い。\r
                if(NyLPC_cStopwatch_isExpired(&(inst->_arp_sw))){\r
@@ -396,6 +361,21 @@ static int uipTask(void *pvParameters)
 \r
 \r
 /**\r
+ * イーサネットドライバからのハンドラ\r
+ */\r
+static void ethernet_handler(void* i_param,TiEthernetDevice_EVENT i_type)\r
+{\r
+       switch(i_type){\r
+       case TiEthernetDevice_EVENT_ON_RX:\r
+               //受信系のセマフォブロックの解除\r
+               NyLPC_cSemaphore_giveFromISR(&(((NyLPC_TcUipService_t*)i_param)->_emac_semapho));\r
+               break;\r
+       default:\r
+               break;\r
+       }\r
+}\r
+\r
+/**\r
  * IPv4パケットのpeerIPを問い合わせるARPパケットを送信します。\r
  */\r
 static void sendArpReqest(const struct NyLPC_TIPv4Addr* i_addr)\r
@@ -405,14 +385,14 @@ static void sendArpReqest(const struct NyLPC_TIPv4Addr* i_addr)
        struct TEthPacket* ethbuf;\r
        //ACK送信用の自己バッファが空くまで待つ\r
        while(inst->stx.h.is_lock){\r
-               inst->_ethif->processTx();\r
+               NyLPC_iEthernetDevice_processTx(inst->_ethif);\r
        }\r
        //ARPパケットを作る。\r
        ethbuf=(struct TEthPacket*)(inst->stx.buf);\r
        NyLPC_TArpHeader_setArpRequest(&(ethbuf->data.arp),inst->_ref_config->ip_addr,&(inst->_ref_config->eth_mac),i_addr);\r
        tx_len=NyLPC_TEthernetIIHeader_setArpTx(&(ethbuf->header),&(inst->_ref_config->eth_mac));\r
        //送信\r
-       inst->_ethif->sendTxEthFrame(&(inst->stx.h),tx_len);\r
+       NyLPC_iEthernetDevice_sendTxEthFrame(inst->_ethif,&(inst->stx.h),tx_len);\r
 }\r
 \r
 \r
@@ -484,7 +464,7 @@ void* NyLPC_cUipService_allocTxBuf(NyLPC_TUInt16 i_hint,NyLPC_TUInt16* o_size)
        struct NyLPC_TTxBufferHeader* ethbuf;\r
        //排他処理をして、メモリを取得する。\r
        NyLPC_cMutex_lock(&(inst->_mutex));\r
-       ethbuf=(struct NyLPC_TTxBufferHeader*)inst->_ethif->allocTxBuf(i_hint+sizeof(struct NyLPC_TEthernetIIHeader),o_size);\r
+       ethbuf=(struct NyLPC_TTxBufferHeader*)NyLPC_iEthernetDevice_allocTxBuf(inst->_ethif,i_hint+sizeof(struct NyLPC_TEthernetIIHeader),o_size);\r
        NyLPC_cMutex_unlock(&(inst->_mutex));\r
        if(ethbuf==NULL){\r
                return NULL;\r
@@ -502,7 +482,7 @@ void* NyLPC_cUipService_releaseTxBuf(void* i_buf)
        NyLPC_TcUipService_t* inst=_NyLPC_TcUipService_inst;\r
        NyLPC_cMutex_lock(&(inst->_mutex));\r
        //ペイロードの位置から、メモリブロックを再生。\r
-       inst->_ethif->releaseTxBuf(((struct NyLPC_TTxBufferHeader*)(((struct NyLPC_TEthernetIIHeader*)i_buf)-1))-1);\r
+       NyLPC_iEthernetDevice_releaseTxBuf(inst->_ethif,((struct NyLPC_TTxBufferHeader*)(((struct NyLPC_TEthernetIIHeader*)i_buf)-1))-1);\r
        NyLPC_cMutex_unlock(&(inst->_mutex));\r
        return NULL;\r
 }\r
@@ -528,7 +508,7 @@ static void copyAndSendIPv4Tx(const struct TEthPacket* i_buf)
        NyLPC_TUInt16 s;\r
        //ACK送信用の自己バッファが空くまで待つ\r
        while(inst->stx.h.is_lock){\r
-               inst->_ethif->processTx();\r
+               NyLPC_iEthernetDevice_processTx(inst->_ethif);\r
        }\r
        //送信する。\r
        s=NyLPC_htons(i_buf->data.ipv4.len16)+sizeof(struct NyLPC_TEthernetIIHeader);\r
@@ -557,7 +537,7 @@ static void sendRawEthFrame(void* i_buf,NyLPC_TUInt16 i_len)
 \r
        //ACK送信用の自己バッファが空くまで待つ\r
        while(inst->stx.h.is_lock){\r
-               inst->_ethif->processTx();\r
+               NyLPC_iEthernetDevice_processTx(inst->_ethif);\r
        }\r
        //64バイトを超えるとかありえない。\r
        if(i_len+sizeof(struct NyLPC_TEthernetIIHeader)>NyLPC_TcUipService_SIZE_OF_REPLY_BUF){\r
@@ -565,7 +545,7 @@ static void sendRawEthFrame(void* i_buf,NyLPC_TUInt16 i_len)
        }\r
        //送信する。\r
        memcpy(inst->stx.buf,i_buf,i_len);\r
-       inst->_ethif->sendTxEthFrame(&(inst->stx.h),i_len);\r
+       NyLPC_iEthernetDevice_sendTxEthFrame(inst->_ethif,&(inst->stx.h),i_len);\r
        return;\r
 }\r
 \r
@@ -619,7 +599,7 @@ static NyLPC_TBool sendIPv4Tx(struct NyLPC_TTxBufferHeader* i_eth_buf)
        }\r
        //変換可能なら、イーサネットヘッダを更新して、送信処理へ。\r
        tx_len=NyLPC_TEthernetIIHeader_setIPv4Tx(&(ethbuf->header),&(inst->_ref_config->eth_mac),eth_dest);\r
-       inst->_ethif->sendTxEthFrame(i_eth_buf,tx_len);\r
+       NyLPC_iEthernetDevice_sendTxEthFrame(inst->_ethif,i_eth_buf,tx_len);\r
        return NyLPC_TBool_TRUE;\r
 }\r
 \r

diff --git a/lib/src/uip/NyLPC_cUipService_protected.h b/lib/src/uip/NyLPC_cUipService_protected.h
index 119b757..aa54c4f 100644 (file)
--- a/lib/src/uip/NyLPC_cUipService_protected.h
+++ b/lib/src/uip/NyLPC_cUipService_protected.h
@@ -28,7 +28,6 @@
 #define NyLPC_uipService_protected_H\r
 #include "NyLPC_cUipService.h"\r
 #include "../driver/ethernet/EthDev.h"\r
-#include "../driver/ethernet/EthDev_LPC17xx.h"\r
 \r
 /**********************************************************************\r
  *\r

diff --git a/lib/src/uip/NyLPC_uip_ethernet.c b/lib/src/uip/NyLPC_uip_ethernet.c
index d6aca30..2ce8de3 100644 (file)
--- a/lib/src/uip/NyLPC_uip_ethernet.c
+++ b/lib/src/uip/NyLPC_uip_ethernet.c
@@ -53,7 +53,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
  */\r
 #include "NyLPC_uip_ethernet.h"\r
-#include "NyLPC_uip.h"\r
 \r
 const struct NyLPC_TEthAddr NyLPC_TEthAddr_BROADCAST = { { 0xff, 0xff, 0xff,0xff, 0xff, 0xff } };\r
 \r