--- a/CanFestival-3.vc8.vcproj Fri Apr 06 16:49:28 2007 +0200
+++ b/CanFestival-3.vc8.vcproj Sat Apr 07 09:49:05 2007 +0200
@@ -1,532 +1,520 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8,00"
- Name="CanFestival-3"
- ProjectGUID="{50EF2507-9B87-4525-8B19-80EB42E67079}"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="./configure.win32.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="./include;./include/win32"
- PreprocessorDefinitions="WIN32;_DEBUG;_DEBUG;DEBUG_WAR_CONSOLE_ON;DEBUG_ERR_CONSOLE_ON;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- ProgramDataBaseFileName="$(IntDir)/CanFestival-3.pdb"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- ModuleDefinitionFile="./src/win32/CanFestival-3.def"
- GenerateDebugInformation="true"
- EnableCOMDATFolding="1"
- OptimizeForWindows98="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="./configure.win32.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="./include;./include/win32"
- PreprocessorDefinitions="WIN32;NDEBUG"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- ModuleDefinitionFile="./src/win32/CanFestival-3.def"
- OptimizeForWindows98="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release UNICODE|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="./configure.win32.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="./include;./include/win32"
- PreprocessorDefinitions="WIN32;NDEBUG"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- ModuleDefinitionFile="./src/win32/CanFestival-3.def"
- OptimizeForWindows98="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug UNICODE|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="./configure.win32.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="./include;./include/win32"
- PreprocessorDefinitions="WIN32;UNICODE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- ProgramDataBaseFileName="$(IntDir)/CanFestival-3.pdb"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- ModuleDefinitionFile="./src/win32/CanFestival-3.def"
- GenerateDebugInformation="true"
- EnableCOMDATFolding="1"
- OptimizeForWindows98="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\src\led.c"
- >
- </File>
- <File
- RelativePath=".\src\lifegrd.c"
- >
- </File>
- <File
- RelativePath=".\src\lss.c"
- >
- </File>
- <File
- RelativePath=".\src\nmtMaster.c"
- >
- </File>
- <File
- RelativePath=".\src\nmtSlave.c"
- >
- </File>
- <File
- RelativePath=".\src\nvram.c"
- >
- </File>
- <File
- RelativePath=".\src\objacces.c"
- >
- </File>
- <File
- RelativePath=".\src\pdo.c"
- >
- </File>
- <File
- RelativePath=".\src\sdo.c"
- >
- </File>
- <File
- RelativePath=".\src\states.c"
- >
- </File>
- <File
- RelativePath=".\src\sync.c"
- >
- </File>
- <File
- RelativePath=".\src\timer.c"
- >
- </File>
- <Filter
- Name="win32"
- >
- <File
- RelativePath=".\drivers\win32\drivers_win32.cpp"
- >
- </File>
- <File
- RelativePath=".\drivers\win32\timers_win32.cpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\include\applicfg.h"
- >
- </File>
- <File
- RelativePath=".\include\can.h"
- >
- </File>
- <File
- RelativePath=".\include\can_driver.h"
- >
- </File>
- <File
- RelativePath=".\include\config.h"
- >
- </File>
- <File
- RelativePath=".\include\data.h"
- >
- </File>
- <File
- RelativePath=".\include\def.h"
- >
- </File>
- <File
- RelativePath=".\include\led.h"
- >
- </File>
- <File
- RelativePath=".\include\led_driver.h"
- >
- </File>
- <File
- RelativePath=".\include\lifegrd.h"
- >
- </File>
- <File
- RelativePath=".\include\lss.h"
- >
- </File>
- <File
- RelativePath=".\include\lss_driver.h"
- >
- </File>
- <File
- RelativePath=".\include\nmtMaster.h"
- >
- </File>
- <File
- RelativePath=".\include\nmtSlave.h"
- >
- </File>
- <File
- RelativePath=".\include\nvram.h"
- >
- </File>
- <File
- RelativePath=".\include\nvram_driver.h"
- >
- </File>
- <File
- RelativePath=".\include\objacces.h"
- >
- </File>
- <File
- RelativePath=".\include\objdictdef.h"
- >
- </File>
- <File
- RelativePath=".\include\pdo.h"
- >
- </File>
- <File
- RelativePath=".\include\sdo.h"
- >
- </File>
- <File
- RelativePath=".\include\states.h"
- >
- </File>
- <File
- RelativePath=".\include\sync.h"
- >
- </File>
- <File
- RelativePath=".\include\timer.h"
- >
- </File>
- <File
- RelativePath=".\include\timers_driver.h"
- >
- </File>
- <Filter
- Name="win32"
- >
- <File
- RelativePath=".\include\win32\applicfg.h"
- >
- </File>
- <File
- RelativePath=".\include\win32\canfestival.h"
- >
- </File>
- <File
- RelativePath=".\include\win32\timerscfg.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <File
- RelativePath=".\src\win32\CanFestival-3.def"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug UNICODE|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8,00"
+ Name="CanFestival-3"
+ ProjectGUID="{50EF2507-9B87-4525-8B19-80EB42E67079}"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="./configure.win32.bat"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="./include;./include/win32"
+ PreprocessorDefinitions="WIN32;_DEBUG;_DEBUG;DEBUG_WAR_CONSOLE_ON;DEBUG_ERR_CONSOLE_ON;_CRT_SECURE_NO_DEPRECATE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(IntDir)/CanFestival-3.pdb"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="./src/win32/CanFestival-3.def"
+ GenerateDebugInformation="true"
+ EnableCOMDATFolding="1"
+ OptimizeForWindows98="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine=""
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="./include;./include/win32"
+ PreprocessorDefinitions="WIN32;NDEBUG"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="./src/win32/CanFestival-3.def"
+ OptimizeForWindows98="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release UNICODE|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="./configure.win32.bat"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="./include;./include/win32"
+ PreprocessorDefinitions="WIN32;NDEBUG"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="./src/win32/CanFestival-3.def"
+ OptimizeForWindows98="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug UNICODE|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="./configure.win32.bat"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="./include;./include/win32"
+ PreprocessorDefinitions="WIN32;UNICODE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(IntDir)/CanFestival-3.pdb"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="./src/win32/CanFestival-3.def"
+ GenerateDebugInformation="true"
+ EnableCOMDATFolding="1"
+ OptimizeForWindows98="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\src\lifegrd.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\nmtMaster.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\nmtSlave.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\objacces.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\pdo.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\sdo.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\states.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\sync.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\timer.c"
+ >
+ </File>
+ <Filter
+ Name="win32"
+ >
+ <File
+ RelativePath=".\drivers\win32\drivers_win32.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\drivers\win32\timers_win32.cpp"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\include\applicfg.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\can.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\can_driver.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\config.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\data.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\def.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\led.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\led_driver.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\lifegrd.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\lss.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\lss_driver.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\nmtMaster.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\nmtSlave.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\nvram.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\nvram_driver.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\objacces.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\objdictdef.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\pdo.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\sdo.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\states.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\sync.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\timer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\timers_driver.h"
+ >
+ </File>
+ <Filter
+ Name="win32"
+ >
+ <File
+ RelativePath=".\include\win32\applicfg.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\win32\canfestival.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\win32\timerscfg.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <File
+ RelativePath=".\src\win32\CanFestival-3.def"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug UNICODE|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
--- a/drivers/win32/drivers_win32.cpp Fri Apr 06 16:49:28 2007 +0200
+++ b/drivers/win32/drivers_win32.cpp Sat Apr 07 09:49:05 2007 +0200
@@ -34,8 +34,6 @@
#include "canfestival.h"
#include "timer.h"
-#include "nvram_driver.h"
-#include "lss_driver.h"
#include "timers_driver.h"
};
@@ -44,15 +42,6 @@
typedef void* (*CANOPEN_DRIVER_PROC)(s_BOARD *board);
typedef int (*CANCLOSE_DRIVER_PROC)(void* inst);
-typedef int (*NVRAM_OPEN_PROC)(void);
-typedef void (*NVRAM_CLOSE_PROC)(void);
-typedef char (*NVRAM_WRITE_PROC)(int type, int access_attr, void *data);
-typedef char (*NVRAM_READ_PROC)(int type, int access_attr, void *data);
-
-typedef void (*LED_SET_REDGREEN_PROC)(CO_Data *d, unsigned char bits);
-
-typedef UNS8 (*BAUDRATE_VALID_PROC)(UNS32 table_index);
-typedef void (*BAUDRATE_SET_PROC)(UNS8 table_index);
class driver_procs
{
@@ -70,17 +59,6 @@
CANOPEN_DRIVER_PROC m_canOpen;
CANCLOSE_DRIVER_PROC m_canClose;
- // nvram driver
- NVRAM_OPEN_PROC m_nvram_open;
- NVRAM_CLOSE_PROC m_nvram_close;
- NVRAM_WRITE_PROC m_nvram_write;
- NVRAM_READ_PROC m_nvram_read;
- // led driver
- LED_SET_REDGREEN_PROC m_led_set_redgreen;
- // lss driver
- BAUDRATE_VALID_PROC m_baudrate_valid;
- BAUDRATE_SET_PROC m_baudrate_set;
-
// driver module habndle
HMODULE m_driver_handle;
};
@@ -89,13 +67,6 @@
m_canSend(0),
m_canOpen(0),
m_canClose(0),
- m_nvram_open(0),
- m_nvram_close(0),
- m_nvram_write(0),
- m_nvram_read(0),
- m_led_set_redgreen(),
- m_baudrate_valid(0),
- m_baudrate_set(0),
m_driver_handle(0)
{}
@@ -132,17 +103,6 @@
m_canSend = (CANSEND_DRIVER_PROC)::GetProcAddress(m_driver_handle, myTEXT("canSend_driver"));
m_canOpen = (CANOPEN_DRIVER_PROC)::GetProcAddress(m_driver_handle, myTEXT("canOpen_driver"));
m_canClose = (CANCLOSE_DRIVER_PROC)::GetProcAddress(m_driver_handle, myTEXT("canClose_driver"));
-
- m_nvram_open = (NVRAM_OPEN_PROC)::GetProcAddress(m_driver_handle, myTEXT("nvram_open_driver"));
- m_nvram_close = (NVRAM_CLOSE_PROC)::GetProcAddress(m_driver_handle, myTEXT("nvram_close_driver"));
- m_nvram_write = (NVRAM_WRITE_PROC)::GetProcAddress(m_driver_handle, myTEXT("nvram_write_driver"));
- m_nvram_read = (NVRAM_READ_PROC)::GetProcAddress(m_driver_handle, myTEXT("nvram_read_driver"));
-
- m_led_set_redgreen = (LED_SET_REDGREEN_PROC)::GetProcAddress(m_driver_handle, myTEXT("led_set_redgreen_driver"));
-
- m_baudrate_valid = (BAUDRATE_VALID_PROC)::GetProcAddress(m_driver_handle, myTEXT("baudrate_valid_driver"));
- m_baudrate_set = (BAUDRATE_SET_PROC)::GetProcAddress(m_driver_handle, myTEXT("baudrate_set_driver"));
-
return can_driver_valid()?m_driver_handle:NULL;
}
@@ -233,68 +193,21 @@
/***************************************************************************/
int canClose(CO_Data * d)
{
- if (fd0 != NULL && s_driver_procs.m_canClose != NULL)
- {
- EnterMutex();
- driver_data* data = (driver_data*)d->canHandle;
- d->canHandle = NULL;
- LeaveMutex();
- data->continue_receive_thread = false;
- WaitReceiveTaskEnd(&data->receive_thread);
- (*s_driver_procs.m_canClose)(data->inst);
- delete data;
- return 0;
+ if (s_driver_procs.m_canClose != NULL)
+ {
+ driver_data* data;
+ EnterMutex();
+ if(d->canHandle != NULL){
+ data = (driver_data*)d->canHandle;
+ d->canHandle = NULL;
+ data->continue_receive_thread = false;}
+ LeaveMutex();
+ WaitReceiveTaskEnd(&data->receive_thread);
+ (*s_driver_procs.m_canClose)(data->inst);
+ delete data;
+ return 0;
}
return 0;
}
-/***************************************************************************/
-int nvram_open(void)
- {
- if (s_driver_procs.m_nvram_read != NULL)
- return (*s_driver_procs.m_nvram_open)();
- return -1;
- }
-
-void nvram_close(void)
- {
- if (s_driver_procs.m_nvram_close != NULL)
- (*s_driver_procs.m_nvram_close)();
- }
-
-char nvram_write(int type, int access_attr, void *data)
- {
- if (s_driver_procs.m_nvram_write != NULL)
- return (*s_driver_procs.m_nvram_write)(type, access_attr, data);
- return 0;
- }
-
-char nvram_read(int type, int access_attr, void *data)
- {
- if (s_driver_procs.m_nvram_read != NULL)
- return (*s_driver_procs.m_nvram_read)(type, access_attr, data);
- return 0;
- }
-
-/***************************************************************************/
-
-void led_set_redgreen(CO_Data *d, unsigned char bits)
- {
- if (s_driver_procs.m_led_set_redgreen != NULL)
- (*s_driver_procs.m_led_set_redgreen)(d, bits);
- }
-
-/***************************************************************************/
-
-UNS8 baudrate_valid(UNS32 table_index)
- {
- if (s_driver_procs.m_baudrate_valid != NULL)
- return (*s_driver_procs.m_baudrate_valid)(table_index);
- return 0;
- }
-
-void baudrate_set(UNS8 table_index)
- {
- if (s_driver_procs.m_baudrate_set != NULL)
- (*s_driver_procs.m_baudrate_set)(table_index);
- }
+
--- a/include/states.h Fri Apr 06 16:49:28 2007 +0200
+++ b/include/states.h Sat Apr 07 09:49:05 2007 +0200
@@ -63,10 +63,10 @@
typedef void (*operational_t)(void);
typedef void (*stopped_t)(void);
-void _initialisation();
-void _preOperational();
-void _operational();
-void _stopped();
+void _initialisation(void);
+void _preOperational(void);
+void _operational(void);
+void _stopped(void);
#include "data.h"
--- a/include/sync.h Fri Apr 06 16:49:28 2007 +0200
+++ b/include/sync.h Sat Apr 07 09:49:05 2007 +0200
@@ -28,10 +28,10 @@
void stopSYNC(CO_Data* d);
typedef void (*post_sync_t)(void);
-void _post_sync();
+void _post_sync(void);
typedef void (*post_TPDO_t)(void);
-void _post_TPDO();
+void _post_TPDO(void);
/** transmit a SYNC message on the bus number bus_id
* bus_id is hardware dependant
--- a/src/nmtSlave.c Fri Apr 06 16:49:28 2007 +0200
+++ b/src/nmtSlave.c Sat Apr 07 09:49:05 2007 +0200
@@ -22,6 +22,7 @@
#include "nmtSlave.h"
#include "states.h"
+#include "canfestival.h"
/*******************************************************************)*********/
/* put the slave in the state wanted by the master */
--- a/src/win32/CanFestival-3.def Fri Apr 06 16:49:28 2007 +0200
+++ b/src/win32/CanFestival-3.def Sat Apr 07 09:49:05 2007 +0200
@@ -65,21 +65,11 @@
canReceive
canOpen
canClose
- lss_SwitchModeGlobal
- lss_ConfigureNode_ID
- lss_ConfigureBitTimingParameters
- lss_ActivateBitTimingParameters_master
- lss_ActivateBitTimingParameters_slave
- lss_StoreConfiguredParameters
- lss_InquireLSSAddress_master
- lss_InquireLSSAddress_slave
- lss_IdentifyRemoteSlaves
- lss_validate_address
- lss_IdentifySlave
- canSaveData
- canReadData
- nvram_open
- nvram_close
- nvram_write
- nvram_read
- led_set_state
+ _post_TPDO
+ _post_sync
+ _heartbeatError
+ _stopped
+ _operational
+ _preOperational
+ _initialisation
+ _SDOtimeoutError