#973 Adds concurrent locking to primary tuner controller methods. (#983)

Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-10-25 08:59:06 -04:00
committed by GitHub
parent 3ebfa90ca1
commit f4f3db7436
9 changed files with 430 additions and 196 deletions

View File

@@ -19,6 +19,8 @@ import io.github.dsheirer.source.SourceException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.text.DecimalFormat;
/** /**
* Monitors measured frequency error PPM values from the tuner and (when enabled) applies the current * Monitors measured frequency error PPM values from the tuner and (when enabled) applies the current
* error measurement to the tuner controller to adjust the tuner's PPM and align the frequency value. * error measurement to the tuner controller to adjust the tuner's PPM and align the frequency value.
@@ -32,6 +34,7 @@ public class FrequencyErrorCorrectionManager
private long mObservationPeriodStart; private long mObservationPeriodStart;
private double mPPMRequired; private double mPPMRequired;
private boolean mEnabled = true; private boolean mEnabled = true;
private DecimalFormat mDecimalFormat = new DecimalFormat("0.0");
private TunerController mTunerController; private TunerController mTunerController;
/** /**
@@ -72,7 +75,7 @@ public class FrequencyErrorCorrectionManager
try try
{ {
mLog.info("Auto-Correcting Tuner PPM to [" + frequencyCorrection + "]"); mLog.info("Auto-Correcting Tuner PPM to [" + mDecimalFormat.format(frequencyCorrection) + "]");
mTunerController.setFrequencyCorrection(frequencyCorrection); mTunerController.setFrequencyCorrection(frequencyCorrection);
reset(); reset();

View File

@@ -41,6 +41,7 @@ import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
public class AirspyTunerController extends USBTunerController public class AirspyTunerController extends USBTunerController
{ {
@@ -79,6 +80,7 @@ public class AirspyTunerController extends USBTunerController
private AirspyDeviceInformation mDeviceInfo; private AirspyDeviceInformation mDeviceInfo;
private List<AirspySampleRate> mSampleRates = new ArrayList<>(); private List<AirspySampleRate> mSampleRates = new ArrayList<>();
private int mSampleRate = 0; private int mSampleRate = 0;
private ReentrantLock mLock = new ReentrantLock();
private USBTransferProcessor mUSBTransferProcessor; private USBTransferProcessor mUSBTransferProcessor;
public AirspyTunerController(Device device) throws SourceException public AirspyTunerController(Device device) throws SourceException
@@ -346,15 +348,16 @@ public class AirspyTunerController extends USBTunerController
@Override @Override
public void setTunedFrequency(long frequency) throws SourceException public void setTunedFrequency(long frequency) throws SourceException
{
mLock.lock();
try
{ {
if(FREQUENCY_MIN <= frequency && frequency <= FREQUENCY_MAX) if(FREQUENCY_MIN <= frequency && frequency <= FREQUENCY_MAX)
{ {
ByteBuffer buffer = ByteBuffer.allocateDirect(4); ByteBuffer buffer = ByteBuffer.allocateDirect(4);
buffer.order(ByteOrder.LITTLE_ENDIAN); buffer.order(ByteOrder.LITTLE_ENDIAN);
buffer.putInt((int) frequency); buffer.putInt((int) frequency);
buffer.rewind(); buffer.rewind();
try try
@@ -364,15 +367,17 @@ public class AirspyTunerController extends USBTunerController
catch(UsbException e) catch(UsbException e)
{ {
mLog.error("error setting frequency [" + frequency + "]", e); mLog.error("error setting frequency [" + frequency + "]", e);
throw new SourceException("error setting frequency [" + frequency + "]", e);
throw new SourceException("error setting frequency [" +
frequency + "]", e);
} }
} }
else else
{ {
throw new SourceException("Frequency [" + frequency + "] outside " throw new SourceException("Frequency [" + frequency + "] outside " + "of tunable range " + FREQUENCY_MIN + "-" + FREQUENCY_MAX);
+ "of tunable range " + FREQUENCY_MIN + "-" + FREQUENCY_MAX); }
}
finally
{
mLock.unlock();
} }
} }
@@ -494,8 +499,11 @@ public class AirspyTunerController extends USBTunerController
* @throws LibUsbException on unsuccessful read operation * @throws LibUsbException on unsuccessful read operation
* @throws UsbException on USB error * @throws UsbException on USB error
*/ */
public void setMixerAGC(boolean enabled) public void setMixerAGC(boolean enabled) throws LibUsbException, UsbException
throws LibUsbException, UsbException {
mLock.lock();
try
{ {
int result = readByte(Command.SET_MIXER_AGC, 0, (enabled ? 1 : 0), true); int result = readByte(Command.SET_MIXER_AGC, 0, (enabled ? 1 : 0), true);
@@ -504,6 +512,11 @@ public class AirspyTunerController extends USBTunerController
throw new UsbException("Couldnt set mixer AGC enabled: " + enabled); throw new UsbException("Couldnt set mixer AGC enabled: " + enabled);
} }
} }
finally
{
mLock.unlock();;
}
}
/** /**
* Enables/disables the low noise amplifier automatic gain setting * Enables/disables the low noise amplifier automatic gain setting
@@ -513,6 +526,10 @@ public class AirspyTunerController extends USBTunerController
* @throws UsbException on USB error * @throws UsbException on USB error
*/ */
public void setLNAAGC(boolean enabled) throws LibUsbException, UsbException public void setLNAAGC(boolean enabled) throws LibUsbException, UsbException
{
mLock.lock();
try
{ {
int result = readByte(Command.SET_LNA_AGC, 0, (enabled ? 1 : 0), true); int result = readByte(Command.SET_LNA_AGC, 0, (enabled ? 1 : 0), true);
@@ -521,6 +538,11 @@ public class AirspyTunerController extends USBTunerController
throw new UsbException("Couldnt set LNA AGC enabled: " + enabled); throw new UsbException("Couldnt set LNA AGC enabled: " + enabled);
} }
} }
finally
{
mLock.unlock();
}
}
public void setGain(Gain gain) throws UsbException public void setGain(Gain gain) throws UsbException
{ {
@@ -542,8 +564,11 @@ public class AirspyTunerController extends USBTunerController
* @throws UsbException on error in USB transfer * @throws UsbException on error in USB transfer
* @throws IllegalArgumentException if gain value is invalid * @throws IllegalArgumentException if gain value is invalid
*/ */
public void setLNAGain(int gain) public void setLNAGain(int gain) throws LibUsbException, UsbException, IllegalArgumentException
throws LibUsbException, UsbException, IllegalArgumentException {
mLock.lock();
try
{ {
if(LNA_GAIN_MIN <= gain && gain <= LNA_GAIN_MAX) if(LNA_GAIN_MIN <= gain && gain <= LNA_GAIN_MAX)
{ {
@@ -560,6 +585,11 @@ public class AirspyTunerController extends USBTunerController
"] is outside value range: " + LNA_GAIN_MIN + "-" + LNA_GAIN_MAX); "] is outside value range: " + LNA_GAIN_MIN + "-" + LNA_GAIN_MAX);
} }
} }
finally
{
mLock.unlock();
}
}
/** /**
* Sets Mixer gain * Sets Mixer gain
@@ -569,8 +599,11 @@ public class AirspyTunerController extends USBTunerController
* @throws UsbException on error in USB transfer * @throws UsbException on error in USB transfer
* @throws IllegalArgumentException if gain value is invalid * @throws IllegalArgumentException if gain value is invalid
*/ */
public void setMixerGain(int gain) public void setMixerGain(int gain) throws LibUsbException, UsbException, IllegalArgumentException
throws LibUsbException, UsbException, IllegalArgumentException {
mLock.lock();
try
{ {
if(MIXER_GAIN_MIN <= gain && gain <= MIXER_GAIN_MAX) if(MIXER_GAIN_MIN <= gain && gain <= MIXER_GAIN_MAX)
{ {
@@ -587,6 +620,11 @@ public class AirspyTunerController extends USBTunerController
"] is outside value range: " + MIXER_GAIN_MIN + "-" + MIXER_GAIN_MAX); "] is outside value range: " + MIXER_GAIN_MIN + "-" + MIXER_GAIN_MAX);
} }
} }
finally
{
mLock.unlock();
}
}
/** /**
* Sets IF (VGA) gain * Sets IF (VGA) gain
@@ -596,8 +634,11 @@ public class AirspyTunerController extends USBTunerController
* @throws UsbException on error in USB transfer * @throws UsbException on error in USB transfer
* @throws IllegalArgumentException if gain value is invalid * @throws IllegalArgumentException if gain value is invalid
*/ */
public void setIFGain(int gain) public void setIFGain(int gain) throws LibUsbException, UsbException, IllegalArgumentException
throws LibUsbException, UsbException, IllegalArgumentException {
mLock.lock();
try
{ {
if(IF_GAIN_MIN <= gain && gain <= IF_GAIN_MAX) if(IF_GAIN_MIN <= gain && gain <= IF_GAIN_MAX)
{ {
@@ -614,6 +655,11 @@ public class AirspyTunerController extends USBTunerController
"] is outside value range: " + IF_GAIN_MIN + "-" + IF_GAIN_MAX); "] is outside value range: " + IF_GAIN_MIN + "-" + IF_GAIN_MAX);
} }
} }
finally
{
mLock.unlock();
}
}
public void setReceiverMode(boolean enabled) throws LibUsbException, UsbException public void setReceiverMode(boolean enabled) throws LibUsbException, UsbException
{ {

View File

@@ -42,6 +42,7 @@ import javax.usb.UsbException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.concurrent.locks.ReentrantLock;
public abstract class FCDTunerController extends TunerController public abstract class FCDTunerController extends TunerController
{ {
@@ -60,6 +61,7 @@ public abstract class FCDTunerController extends TunerController
private FCDConfiguration mConfiguration = new FCDConfiguration(); private FCDConfiguration mConfiguration = new FCDConfiguration();
protected ComplexMixer mComplexMixer; protected ComplexMixer mComplexMixer;
protected ReentrantLock mLock = new ReentrantLock();
/** /**
@@ -302,6 +304,8 @@ public abstract class FCDTunerController extends TunerController
*/ */
public void setTunedFrequency(long frequency) throws SourceException public void setTunedFrequency(long frequency) throws SourceException
{ {
mLock.lock();
try try
{ {
send(FCDCommand.APP_SET_FREQUENCY_HZ, frequency); send(FCDCommand.APP_SET_FREQUENCY_HZ, frequency);
@@ -311,6 +315,10 @@ public abstract class FCDTunerController extends TunerController
throw new SourceException("Couldn't set FCD Local " + throw new SourceException("Couldn't set FCD Local " +
"Oscillator Frequency [" + frequency + "]", e); "Oscillator Frequency [" + frequency + "]", e);
} }
finally
{
mLock.unlock();
}
} }
/** /**

View File

@@ -176,11 +176,19 @@ public class FCD1TunerController extends FCDTunerController
* @throws UsbException * @throws UsbException
* @throws UsbClaimException * @throws UsbClaimException
*/ */
public void setLNAGain(LNAGain gain) public void setLNAGain(LNAGain gain) throws UsbException, UsbClaimException
throws UsbException, UsbClaimException {
mLock.lock();
try
{ {
send(FCDCommand.APP_SET_LNA_GAIN, gain.getSetting()); send(FCDCommand.APP_SET_LNA_GAIN, gain.getSetting());
} }
finally
{
mLock.unlock();
}
}
/** /**
* @return - current phase correction setting * @return - current phase correction setting
@@ -269,8 +277,17 @@ public class FCD1TunerController extends FCDTunerController
//Merge the results //Merge the results
long correction = longGain | phase; long correction = longGain | phase;
mLock.lock();
try
{
send(FCDCommand.APP_SET_IQ_CORRECTION, correction); send(FCDCommand.APP_SET_IQ_CORRECTION, correction);
} }
finally
{
mLock.unlock();
}
}
/** /**
* Retrieves the stored phase and gain correction values from the FCD. * Retrieves the stored phase and gain correction values from the FCD.
@@ -402,16 +419,17 @@ public class FCD1TunerController extends FCDTunerController
//Merge the results //Merge the results
long correction = shiftedQuadrature | maskedInphase; long correction = shiftedQuadrature | maskedInphase;
// Log.info( "FCD1: setting iq correction," + mLock.lock();
// " inphase:" + inphase +
// " masked inphase:" + maskedInphase +
// " quad:" + quadrature +
// " masked quad:" + maskedQuadrature +
// " shifted quadrature:" + shiftedQuadrature +
// " correction:" + correction );
try
{
send(FCDCommand.APP_SET_DC_CORRECTION, correction); send(FCDCommand.APP_SET_DC_CORRECTION, correction);
} }
finally
{
mLock.unlock();
}
}
private void getDCIQCorrection() throws UsbClaimException, private void getDCIQCorrection() throws UsbClaimException,
UsbException UsbException
@@ -464,11 +482,19 @@ public class FCD1TunerController extends FCDTunerController
return mLNAEnhance; return mLNAEnhance;
} }
public void setLNAEnhance(LNAEnhance enhance) public void setLNAEnhance(LNAEnhance enhance) throws UsbClaimException, UsbException
throws UsbClaimException, UsbException {
mLock.lock();
try
{ {
send(FCDCommand.APP_SET_LNA_ENHANCE, enhance.getSetting()); send(FCDCommand.APP_SET_LNA_ENHANCE, enhance.getSetting());
} }
finally
{
mLock.unlock();
}
}
private void getMixerGainSetting() throws UsbClaimException, UsbException private void getMixerGainSetting() throws UsbClaimException, UsbException
{ {
@@ -487,9 +513,18 @@ public class FCD1TunerController extends FCDTunerController
} }
public void setMixerGain(MixerGain gain) throws UsbClaimException, UsbException public void setMixerGain(MixerGain gain) throws UsbClaimException, UsbException
{
mLock.lock();
try
{ {
send(FCDCommand.APP_SET_MIXER_GAIN, gain.getSetting()); send(FCDCommand.APP_SET_MIXER_GAIN, gain.getSetting());
} }
finally
{
mLock.unlock();
}
}
public enum Block public enum Block
{ {

View File

@@ -83,6 +83,8 @@ public class FCD2TunerController extends FCDTunerController
public void setLNAGain(boolean enabled) throws SourceException public void setLNAGain(boolean enabled) throws SourceException
{ {
mLock.lock();
try try
{ {
send(FCDCommand.APP_SET_LNA_GAIN, enabled ? 1 : 0); send(FCDCommand.APP_SET_LNA_GAIN, enabled ? 1 : 0);
@@ -91,10 +93,16 @@ public class FCD2TunerController extends FCDTunerController
{ {
throw new SourceException("error while setting LNA Gain", e); throw new SourceException("error while setting LNA Gain", e);
} }
finally
{
mLock.unlock();
}
} }
public void setMixerGain(boolean enabled) throws SourceException public void setMixerGain(boolean enabled) throws SourceException
{ {
mLock.lock();
try try
{ {
send(FCDCommand.APP_SET_MIXER_GAIN, enabled ? 1 : 0); send(FCDCommand.APP_SET_MIXER_GAIN, enabled ? 1 : 0);
@@ -103,6 +111,10 @@ public class FCD2TunerController extends FCDTunerController
{ {
throw new SourceException("error while setting Mixer Gain", e); throw new SourceException("error while setting Mixer Gain", e);
} }
finally
{
mLock.unlock();
}
} }
@Override @Override
@@ -159,6 +171,8 @@ public class FCD2TunerController extends FCDTunerController
public void setDCCorrection(int value) public void setDCCorrection(int value)
{ {
mLock.lock();
try try
{ {
send(FCDCommand.APP_SET_DC_CORRECTION, value); send(FCDCommand.APP_SET_DC_CORRECTION, value);
@@ -167,6 +181,10 @@ public class FCD2TunerController extends FCDTunerController
{ {
mLog.error("error setting dc correction to [" + value + "]", e); mLog.error("error setting dc correction to [" + value + "]", e);
} }
finally
{
mLock.unlock();
}
} }
public int getIQCorrection() public int getIQCorrection()
@@ -191,6 +209,8 @@ public class FCD2TunerController extends FCDTunerController
public void setIQCorrection(int value) public void setIQCorrection(int value)
{ {
mLock.lock();
try try
{ {
send(FCDCommand.APP_SET_IQ_CORRECTION, value); send(FCDCommand.APP_SET_IQ_CORRECTION, value);
@@ -199,5 +219,9 @@ public class FCD2TunerController extends FCDTunerController
{ {
mLog.error("error setting IQ correction to [" + value + "]", e); mLog.error("error setting IQ correction to [" + value + "]", e);
} }
finally
{
mLock.unlock();
}
} }
} }

View File

@@ -41,6 +41,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.util.Arrays; import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.concurrent.locks.ReentrantLock;
public class HackRFTunerController extends USBTunerController public class HackRFTunerController extends USBTunerController
{ {
@@ -69,6 +70,7 @@ public class HackRFTunerController extends USBTunerController
private Device mDevice; private Device mDevice;
private DeviceDescriptor mDeviceDescriptor; private DeviceDescriptor mDeviceDescriptor;
private DeviceHandle mDeviceHandle; private DeviceHandle mDeviceHandle;
private ReentrantLock mLock = new ReentrantLock();
public HackRFTunerController(Device device, DeviceDescriptor descriptor) throws SourceException public HackRFTunerController(Device device, DeviceDescriptor descriptor) throws SourceException
{ {
@@ -246,9 +248,16 @@ public class HackRFTunerController extends USBTunerController
*/ */
public void setBasebandFilter(BasebandFilter filter) throws UsbException public void setBasebandFilter(BasebandFilter filter) throws UsbException
{ {
write(Request.BASEBAND_FILTER_BANDWIDTH_SET, mLock.lock();
filter.getLowValue(),
filter.getHighValue()); try
{
write(Request.BASEBAND_FILTER_BANDWIDTH_SET, filter.getLowValue(), filter.getHighValue());
}
finally
{
mLock.unlock();
}
} }
/** /**
@@ -256,10 +265,18 @@ public class HackRFTunerController extends USBTunerController
*/ */
public void setAmplifierEnabled(boolean enabled) throws UsbException public void setAmplifierEnabled(boolean enabled) throws UsbException
{ {
write(Request.AMP_ENABLE, (enabled ? 1 : 0), 0); mLock.lock();
try
{
write(Request.AMP_ENABLE, (enabled ? 1 : 0), 0);
mAmplifierEnabled = enabled; mAmplifierEnabled = enabled;
} }
finally
{
mLock.unlock();;
}
}
public boolean getAmplifier() public boolean getAmplifier()
{ {
@@ -270,6 +287,8 @@ public class HackRFTunerController extends USBTunerController
* Sets the IF LNA Gain * Sets the IF LNA Gain
*/ */
public void setLNAGain(HackRFLNAGain gain) throws UsbException public void setLNAGain(HackRFLNAGain gain) throws UsbException
{
try
{ {
int result = readByte(Request.SET_LNA_GAIN, 0, gain.getValue(), true); int result = readByte(Request.SET_LNA_GAIN, 0, gain.getValue(), true);
@@ -278,11 +297,20 @@ public class HackRFTunerController extends USBTunerController
throw new UsbException("couldn't set lna gain to " + gain); throw new UsbException("couldn't set lna gain to " + gain);
} }
} }
finally
{
mLock.unlock();
}
}
/** /**
* Sets the Baseband VGA Gain * Sets the Baseband VGA Gain
*/ */
public void setVGAGain(HackRFVGAGain gain) throws UsbException public void setVGAGain(HackRFVGAGain gain) throws UsbException
{
mLock.lock();
try
{ {
int result = readByte(Request.SET_VGA_GAIN, 0, gain.getValue(), true); int result = readByte(Request.SET_VGA_GAIN, 0, gain.getValue(), true);
@@ -291,6 +319,11 @@ public class HackRFTunerController extends USBTunerController
throw new UsbException("couldn't set vga gain to " + gain); throw new UsbException("couldn't set vga gain to " + gain);
} }
} }
finally
{
mLock.unlock();
}
}
/** /**
* Not implemented * Not implemented
@@ -302,6 +335,10 @@ public class HackRFTunerController extends USBTunerController
@Override @Override
public void setTunedFrequency(long frequency) throws SourceException public void setTunedFrequency(long frequency) throws SourceException
{
mLock.lock();
try
{ {
ByteBuffer buffer = ByteBuffer.allocateDirect(8); ByteBuffer buffer = ByteBuffer.allocateDirect(8);
buffer.order(ByteOrder.LITTLE_ENDIAN); buffer.order(ByteOrder.LITTLE_ENDIAN);
@@ -321,9 +358,12 @@ public class HackRFTunerController extends USBTunerController
catch(UsbException e) catch(UsbException e)
{ {
mLog.error("error setting frequency [" + frequency + "]", e); mLog.error("error setting frequency [" + frequency + "]", e);
throw new SourceException("error setting frequency [" + frequency + "]", e);
throw new SourceException("error setting frequency [" + }
frequency + "]", e); }
finally
{
mLock.unlock();
} }
} }

View File

@@ -46,6 +46,7 @@ import java.nio.ByteOrder;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.locks.ReentrantLock;
public abstract class RTL2832TunerController extends USBTunerController public abstract class RTL2832TunerController extends USBTunerController
{ {
@@ -60,6 +61,7 @@ public abstract class RTL2832TunerController extends USBTunerController
public final static long TIMEOUT_US = 1000000l; //uSeconds public final static long TIMEOUT_US = 1000000l; //uSeconds
public final static byte REQUEST_ZERO = (byte) 0; public final static byte REQUEST_ZERO = (byte) 0;
public final static byte EEPROM_ADDRESS = (byte) 0xA0; public final static byte EEPROM_ADDRESS = (byte) 0xA0;
protected ReentrantLock mLock = new ReentrantLock();
public final static byte[] sFIR_COEFFICIENTS = public final static byte[] sFIR_COEFFICIENTS =
{ {

View File

@@ -384,6 +384,8 @@ public class E4KTunerController extends RTL2832TunerController
actualFrequency = calculateActualFrequency(pll, z, x); actualFrequency = calculateActualFrequency(pll, z, x);
} }
mLock.lock();
/* Apply the actual frequency */ /* Apply the actual frequency */
try try
{ {
@@ -428,6 +430,10 @@ public class E4KTunerController extends RTL2832TunerController
throw new SourceException("E4K tuner controller - error tuning " throw new SourceException("E4K tuner controller - error tuning "
+ "frequency [" + frequency + "]", e); + "frequency [" + frequency + "]", e);
} }
finally
{
mLock.unlock();
}
} }
private long calculateActualFrequency(PLL pll, byte z, int x) private long calculateActualFrequency(PLL pll, byte z, int x)
@@ -657,8 +663,11 @@ public class E4KTunerController extends RTL2832TunerController
* @param gain * @param gain
* @throws UsbException * @throws UsbException
*/ */
public void setLNAGain(E4KLNAGain gain, boolean controlI2CRepeater) public void setLNAGain(E4KLNAGain gain, boolean controlI2CRepeater) throws UsbException
throws UsbException {
mLock.lock();
try
{ {
if(controlI2CRepeater) if(controlI2CRepeater)
{ {
@@ -691,6 +700,11 @@ public class E4KTunerController extends RTL2832TunerController
enableI2CRepeater(mDeviceHandle, false); enableI2CRepeater(mDeviceHandle, false);
} }
} }
finally
{
mLock.unlock();
}
}
/** /**
* Reads LNA gain from E4K tuner * Reads LNA gain from E4K tuner
@@ -699,8 +713,16 @@ public class E4KTunerController extends RTL2832TunerController
*/ */
public E4KLNAGain getLNAGain(boolean controlI2CRepeater) throws UsbException public E4KLNAGain getLNAGain(boolean controlI2CRepeater) throws UsbException
{ {
return E4KLNAGain.fromRegisterValue( mLock.lock();
readE4KRegister(E4KLNAGain.getRegister(), controlI2CRepeater));
try
{
return E4KLNAGain.fromRegisterValue(readE4KRegister(E4KLNAGain.getRegister(), controlI2CRepeater));
}
finally
{
mLock.unlock();
}
} }
/** /**
@@ -711,13 +733,18 @@ public class E4KTunerController extends RTL2832TunerController
* @param gain * @param gain
* @throws UsbException * @throws UsbException
*/ */
public void setEnhanceGain(E4KEnhanceGain gain, boolean controlI2CRepeater) public void setEnhanceGain(E4KEnhanceGain gain, boolean controlI2CRepeater) throws UsbException
throws UsbException
{ {
writeMaskedE4KRegister(E4KEnhanceGain.getRegister(), mLock.lock();
E4KEnhanceGain.getMask(),
gain.getValue(), try
controlI2CRepeater); {
writeMaskedE4KRegister(E4KEnhanceGain.getRegister(), E4KEnhanceGain.getMask(), gain.getValue(), controlI2CRepeater);
}
finally
{
mLock.unlock();
}
} }
/** /**
@@ -728,15 +755,25 @@ public class E4KTunerController extends RTL2832TunerController
* @return * @return
* @throws UsbException * @throws UsbException
*/ */
public E4KEnhanceGain getEnhanceGain(boolean controlI2CRepeater) public E4KEnhanceGain getEnhanceGain(boolean controlI2CRepeater) throws UsbException
throws UsbException
{ {
return E4KEnhanceGain.fromRegisterValue( mLock.lock();
readE4KRegister(E4KEnhanceGain.getRegister(), controlI2CRepeater));
try
{
return E4KEnhanceGain.fromRegisterValue(readE4KRegister(E4KEnhanceGain.getRegister(), controlI2CRepeater));
}
finally
{
mLock.unlock();
}
} }
public void setMixerGain(E4KMixerGain gain, boolean controlI2CRepeater) public void setMixerGain(E4KMixerGain gain, boolean controlI2CRepeater) throws UsbException
throws UsbException {
mLock.lock();
try
{ {
if(controlI2CRepeater) if(controlI2CRepeater)
{ {
@@ -771,13 +808,19 @@ public class E4KTunerController extends RTL2832TunerController
enableI2CRepeater(mDeviceHandle, false); enableI2CRepeater(mDeviceHandle, false);
} }
} }
finally
public E4KMixerGain getMixerGain(boolean controlI2CRepeater)
throws UsbException
{ {
byte autoOrManual = readMaskedE4KRegister(Register.AGC7, mLock.unlock();
AGC7_MIXER_GAIN_MASK, }
controlI2CRepeater); }
public E4KMixerGain getMixerGain(boolean controlI2CRepeater) throws UsbException
{
mLock.lock();
try
{
byte autoOrManual = readMaskedE4KRegister(Register.AGC7, AGC7_MIXER_GAIN_MASK, controlI2CRepeater);
if(autoOrManual == AGC7_MIX_GAIN_AUTO) if(autoOrManual == AGC7_MIX_GAIN_AUTO)
{ {
@@ -785,15 +828,17 @@ public class E4KTunerController extends RTL2832TunerController
} }
else else
{ {
int register = readE4KRegister(E4KMixerGain.getRegister(), int register = readE4KRegister(E4KMixerGain.getRegister(), controlI2CRepeater);
controlI2CRepeater);
return E4KMixerGain.fromRegisterValue(register); return E4KMixerGain.fromRegisterValue(register);
} }
} }
finally
{
mLock.unlock();
}
}
public void setIFStage1Gain(IFStage1Gain gain, public void setIFStage1Gain(IFStage1Gain gain, boolean controlI2CRepeater) throws UsbException
boolean controlI2CRepeater) throws UsbException
{ {
writeMaskedE4KRegister(IFStage1Gain.getRegister(), writeMaskedE4KRegister(IFStage1Gain.getRegister(),
IFStage1Gain.getMask(), IFStage1Gain.getMask(),
@@ -959,8 +1004,7 @@ public class E4KTunerController extends RTL2832TunerController
} }
} }
public void setBand(long frequency, public void setBand(long frequency, boolean controlI2CRepeater) throws UsbException
boolean controlI2CRepeater) throws UsbException
{ {
if(controlI2CRepeater) if(controlI2CRepeater)
{ {
@@ -997,8 +1041,7 @@ public class E4KTunerController extends RTL2832TunerController
} }
} }
private void setRFFilter(long frequency, private void setRFFilter(long frequency, boolean controlI2CRepeater) throws UsbException
boolean controlI2CRepeater) throws UsbException
{ {
RFFilter filter = RFFilter.fromFrequency(frequency); RFFilter filter = RFFilter.fromFrequency(frequency);

View File

@@ -180,6 +180,8 @@ public class R820TTunerController extends RTL2832TunerController
@Override @Override
public void setTunedFrequency(long frequency) throws SourceException public void setTunedFrequency(long frequency) throws SourceException
{ {
mLock.lock();
try try
{ {
enableI2CRepeater(mDeviceHandle, true); enableI2CRepeater(mDeviceHandle, true);
@@ -200,6 +202,10 @@ public class R820TTunerController extends RTL2832TunerController
+ "while setting frequency [" + frequency + "] - " + + "while setting frequency [" + frequency + "] - " +
e.getLocalizedMessage()); e.getLocalizedMessage());
} }
finally
{
mLock.unlock();
}
} }
/** /**
@@ -692,25 +698,52 @@ public class R820TTunerController extends RTL2832TunerController
* Sets LNA gain * Sets LNA gain
*/ */
public void setLNAGain(R820TLNAGain gain, boolean controlI2C) throws UsbException public void setLNAGain(R820TLNAGain gain, boolean controlI2C) throws UsbException
{
mLock.lock();
try
{ {
writeR820TRegister(Register.LNA_GAIN, gain.getSetting(), controlI2C); writeR820TRegister(Register.LNA_GAIN, gain.getSetting(), controlI2C);
} }
finally
{
mLock.unlock();
}
}
/** /**
* Sets Mixer gain * Sets Mixer gain
*/ */
public void setMixerGain(R820TMixerGain gain, boolean controlI2C) throws UsbException public void setMixerGain(R820TMixerGain gain, boolean controlI2C) throws UsbException
{
mLock.lock();
try
{ {
writeR820TRegister(Register.MIXER_GAIN, gain.getSetting(), controlI2C); writeR820TRegister(Register.MIXER_GAIN, gain.getSetting(), controlI2C);
} }
finally
{
mLock.unlock();
}
}
/** /**
* Sets VGA gain * Sets VGA gain
*/ */
public void setVGAGain(R820TVGAGain gain, boolean controlI2C) throws UsbException public void setVGAGain(R820TVGAGain gain, boolean controlI2C) throws UsbException
{
mLock.lock();
try
{ {
writeR820TRegister(Register.VGA_GAIN, gain.getSetting(), controlI2C); writeR820TRegister(Register.VGA_GAIN, gain.getSetting(), controlI2C);
} }
finally
{
mLock.unlock();
}
}
/** /**
* R820T VGA gain settings * R820T VGA gain settings