From 5a4fc6690ab12454e5ed6fd4203a267725410839 Mon Sep 17 00:00:00 2001
From: "dennis.sheirer" <dennis.sheirer@gmail.com>
Date: Fri, 19 Sep 2014 12:31:02 +0000
Subject: [PATCH] Resolved minor issue with LTR channel state threading
 conflict.  Added additional error handling/logging for R820T tuner startup,
 possibly related to reading the EEPROM contents on startup.

---
 src/decode/ltrstandard/LTRChannelState.java   | 12 +----
 .../tuner/rtl/RTL2832TunerController.java     | 48 +++++++++++++++----
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/decode/ltrstandard/LTRChannelState.java b/src/decode/ltrstandard/LTRChannelState.java
index 462588eb..0017c440 100644
--- a/src/decode/ltrstandard/LTRChannelState.java
+++ b/src/decode/ltrstandard/LTRChannelState.java
@@ -111,17 +111,7 @@ public class LTRChannelState extends ChannelState
                         	 * new call event, so close out the old one. */
                         	if( current != null && !current.addMessage( ltr ) )
                         	{
-                    			if( current.isValid() )
-                    			{
-                    				mCallEventModel.setEnd( current );
-                    			}
-                    			else
-                    			{
-                    				mCallEventModel.remove( current );
-                    			}
-
-                    			setCallEventModel( null );
-                    			current = null;
+                    			setState( State.FADE );
                         	}
                         	
                     		if( current == null )
diff --git a/src/source/tuner/rtl/RTL2832TunerController.java b/src/source/tuner/rtl/RTL2832TunerController.java
index 43e5e466..c463ba79 100644
--- a/src/source/tuner/rtl/RTL2832TunerController.java
+++ b/src/source/tuner/rtl/RTL2832TunerController.java
@@ -142,7 +142,7 @@ public abstract class RTL2832TunerController extends TunerController
 	private Descriptor mDescriptor;
 
 	public static final int sTWO_TO_22_POWER = 4194304;
-	public static final SampleRate sDEFAULT_SAMPLE_RATE = SampleRate.RATE_1_200MHZ;
+	public static final SampleRate sDEFAULT_SAMPLE_RATE = SampleRate.RATE_0_960MHZ;
 	
 	private SampleRate mSampleRate = sDEFAULT_SAMPLE_RATE;
 	
@@ -208,17 +208,40 @@ public abstract class RTL2832TunerController extends TunerController
 		try
 		{
 			setSampleRate( sDEFAULT_SAMPLE_RATE );
-
-			/* Read the contents of the 256-byte EEPROM */
-			byte[] eeprom = readEEPROM( mUSBDevice, (short)0, 256 );
-			
-			/* Create the descriptor with the contents from the EEPROM */
-			mDescriptor = new Descriptor( eeprom );
 		}
 		catch( Exception e )
 		{
 			throw new SourceException( "RTL2832 Tuner Controller - couldn't "
-				+ "set default sample rate or read EEPROM descriptor", e );
+				+ "set default sample rate", e );
+		}
+
+		byte[] eeprom;
+		
+		try
+		{
+			/* Read the contents of the 256-byte EEPROM */
+			eeprom = readEEPROM( mUSBDevice, (short)0, 256 );
+		}
+		catch( Exception e )
+		{
+			throw new SourceException( "RTL2832 Tuner Controller - couldn't "
+				+ "read EEPROM descriptor byte array", e );
+		}
+		
+		try
+		{
+			mDescriptor = new Descriptor( eeprom );
+
+			if( eeprom == null )
+			{
+				Log.error( "RTL2832 Tuner Controller - eeprom byte array was "
+						+ "null - constructed empty descriptor object" );
+			}
+		}
+		catch( Exception e )
+		{
+			throw new SourceException( "RTL2832 Tuner Controller - error "
+				+ "constructing descriptor object from eeprom byte array", e );
 		}
 	}
 
@@ -1705,7 +1728,14 @@ public abstract class RTL2832TunerController extends TunerController
 		
 		public Descriptor( byte[] data )
 		{
-			mData = data;
+			if( data != null )
+			{
+				mData = data;
+			}
+			else
+			{
+				data = new byte[ 256 ];
+			}
 			
 			getLabels();
 		}