Skip to content

Commit

Permalink
Merge develop into master version 2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Swiss3003
Swiss3003 committed Aug 2, 2023
2 parents ad21513 + 3e68941 commit ba072e6
Show file tree
Hide file tree
Showing 88 changed files with 3,357 additions and 6,926 deletions.
37 changes: 0 additions & 37 deletions Make/VS.2013/opensea-parser/opensea-parser/ReadMe.txt
View file

This file was deleted.

327 changes: 0 additions & 327 deletions Make/VS.2013/opensea-parser/opensea-parser/opensea-parser.vcxproj
View file

This file was deleted.

96 changes: 0 additions & 96 deletions Make/VS.2013/opensea-parser/opensea-parser/opensea-parser.vcxproj.filters
View file

This file was deleted.

14 changes: 14 additions & 0 deletions Make/VS.2017/opensea-parser/opensea-parser/opensea-parser.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -273,6 +274,7 @@
<DebugInformationFormat />
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -299,6 +301,7 @@
<DebugInformationFormat />
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -325,6 +328,7 @@
<DebugInformationFormat />
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -349,6 +353,7 @@
<TreatSpecificWarningsAsErrors>
</TreatSpecificWarningsAsErrors>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -373,6 +378,7 @@
<TreatSpecificWarningsAsErrors>
</TreatSpecificWarningsAsErrors>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -396,6 +402,7 @@
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\..\libjson;..\..\..\..\..\opensea-common\include;..\..\..\..\..\opensea-parser\include;..\..\..\..\..\opensea-parser\include\Seagate</AdditionalIncludeDirectories>
<DebugInformationFormat />
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -421,6 +428,7 @@
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\..\libjson;..\..\..\..\..\opensea-common\include;..\..\..\..\..\opensea-parser\include;..\..\..\..\..\opensea-parser\include\Seagate</AdditionalIncludeDirectories>
<DebugInformationFormat />
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -447,6 +455,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<DebugInformationFormat />
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -473,6 +482,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<DebugInformationFormat />
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -500,6 +510,7 @@
<TreatSpecificWarningsAsErrors>
</TreatSpecificWarningsAsErrors>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -528,6 +539,7 @@
<TreatSpecificWarningsAsErrors>
</TreatSpecificWarningsAsErrors>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -580,7 +592,9 @@
<ClInclude Include="..\..\..\..\include\Opensea_Parser_Version.h" />
<ClInclude Include="..\..\..\..\include\Seagate\Ata_Farm_Types.h" />
<ClInclude Include="..\..\..\..\include\Seagate\CAta_Farm_Log.h" />
<ClInclude Include="..\..\..\..\include\Seagate\CFARM_Combine.h" />
<ClInclude Include="..\..\..\..\include\Seagate\CFARM_Log.h" />
<ClInclude Include="..\..\..\..\include\Seagate\CFARM_WLM_Log.h" />
<ClInclude Include="..\..\..\..\include\Seagate\CScsi_Farm_Log.h" />
<ClInclude Include="..\..\..\..\include\Seagate\Farm_Common.h" />
<ClInclude Include="..\..\..\..\include\Seagate\Farm_Helper.h" />
Expand Down
6 changes: 6 additions & 0 deletions Make/VS.2017/opensea-parser/opensea-parser/opensea-parser.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@
<ClInclude Include="..\..\..\..\include\CScsi_Page_19h_Command_Duration_Limits_Log.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\Seagate\CFARM_Combine.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\Seagate\CFARM_WLM_Log.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\CAta_Device_Stat_Log.cpp">
Expand Down
2 changes: 2 additions & 0 deletions Make/VS.2019/opensea-parser/opensea-parser/opensea-parser.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\..\libjson;..\..\..\..\..\opensea-common\include;..\..\..\..\..\opensea-parser\include;..\..\..\..\..\opensea-parser\include\Seagate</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -508,6 +509,7 @@
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\..\libjson;..\..\..\..\..\opensea-common\include;..\..\..\..\..\opensea-parser\include;..\..\..\..\..\opensea-parser\include\Seagate</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<DebugInformationFormat>None</DebugInformationFormat>
<LanguageStandard_C>Default</LanguageStandard_C>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down
100 changes: 100 additions & 0 deletions Make/VS.2022/opensea-parser/opensea-parser/opensea-parser.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensea-parser", "opensea-parser.vcxproj", "{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}"
ProjectSection(ProjectDependencies) = postProject
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensea-common", "..\..\..\..\..\opensea-common\Make\VS.2017\opensea-common\opensea-common\opensea-common.vcxproj", "{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
Static-Debug|ARM = Static-Debug|ARM
Static-Debug|ARM64 = Static-Debug|ARM64
Static-Debug|x64 = Static-Debug|x64
Static-Debug|x86 = Static-Debug|x86
Static-Release|ARM = Static-Release|ARM
Static-Release|ARM64 = Static-Release|ARM64
Static-Release|x64 = Static-Release|x64
Static-Release|x86 = Static-Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Debug|ARM.ActiveCfg = Debug|ARM
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Debug|ARM.Build.0 = Debug|ARM
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Debug|ARM64.ActiveCfg = Debug|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Debug|x64.ActiveCfg = Debug|x64
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Debug|x64.Build.0 = Debug|x64
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Debug|x86.ActiveCfg = Debug|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Debug|x86.Build.0 = Debug|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Release|ARM.ActiveCfg = Release|ARM
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Release|ARM.Build.0 = Release|ARM
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Release|ARM64.ActiveCfg = Release|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Release|x64.ActiveCfg = Release|x64
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Release|x64.Build.0 = Release|x64
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Release|x86.ActiveCfg = Release|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Release|x86.Build.0 = Release|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Debug|ARM.ActiveCfg = Static-Debug|ARM
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Debug|ARM.Build.0 = Static-Debug|ARM
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Debug|ARM64.ActiveCfg = Static-Debug|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Debug|x64.ActiveCfg = Static-Debug|x64
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Debug|x64.Build.0 = Static-Debug|x64
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Debug|x86.ActiveCfg = Static-Debug|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Debug|x86.Build.0 = Static-Debug|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Release|ARM.ActiveCfg = Static-Release|ARM
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Release|ARM.Build.0 = Static-Release|ARM
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Release|ARM64.ActiveCfg = Static-Release|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Release|x64.ActiveCfg = Static-Release|x64
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Release|x64.Build.0 = Static-Release|x64
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Release|x86.ActiveCfg = Static-Release|Win32
{D7A121F5-30B5-4CA9-A272-3B6469FF8F46}.Static-Release|x86.Build.0 = Static-Release|Win32
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Debug|ARM.ActiveCfg = Debug|ARM
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Debug|ARM.Build.0 = Debug|ARM
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Debug|ARM64.ActiveCfg = Debug|ARM64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Debug|ARM64.Build.0 = Debug|ARM64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Debug|x64.ActiveCfg = Debug|x64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Debug|x64.Build.0 = Debug|x64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Debug|x86.ActiveCfg = Debug|Win32
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Debug|x86.Build.0 = Debug|Win32
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Release|ARM.ActiveCfg = Release|ARM
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Release|ARM.Build.0 = Release|ARM
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Release|ARM64.ActiveCfg = Release|ARM64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Release|ARM64.Build.0 = Release|ARM64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Release|x64.ActiveCfg = Release|x64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Release|x64.Build.0 = Release|x64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Release|x86.ActiveCfg = Release|Win32
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Release|x86.Build.0 = Release|Win32
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Debug|ARM.ActiveCfg = Static-Debug|ARM
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Debug|ARM.Build.0 = Static-Debug|ARM
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Debug|ARM64.ActiveCfg = Static-Debug|ARM64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Debug|ARM64.Build.0 = Static-Debug|ARM64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Debug|x64.ActiveCfg = Static-Debug|x64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Debug|x64.Build.0 = Static-Debug|x64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Debug|x86.ActiveCfg = Static-Debug|Win32
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Debug|x86.Build.0 = Static-Debug|Win32
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Release|ARM.ActiveCfg = Static-Release|ARM
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Release|ARM.Build.0 = Static-Release|ARM
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Release|ARM64.ActiveCfg = Static-Release|ARM64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Release|ARM64.Build.0 = Static-Release|ARM64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Release|x64.ActiveCfg = Static-Release|x64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Release|x64.Build.0 = Static-Release|x64
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Release|x86.ActiveCfg = Static-Release|Win32
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}.Static-Release|x86.Build.0 = Static-Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6A601820-17AE-4AC9-BD11-6073FE6CA375}
EndGlobalSection
EndGlobal
Loading

0 comments on commit ba072e6

Please sign in to comment.