From f0ed04d728a88fc5f6bad414d17a9f6802dee72e Mon Sep 17 00:00:00 2001
From: Marcus10110 <markgarrison@saleae.com>
Date: Fri, 12 May 2017 10:57:02 -0700
Subject: [PATCH] Properly implemented Protocol Search support for the sample
 analyzer. Also used recently added #define flag to disable or enable the
 protocol search code, based on the SDK version. Ideally this will allow the
 same code to compile for the legacy SDK or the latest SDK.

---
 source/SimpleSerialAnalyzer.cpp        |  7 +++++--
 source/SimpleSerialAnalyzer.h          |  4 +++-
 source/SimpleSerialAnalyzerResults.cpp | 13 +++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/source/SimpleSerialAnalyzer.cpp b/source/SimpleSerialAnalyzer.cpp
index 81483a6..ff54965 100644
--- a/source/SimpleSerialAnalyzer.cpp
+++ b/source/SimpleSerialAnalyzer.cpp
@@ -3,7 +3,7 @@
 #include <AnalyzerChannelData.h>
 
 SimpleSerialAnalyzer::SimpleSerialAnalyzer()
-:	Analyzer(),  
+:	Analyzer2(),  
 	mSettings( new SimpleSerialAnalyzerSettings() ),
 	mSimulationInitilized( false )
 {
@@ -15,12 +15,15 @@ SimpleSerialAnalyzer::~SimpleSerialAnalyzer()
 	KillThread();
 }
 
-void SimpleSerialAnalyzer::WorkerThread()
+void SimpleSerialAnalyzer::SetupResults()
 {
 	mResults.reset( new SimpleSerialAnalyzerResults( this, mSettings.get() ) );
 	SetAnalyzerResults( mResults.get() );
 	mResults->AddChannelBubblesWillAppearOn( mSettings->mInputChannel );
+}
 
+void SimpleSerialAnalyzer::WorkerThread()
+{
 	mSampleRateHz = GetSampleRate();
 
 	mSerial = GetAnalyzerChannelData( mSettings->mInputChannel );
diff --git a/source/SimpleSerialAnalyzer.h b/source/SimpleSerialAnalyzer.h
index a494321..69ae85d 100644
--- a/source/SimpleSerialAnalyzer.h
+++ b/source/SimpleSerialAnalyzer.h
@@ -6,11 +6,13 @@
 #include "SimpleSerialSimulationDataGenerator.h"
 
 class SimpleSerialAnalyzerSettings;
-class ANALYZER_EXPORT SimpleSerialAnalyzer : public Analyzer
+class ANALYZER_EXPORT SimpleSerialAnalyzer : public Analyzer2
 {
 public:
 	SimpleSerialAnalyzer();
 	virtual ~SimpleSerialAnalyzer();
+
+	virtual void SetupResults();
 	virtual void WorkerThread();
 
 	virtual U32 GenerateSimulationData( U64 newest_sample_requested, U32 sample_rate, SimulationChannelDescriptor** simulation_channels );
diff --git a/source/SimpleSerialAnalyzerResults.cpp b/source/SimpleSerialAnalyzerResults.cpp
index 5c29d1d..4e81695 100644
--- a/source/SimpleSerialAnalyzerResults.cpp
+++ b/source/SimpleSerialAnalyzerResults.cpp
@@ -60,22 +60,23 @@ void SimpleSerialAnalyzerResults::GenerateExportFile( const char* file, DisplayB
 
 void SimpleSerialAnalyzerResults::GenerateFrameTabularText( U64 frame_index, DisplayBase display_base )
 {
+#ifdef SUPPORTS_PROTOCOL_SEARCH
 	Frame frame = GetFrame( frame_index );
-	ClearResultStrings();
+	ClearTabularText();
 
 	char number_str[128];
 	AnalyzerHelpers::GetNumberString( frame.mData1, display_base, 8, number_str, 128 );
-	AddResultString( number_str );
+	AddTabularText( number_str );
+#endif
 }
 
 void SimpleSerialAnalyzerResults::GeneratePacketTabularText( U64 packet_id, DisplayBase display_base )
 {
-	ClearResultStrings();
-	AddResultString( "not supported" );
+	//not supported
+
 }
 
 void SimpleSerialAnalyzerResults::GenerateTransactionTabularText( U64 transaction_id, DisplayBase display_base )
 {
-	ClearResultStrings();
-	AddResultString( "not supported" );
+	//not supported
 }
\ No newline at end of file