Merge branch 'master' of https://github.com/christianeisendle/saleae-…

…nxp-pn5180-analyzer
christianeisendle · Jun 23, 2016 · b107618 · b107618
2 parents 21a3e49 + 9f9fbf1
commit b107618
Show file tree

Hide file tree

Showing 13 changed files with 1,725 additions and 3 deletions.
diff --git a/Analyzer.sln b/Analyzer.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pn5180", "Pn5180\Pn5180.vcxproj", "{0D0F0DF1-BFF7-49E0-83D3-B231A6280DDA}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RC663", "RC663\RC663.vcxproj", "{69E5E05E-F621-42FB-A893-587B354DDAFC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -19,6 +21,14 @@ Global
 		{0D0F0DF1-BFF7-49E0-83D3-B231A6280DDA}.Release|Win32.Build.0 = Release|Win32
 		{0D0F0DF1-BFF7-49E0-83D3-B231A6280DDA}.Release|x64.ActiveCfg = Release|x64
 		{0D0F0DF1-BFF7-49E0-83D3-B231A6280DDA}.Release|x64.Build.0 = Release|x64
+		{69E5E05E-F621-42FB-A893-587B354DDAFC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{69E5E05E-F621-42FB-A893-587B354DDAFC}.Debug|Win32.Build.0 = Debug|Win32
+		{69E5E05E-F621-42FB-A893-587B354DDAFC}.Debug|x64.ActiveCfg = Debug|x64
+		{69E5E05E-F621-42FB-A893-587B354DDAFC}.Debug|x64.Build.0 = Debug|x64
+		{69E5E05E-F621-42FB-A893-587B354DDAFC}.Release|Win32.ActiveCfg = Release|Win32
+		{69E5E05E-F621-42FB-A893-587B354DDAFC}.Release|Win32.Build.0 = Release|Win32
+		{69E5E05E-F621-42FB-A893-587B354DDAFC}.Release|x64.ActiveCfg = Release|x64
+		{69E5E05E-F621-42FB-A893-587B354DDAFC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Pn5180/Pn5180AnalyzerResults.cpp b/Pn5180/Pn5180AnalyzerResults.cpp
@@ -9,7 +9,28 @@
 #define NUM_INSTRUCTIONS 26U
 const char* Pn5180InstructionCodes[NUM_INSTRUCTIONS] = 
 {
-	"SET_INSTR_WRITE_REGISTER",	"SET_INSTR_WRITE_REGISTER_OR_MASK",	"SET_INSTR_WRITE_REGISTER_AND_MASK",	"SET_INSTR_WRITE_REGISTER_MULTIPLE",	"GET_INSTR_READ_REGISTER",	"GET_INSTR_READ_REGISTER_MULTIPLE",	"SET_INSTR_WRITE_E2PROM",	"GET_INSTR_READ_E2PROM",	"SET_INSTR_WRITE_TX_DATA",	"SET_INSTR_SEND_DATA",	"GET_INSTR_RETRIEVE_RX_DATA",	"SET_INSTR_SWITCH_MODE",	"GET_INSTR_MFC_AUTHENTICATE",	"SET_INSTR_EPC_GEN2_INVENTORY",	"SET_INSTR_EPC_GEN2_RESUME_INVENTORY",	"GET_INSTR_EPC_GEN2_RETRIEVE_INVENTORY_RESULT_SIZE",	"GET_INSTR_EPC_GEN2_RETRIEVE_INVENTORY_RESULT",	"SET_INSTR_LOAD_RF_CONFIGURATION",	"SET_INSTR_UPDATE_RF_CONFIGURATION",	"GET_INSTR_RETRIEVE_RF_CONFIGURATION_SIZE",	"GET_INSTR_RETRIEVE_RF_CONFIGURATION",	"SET_INSTR_CONFIGURE_TESTBUS (RFU)",
+	"SET_INSTR_WRITE_REGISTER",
+	"SET_INSTR_WRITE_REGISTER_OR_MASK",
+	"SET_INSTR_WRITE_REGISTER_AND_MASK",
+	"SET_INSTR_WRITE_REGISTER_MULTIPLE",
+	"GET_INSTR_READ_REGISTER",
+	"GET_INSTR_READ_REGISTER_MULTIPLE",
+	"SET_INSTR_WRITE_E2PROM",
+	"GET_INSTR_READ_E2PROM",
+	"SET_INSTR_WRITE_TX_DATA",
+	"SET_INSTR_SEND_DATA",
+	"GET_INSTR_RETRIEVE_RX_DATA",
+	"SET_INSTR_SWITCH_MODE",
+	"GET_INSTR_MFC_AUTHENTICATE",
+	"SET_INSTR_EPC_GEN2_INVENTORY",
+	"SET_INSTR_EPC_GEN2_RESUME_INVENTORY",
+	"GET_INSTR_EPC_GEN2_RETRIEVE_INVENTORY_RESULT_SIZE",
+	"GET_INSTR_EPC_GEN2_RETRIEVE_INVENTORY_RESULT",
+	"SET_INSTR_LOAD_RF_CONFIGURATION",
+	"SET_INSTR_UPDATE_RF_CONFIGURATION",
+	"GET_INSTR_RETRIEVE_RF_CONFIGURATION_SIZE",
+	"GET_INSTR_RETRIEVE_RF_CONFIGURATION",
+	"SET_INSTR_CONFIGURE_TESTBUS (RFU)",
 	"SET_INSTR_RF_ON",
 	"SET_INSTR_RF_OFF",
 	"SET_CONFIGURE_TESTBUS_DIGITAL",
@@ -38,7 +59,7 @@ void Pn5180AnalyzerResults::GenerateBubbleText( U64 frame_index, Channel& channe
 	{
 		if ( channel == mSettings->mEnableChannel )
 		{
-			if (frame.mData1 > NUM_INSTRUCTIONS)
+			if (frame.mData1 >= NUM_INSTRUCTIONS)
 			{
 				char number_str[128];
 				AnalyzerHelpers::GetNumberString( frame.mData1, display_base, 8, number_str, 128 );
@@ -149,7 +170,7 @@ void Pn5180AnalyzerResults::GenerateFrameTabularText( U64 frame_index, DisplayBa
 		char instr_str[128];
 		AnalyzerHelpers::GetNumberString( frame.mData1, display_base, 8, instr_str, 128 );
 
-		if (frame.mData1 > NUM_INSTRUCTIONS)
+		if (frame.mData1 >= NUM_INSTRUCTIONS)
 		{
 			ss << "Unknown Instruction (";
 			ss << instr_str;

diff --git a/RC663/RC663.vcxproj b/RC663/RC663.vcxproj
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{69E5E05E-F621-42FB-A893-587B354DDAFC}</ProjectGuid>
+    <RootNamespace>Analyzer</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)SDK\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Analyzer.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)SDK\lib</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)SDK\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(SolutionDir)SDK\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Analyzer64.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="RC663Analyzer.cpp" />
+    <ClCompile Include="RC663AnalyzerResults.cpp" />
+    <ClCompile Include="RC663AnalyzerSettings.cpp" />
+    <ClCompile Include="RC663SimulationDataGenerator.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="RC663Analyzer.h" />
+    <ClInclude Include="RC663AnalyzerResults.h" />
+    <ClInclude Include="RC663AnalyzerSettings.h" />
+    <ClInclude Include="RC663SimulationDataGenerator.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/RC663/RC663.vcxproj.user b/RC663/RC663.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>