actions = alias.getAction();
+
+ for(AliasAction action : actions)
+ {
+ /* Provide access to the thread pool manager in case the
* action needs to setup a timer, and provide the original
* message to be used as part of the action (e.g. sending
* the message as a text message to a cell phone */
- action.execute( mThreadPoolManager, alias, message );
- }
- }
- }
- }
- }
- }
+ action.execute(ThreadPool.SCHEDULED, alias, message);
+ }
+ }
+ }
+ }
+ }
+ }
}
diff --git a/src/alias/action/RecurringAction.java b/src/alias/action/RecurringAction.java
index 8d6298c2..c8e54d62 100644
--- a/src/alias/action/RecurringAction.java
+++ b/src/alias/action/RecurringAction.java
@@ -1,188 +1,181 @@
package alias.action;
-import java.awt.EventQueue;
+import alias.Alias;
+import message.Message;
+
+import javax.swing.*;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
+import java.awt.*;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.swing.JOptionPane;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
-
-import message.Message;
-import alias.Alias;
-import controller.ThreadPoolManager;
-import controller.ThreadPoolManager.ThreadType;
-
public abstract class RecurringAction extends AliasAction
{
- @XmlTransient
- protected AtomicBoolean mRunning = new AtomicBoolean( false );
- @XmlTransient
- private ScheduledFuture mPerpetualAction;
-
- protected Interval mInterval = Interval.ONCE;
- protected int mPeriod = 5;
-
- protected ThreadPoolManager mThreadPoolManager;
-
- public abstract void performAction( Alias alias, Message message );
+ @XmlTransient
+ protected AtomicBoolean mRunning = new AtomicBoolean(false);
+ @XmlTransient
+ private ScheduledFuture mPerpetualAction;
+ @XmlTransient
+ protected ScheduledExecutorService mScheduledExecutorService;
- @Override
- public void execute( ThreadPoolManager threadPoolManager,
- Alias alias,
- Message message )
- {
- mThreadPoolManager = threadPoolManager;
+ protected Interval mInterval = Interval.ONCE;
+ protected int mPeriod = 5;
- if( mRunning.compareAndSet( false, true ) )
- {
- switch( mInterval )
- {
- case ONCE:
- performThreadedAction( alias, message );
- /* Don't reset */
- break;
- case DELAYED_RESET:
- performThreadedAction( alias, message );
- mThreadPoolManager.scheduleOnce( new ResetTask(),
- mPeriod, TimeUnit.SECONDS );
- break;
- case UNTIL_DISMISSED:
- mPerpetualAction = mThreadPoolManager
- .scheduleFixedRate( ThreadType.DECODER,
- new PerformActionTask( alias, message ),
- mPeriod, TimeUnit.SECONDS );
+ public abstract void performAction(Alias alias, Message message);
- StringBuilder sb = new StringBuilder();
- sb.append( "Alias [" );
- sb.append( alias.getName() );
- sb.append( "] is active in message [" );
- sb.append( message.toString() );
- sb.append( "]
" );
-
- final String text = sb.toString();
-
- EventQueue.invokeLater( new Runnable()
- {
- @Override
- public void run()
- {
- JOptionPane.showMessageDialog( null, text,
- "Alias Alert", JOptionPane.INFORMATION_MESSAGE );
-
- dismiss( false );
-
- mThreadPoolManager.scheduleOnce( new ResetTask(),
- 15, TimeUnit.SECONDS );
- }
- } );
- break;
- default:
- }
- }
- }
+ @Override
+ public void execute(ScheduledExecutorService scheduledExecutorService, Alias alias, Message message)
+ {
+ mScheduledExecutorService = scheduledExecutorService;
- /**
- * Spawns the performAction() event into a new thread so that it doesn't
- * delay any decoder actions.
- */
- private void performThreadedAction( final Alias alias, final Message message )
- {
- mThreadPoolManager.scheduleOnce( new Runnable() {
+ if(mRunning.compareAndSet(false, true))
+ {
+ switch(mInterval)
+ {
+ case ONCE:
+ performThreadedAction(alias, message);
+ /* Don't reset */
+ break;
+ case DELAYED_RESET:
+ performThreadedAction(alias, message);
+ mScheduledExecutorService.schedule(new ResetTask(), mPeriod, TimeUnit.SECONDS);
+ break;
+ case UNTIL_DISMISSED:
+ mPerpetualAction = mScheduledExecutorService.scheduleAtFixedRate(
+ new PerformActionTask(alias, message), mPeriod, mPeriod, TimeUnit.SECONDS);
- @Override
- public void run()
- {
- performAction( alias, message );
- }}, 0, TimeUnit.SECONDS );
- }
-
- @Override
- public void dismiss( boolean reset )
- {
- if( mPerpetualAction != null )
- {
- mPerpetualAction.cancel( true );
-
- mPerpetualAction = null;
- }
-
- if( reset )
- {
- mRunning.set( false );
- }
- }
-
- @XmlAttribute
- public int getPeriod()
- {
- return mPeriod;
- }
-
- public void setPeriod( int period )
- {
- mPeriod = period;
- }
-
- @XmlAttribute
- public Interval getInterval()
- {
- return mInterval;
- }
-
- public void setInterval( Interval interval )
- {
- mInterval = interval;
-
- mRunning.set( false );
- }
-
- public enum Interval
- {
- ONCE( "Once" ),
- DELAYED_RESET( "Once, Reset After Delay" ),
- UNTIL_DISMISSED( "Until Dismissed" );
-
- private String mLabel;
-
- private Interval( String label )
- {
- mLabel = label;
- }
-
- public String toString()
- {
- return mLabel;
- }
- }
-
- public class PerformActionTask implements Runnable
- {
- private Alias mAlias;
- private Message mMessage;
+ StringBuilder sb = new StringBuilder();
+ sb.append("Alias [");
+ sb.append(alias.getName());
+ sb.append("] is active in message [");
+ sb.append(message.toString());
+ sb.append("]
");
- public PerformActionTask( Alias alias, Message message )
- {
- mAlias = alias;
- mMessage = message;
- }
-
- @Override
- public void run()
- {
+ final String text = sb.toString();
+
+ EventQueue.invokeLater(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ JOptionPane.showMessageDialog(null, text,
+ "Alias Alert", JOptionPane.INFORMATION_MESSAGE);
+
+ dismiss(false);
+
+ mScheduledExecutorService.schedule(new ResetTask(), 15, TimeUnit.SECONDS);
+ }
+ });
+ break;
+ default:
+ }
+ }
+ }
+
+ /**
+ * Spawns the performAction() event into a new thread so that it doesn't
+ * delay any decoder actions.
+ */
+ private void performThreadedAction(final Alias alias, final Message message)
+ {
+ mScheduledExecutorService.schedule(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ performAction(alias, message);
+ }
+ }, 0, TimeUnit.SECONDS);
+ }
+
+ @Override
+ public void dismiss(boolean reset)
+ {
+ if(mPerpetualAction != null)
+ {
+ mPerpetualAction.cancel(true);
+
+ mPerpetualAction = null;
+ }
+
+ if(reset)
+ {
+ mRunning.set(false);
+ }
+ }
+
+ @XmlAttribute
+ public int getPeriod()
+ {
+ return mPeriod;
+ }
+
+ public void setPeriod(int period)
+ {
+ mPeriod = period;
+ }
+
+ @XmlAttribute
+ public Interval getInterval()
+ {
+ return mInterval;
+ }
+
+ public void setInterval(Interval interval)
+ {
+ mInterval = interval;
+
+ mRunning.set(false);
+ }
+
+ public enum Interval
+ {
+ ONCE("Once"),
+ DELAYED_RESET("Once, Reset After Delay"),
+ UNTIL_DISMISSED("Until Dismissed");
+
+ private String mLabel;
+
+ private Interval(String label)
+ {
+ mLabel = label;
+ }
+
+ public String toString()
+ {
+ return mLabel;
+ }
+ }
+
+ public class PerformActionTask implements Runnable
+ {
+ private Alias mAlias;
+ private Message mMessage;
+
+ public PerformActionTask(Alias alias, Message message)
+ {
+ mAlias = alias;
+ mMessage = message;
+ }
+
+ @Override
+ public void run()
+ {
/* Don't use the performThreadedAction() method, since this is
* already running in a separate thread */
- performAction( mAlias, mMessage );
- }
- }
-
- public class ResetTask implements Runnable
- {
- @Override
- public void run()
- {
- mRunning.set( false );
- }
- }
+ performAction(mAlias, mMessage);
+ }
+ }
+
+ public class ResetTask implements Runnable
+ {
+ @Override
+ public void run()
+ {
+ mRunning.set(false);
+ }
+ }
}
diff --git a/src/audio/AudioManager.java b/src/audio/AudioManager.java
index 02578da0..2cab2400 100644
--- a/src/audio/AudioManager.java
+++ b/src/audio/AudioManager.java
@@ -22,8 +22,6 @@ import audio.AudioEvent.Type;
import audio.output.AudioOutput;
import audio.output.MonoAudioOutput;
import audio.output.StereoAudioOutput;
-import controller.ThreadPoolManager;
-import controller.ThreadPoolManager.ThreadType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
@@ -32,6 +30,7 @@ import sample.Listener;
import source.mixer.MixerChannel;
import source.mixer.MixerChannelConfiguration;
import source.mixer.MixerManager;
+import util.ThreadPool;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Mixer;
@@ -70,7 +69,6 @@ public class AudioManager implements Listener, IAudioController
private Broadcaster mControllerBroadcaster = new Broadcaster<>();
- private ThreadPoolManager mThreadPoolManager;
private ScheduledFuture mProcessingTask;
private MixerManager mMixerManager;
private MixerChannelConfiguration mMixerChannelConfiguration;
@@ -81,9 +79,8 @@ public class AudioManager implements Listener, IAudioController
* packets to any combination of outputs based on any alias audio routing
* options specified by the user.
*/
- public AudioManager(ThreadPoolManager manager, MixerManager mixerManager)
+ public AudioManager(MixerManager mixerManager)
{
- mThreadPoolManager = manager;
mMixerManager = mixerManager;
loadSettings();
@@ -145,14 +142,13 @@ public class AudioManager implements Listener, IAudioController
public void dispose()
{
- if(mThreadPoolManager != null && mProcessingTask != null)
+ if(mProcessingTask != null)
{
- mThreadPoolManager.cancel(mProcessingTask);
+ mProcessingTask.cancel(true);
}
mAudioPacketQueue.clear();
- mThreadPoolManager = null;
mProcessingTask = null;
mChannelConnectionMap.clear();
@@ -224,9 +220,9 @@ public class AudioManager implements Listener, IAudioController
{
mControllerBroadcaster.broadcast(CONFIGURATION_CHANGE_STARTED);
- if(mThreadPoolManager != null && mProcessingTask != null)
+ if(mProcessingTask != null)
{
- mThreadPoolManager.cancel(mProcessingTask);
+ mProcessingTask.cancel(true);
}
disposeCurrentConfiguration();
@@ -234,19 +230,18 @@ public class AudioManager implements Listener, IAudioController
switch(entry.getMixerChannel())
{
case MONO:
- AudioOutput mono = new MonoAudioOutput(mThreadPoolManager,
- entry.getMixer());
+ AudioOutput mono = new MonoAudioOutput(entry.getMixer());
mAudioOutputConnections.add(new AudioOutputConnection(mono));
mAvailableConnectionCount++;
mAudioOutputMap.put(mono.getChannelName(), mono);
break;
case STEREO:
- AudioOutput left = new StereoAudioOutput(mThreadPoolManager, entry.getMixer(), MixerChannel.LEFT);
+ AudioOutput left = new StereoAudioOutput(entry.getMixer(), MixerChannel.LEFT);
mAudioOutputConnections.add(new AudioOutputConnection(left));
mAvailableConnectionCount++;
mAudioOutputMap.put(left.getChannelName(), left);
- AudioOutput right = new StereoAudioOutput(mThreadPoolManager, entry.getMixer(), MixerChannel.RIGHT);
+ AudioOutput right = new StereoAudioOutput(entry.getMixer(), MixerChannel.RIGHT);
mAudioOutputConnections.add(new AudioOutputConnection(right));
mAvailableConnectionCount++;
mAudioOutputMap.put(right.getChannelName(), right);
@@ -256,9 +251,8 @@ public class AudioManager implements Listener, IAudioController
+ "configuration: " + entry.getMixerChannel());
}
- mProcessingTask = mThreadPoolManager.scheduleFixedRate(
- ThreadType.AUDIO_PROCESSING, new AudioPacketProcessor(), 15,
- TimeUnit.MILLISECONDS);
+ mProcessingTask = ThreadPool.SCHEDULED.scheduleAtFixedRate(new AudioPacketProcessor(),
+ 0, 15, TimeUnit.MILLISECONDS);
mControllerBroadcaster.broadcast(CONFIGURATION_CHANGE_COMPLETE);
diff --git a/src/audio/broadcast/AudioBroadcaster.java b/src/audio/broadcast/AudioBroadcaster.java
index 8644e4da..050168c8 100644
--- a/src/audio/broadcast/AudioBroadcaster.java
+++ b/src/audio/broadcast/AudioBroadcaster.java
@@ -20,10 +20,10 @@ package audio.broadcast;
import audio.convert.ISilenceGenerator;
import channel.metadata.Metadata;
-import controller.ThreadPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
+import util.ThreadPool;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -40,7 +40,6 @@ public abstract class AudioBroadcaster implements Listener
public static final int PROCESSOR_RUN_INTERVAL_MS = 1000;
- private ThreadPoolManager mThreadPoolManager;
private ScheduledFuture mScheduledTask;
private RecordingQueueProcessor mRecordingQueueProcessor = new RecordingQueueProcessor();
@@ -77,19 +76,13 @@ public abstract class AudioBroadcaster implements Listener
* The last audio packet's metadata is automatically attached to the closed audio recording when it is enqueued for
* broadcast. That metadata will be updated on the remote server once the audio recording is opened for streaming.
*/
- public AudioBroadcaster(ThreadPoolManager threadPoolManager, BroadcastConfiguration broadcastConfiguration)
+ public AudioBroadcaster(BroadcastConfiguration broadcastConfiguration)
{
- mThreadPoolManager = threadPoolManager;
mBroadcastConfiguration = broadcastConfiguration;
mDelay = mBroadcastConfiguration.getDelay();
mSilenceGenerator = BroadcastFactory.getSilenceGenerator(broadcastConfiguration.getBroadcastFormat());
}
- protected ThreadPoolManager getThreadPoolManager()
- {
- return mThreadPoolManager;
- }
-
/**
* Broadcast binary audio data frames or sequences.
*/
@@ -129,11 +122,8 @@ public abstract class AudioBroadcaster implements Listener
{
if(mScheduledTask == null)
{
- if(mThreadPoolManager != null)
- {
- mScheduledTask = mThreadPoolManager.scheduleFixedRate(ThreadPoolManager.ThreadType.AUDIO_PROCESSING,
- mRecordingQueueProcessor, PROCESSOR_RUN_INTERVAL_MS, TimeUnit.MILLISECONDS);
- }
+ ThreadPool.SCHEDULED.scheduleAtFixedRate(mRecordingQueueProcessor, 0,
+ PROCESSOR_RUN_INTERVAL_MS, TimeUnit.MILLISECONDS);
}
}
}
@@ -145,9 +135,9 @@ public abstract class AudioBroadcaster implements Listener
{
if(mStreaming.compareAndSet(true, false))
{
- if(mThreadPoolManager != null && mScheduledTask != null)
+ if(mScheduledTask != null)
{
- mThreadPoolManager.cancel(mScheduledTask);
+ mScheduledTask.cancel(true);
}
disconnect();
diff --git a/src/audio/broadcast/BroadcastFactory.java b/src/audio/broadcast/BroadcastFactory.java
index 745be778..75caef3b 100644
--- a/src/audio/broadcast/BroadcastFactory.java
+++ b/src/audio/broadcast/BroadcastFactory.java
@@ -37,7 +37,6 @@ import audio.convert.IAudioConverter;
import audio.convert.ISilenceGenerator;
import audio.convert.MP3AudioConverter;
import audio.convert.MP3SilenceGenerator;
-import controller.ThreadPoolManager;
import gui.editor.Editor;
import gui.editor.EmptyEditor;
import icon.IconManager;
@@ -45,25 +44,23 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.AudioRecorder;
import record.mp3.MP3Recorder;
-import settings.SettingsManager;
import java.nio.file.Path;
public class BroadcastFactory
{
- private final static Logger mLog = LoggerFactory.getLogger( BroadcastFactory.class );
+ private final static Logger mLog = LoggerFactory.getLogger(BroadcastFactory.class);
public static final int MP3_MONO_16_KHZ_BITRATE = 16;
public static final boolean MP3_CONSTANT_BITRATE = false;
/**
* Creates an audio streaming broadcaster for the configuration
- * @param threadPoolManager for creating an audio broadcasting connection thread
+ *
* @param configuration describing the server and audio types
* @return configured broadcaster or null
*/
- public static AudioBroadcaster getBroadcaster(ThreadPoolManager threadPoolManager,
- BroadcastConfiguration configuration)
+ public static AudioBroadcaster getBroadcaster(BroadcastConfiguration configuration)
{
if(configuration != null)
{
@@ -74,20 +71,15 @@ public class BroadcastFactory
switch(configuration.getBroadcastServerType())
{
case BROADCASTIFY:
- return new IcecastTCPAudioBroadcaster(threadPoolManager,
- (BroadcastifyConfiguration)configuration);
+ return new IcecastTCPAudioBroadcaster((BroadcastifyConfiguration) configuration);
case ICECAST_TCP:
- return new IcecastTCPAudioBroadcaster(threadPoolManager,
- (IcecastTCPConfiguration)configuration);
+ return new IcecastTCPAudioBroadcaster((IcecastTCPConfiguration) configuration);
case ICECAST_HTTP:
- return new IcecastHTTPAudioBroadcaster(threadPoolManager,
- (IcecastHTTPConfiguration)configuration);
+ return new IcecastHTTPAudioBroadcaster((IcecastHTTPConfiguration) configuration);
case SHOUTCAST_V1:
- return new ShoutcastV1AudioBroadcaster(threadPoolManager,
- (ShoutcastV1Configuration)configuration);
+ return new ShoutcastV1AudioBroadcaster((ShoutcastV1Configuration) configuration);
case SHOUTCAST_V2:
- return new ShoutcastV2AudioBroadcaster(threadPoolManager,
- (ShoutcastV2Configuration)configuration);
+ return new ShoutcastV2AudioBroadcaster((ShoutcastV2Configuration) configuration);
case UNKNOWN:
default:
mLog.info("Unrecognized broadcastAudio configuration: " + configuration.getBroadcastFormat().name());
@@ -101,6 +93,7 @@ public class BroadcastFactory
/**
* Creates an audio convert to convert from 8 kHz PCM audio to the specified format
+ *
* @param configuration containing the requested output audio format
* @return audio convert or null
*/
@@ -149,6 +142,7 @@ public class BroadcastFactory
/**
* Constructs an editor for the specified broadcastAudio configuration
+ *
* @param configuration to modify or view
* @param broadcastModel model for broadcastAudio configurations
* @return an editor for the specified broadcastAudio configuration
@@ -160,10 +154,10 @@ public class BroadcastFactory
{
Editor editor;
- switch (configuration.getBroadcastServerType())
+ switch(configuration.getBroadcastServerType())
{
case BROADCASTIFY:
- editor = new BroadcastifyConfigurationEditor(broadcastModel, aliasModel, iconManager);
+ editor = new BroadcastifyConfigurationEditor(broadcastModel, aliasModel, iconManager);
break;
case ICECAST_TCP:
editor = new IcecastTCPConfigurationEditor(broadcastModel, aliasModel, iconManager);
@@ -192,7 +186,7 @@ public class BroadcastFactory
*/
public static AudioRecorder getAudioRecorder(Path path, BroadcastFormat broadcastFormat)
{
- switch (broadcastFormat)
+ switch(broadcastFormat)
{
case MP3:
return new MP3Recorder(path);
@@ -204,7 +198,7 @@ public class BroadcastFactory
public static ISilenceGenerator getSilenceGenerator(BroadcastFormat format)
{
- switch (format)
+ switch(format)
{
case MP3:
return new MP3SilenceGenerator();
diff --git a/src/audio/broadcast/BroadcastModel.java b/src/audio/broadcast/BroadcastModel.java
index ad79cf9a..d4b449bf 100644
--- a/src/audio/broadcast/BroadcastModel.java
+++ b/src/audio/broadcast/BroadcastModel.java
@@ -21,13 +21,13 @@ package audio.broadcast;
import alias.id.broadcast.BroadcastChannel;
import audio.AudioPacket;
import channel.metadata.Metadata;
-import controller.ThreadPoolManager;
import icon.IconManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import sample.Broadcaster;
import sample.Listener;
+import util.ThreadPool;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
@@ -66,7 +66,6 @@ public class BroadcastModel extends AbstractTableModel implements Listener mBroadcastConfigurationMap = new HashMap<>();
private Map mBroadcasterMap = new HashMap<>();
- private ThreadPoolManager mThreadPoolManager;
private IconManager mIconManager;
private StreamManager mStreamManager;
private Broadcaster mBroadcastEventBroadcaster = new Broadcaster<>();
@@ -74,17 +73,16 @@ public class BroadcastModel extends AbstractTableModel implements Listener
private static AtomicInteger sNextRecordingNumber = new AtomicInteger();
- private ThreadPoolManager mThreadPoolManager;
private Listener mAudioRecordingListener;
private BroadcastFormat mBroadcastFormat;
private Path mTempDirectory;
@@ -61,17 +60,13 @@ public class StreamManager implements Listener
*
* Completed streamable audio recordings are nominated to the output listener (for broadcast) upon completion
*
- * @param threadPoolManager for scheduling runnables
* @param listener to receive completed audio recordings
* @param tempDirectory where to store temporary audio recordings
*/
- public StreamManager(ThreadPoolManager threadPoolManager, Listener listener,
- BroadcastFormat broadcastFormat, Path tempDirectory)
+ public StreamManager(Listener listener, BroadcastFormat broadcastFormat, Path tempDirectory)
{
assert (tempDirectory != null && Files.isDirectory(tempDirectory));
- assert (mThreadPoolManager != null);
- mThreadPoolManager = threadPoolManager;
mAudioRecordingListener = listener;
mBroadcastFormat = broadcastFormat;
mTempDirectory = tempDirectory;
@@ -90,8 +85,8 @@ public class StreamManager implements Listener
mRecorderMonitor = new RecorderMonitor();
}
- mRecorderMonitorFuture = mThreadPoolManager.scheduleFixedRate(ThreadPoolManager.ThreadType.AUDIO_PROCESSING,
- mRecorderMonitor, 2, TimeUnit.SECONDS);
+ mRecorderMonitorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(mRecorderMonitor,
+ 0,2, TimeUnit.SECONDS);
}
}
@@ -145,7 +140,7 @@ public class StreamManager implements Listener
{
AudioRecorder recorder = BroadcastFactory.getAudioRecorder(getTemporaryRecordingPath(),
mBroadcastFormat);
- recorder.start(mThreadPoolManager.getScheduledExecutorService());
+ recorder.start(ThreadPool.SCHEDULED);
recorder.receive(audioPacket);
mStreamRecorders.put(channelMetadataID, recorder);
}
diff --git a/src/audio/broadcast/icecast/IcecastAudioBroadcaster.java b/src/audio/broadcast/icecast/IcecastAudioBroadcaster.java
index e7d7ed85..60b6f1b2 100644
--- a/src/audio/broadcast/icecast/IcecastAudioBroadcaster.java
+++ b/src/audio/broadcast/icecast/IcecastAudioBroadcaster.java
@@ -21,15 +21,14 @@ package audio.broadcast.icecast;
import audio.broadcast.AudioBroadcaster;
import audio.broadcast.BroadcastConfiguration;
import audio.broadcast.IBroadcastMetadataUpdater;
-import controller.ThreadPoolManager;
public abstract class IcecastAudioBroadcaster extends AudioBroadcaster
{
private IBroadcastMetadataUpdater mMetadataUpdater;
- public IcecastAudioBroadcaster(ThreadPoolManager threadPoolManager, BroadcastConfiguration broadcastConfiguration)
+ public IcecastAudioBroadcaster(BroadcastConfiguration broadcastConfiguration)
{
- super(threadPoolManager, broadcastConfiguration);
+ super(broadcastConfiguration);
}
/**
@@ -37,7 +36,7 @@ public abstract class IcecastAudioBroadcaster extends AudioBroadcaster
*/
protected IcecastConfiguration getConfiguration()
{
- return (IcecastConfiguration)getBroadcastConfiguration();
+ return (IcecastConfiguration) getBroadcastConfiguration();
}
@Override
@@ -45,7 +44,7 @@ public abstract class IcecastAudioBroadcaster extends AudioBroadcaster
{
if(mMetadataUpdater == null)
{
- mMetadataUpdater = new IcecastBroadcastMetadataUpdater(getThreadPoolManager(), getConfiguration());
+ mMetadataUpdater = new IcecastBroadcastMetadataUpdater(getConfiguration());
}
return mMetadataUpdater;
diff --git a/src/audio/broadcast/icecast/IcecastBroadcastMetadataUpdater.java b/src/audio/broadcast/icecast/IcecastBroadcastMetadataUpdater.java
index dafde211..e7e7c2f4 100644
--- a/src/audio/broadcast/icecast/IcecastBroadcastMetadataUpdater.java
+++ b/src/audio/broadcast/icecast/IcecastBroadcastMetadataUpdater.java
@@ -20,7 +20,6 @@ package audio.broadcast.icecast;
import audio.broadcast.IBroadcastMetadataUpdater;
import channel.metadata.Metadata;
-import controller.ThreadPoolManager;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
@@ -33,6 +32,7 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
+import util.ThreadPool;
import java.io.UnsupportedEncodingException;
import java.net.ConnectException;
@@ -50,7 +50,6 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
private final static Logger mLog = LoggerFactory.getLogger(IcecastBroadcastMetadataUpdater.class);
private final static String UTF8 = "UTF-8";
- private ThreadPoolManager mThreadPoolManager;
private IcecastConfiguration mIcecastConfiguration;
private NioSocketConnector mSocketConnector;
@@ -65,9 +64,8 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
* broadcaster. When multiple metadata updates are received prior to completion of the current ongoing update
* sequence, those updates will be queued and processed in the order received.
*/
- public IcecastBroadcastMetadataUpdater(ThreadPoolManager threadPoolManager, IcecastConfiguration icecastConfiguration)
+ public IcecastBroadcastMetadataUpdater(IcecastConfiguration icecastConfiguration)
{
- mThreadPoolManager = threadPoolManager;
mIcecastConfiguration = icecastConfiguration;
}
@@ -128,7 +126,7 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
if(updateRequest != null)
{
- mThreadPoolManager.scheduleOnce(new Runnable()
+ ThreadPool.SCHEDULED.schedule(new Runnable()
{
@Override
public void run()
diff --git a/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java b/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
index d40f9e32..2825395f 100644
--- a/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
+++ b/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
@@ -20,7 +20,6 @@ package audio.broadcast.icecast;
import audio.broadcast.BroadcastState;
import audio.convert.MP3AudioConverter;
-import controller.ThreadPoolManager;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
@@ -38,6 +37,7 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
+import util.ThreadPool;
import java.net.ConnectException;
import java.net.InetSocketAddress;
@@ -48,12 +48,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
{
- private static final Logger mLog = LoggerFactory.getLogger( IcecastHTTPAudioBroadcaster.class );
+ private static final Logger mLog = LoggerFactory.getLogger(IcecastHTTPAudioBroadcaster.class);
private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
private NioSocketConnector mSocketConnector;
private IoSession mStreamingSession = null;
- private Map mHTTPHeaders;
+ private Map mHTTPHeaders;
private long mLastConnectionAttempt = 0;
private AtomicBoolean mConnecting = new AtomicBoolean();
@@ -69,9 +69,9 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
*
* @param configuration for the Icecast stream
*/
- public IcecastHTTPAudioBroadcaster(ThreadPoolManager threadPoolManager, IcecastHTTPConfiguration configuration)
+ public IcecastHTTPAudioBroadcaster(IcecastHTTPConfiguration configuration)
{
- super(threadPoolManager, configuration);
+ super(configuration);
}
/**
@@ -101,7 +101,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
private boolean connect()
{
if(!connected() && canConnect() &&
- (mLastConnectionAttempt + RECONNECT_INTERVAL_MILLISECONDS < System.currentTimeMillis()) &&
+ (mLastConnectionAttempt + RECONNECT_INTERVAL_MILLISECONDS < System.currentTimeMillis()) &&
mConnecting.compareAndSet(false, true))
{
mLastConnectionAttempt = System.currentTimeMillis();
@@ -159,7 +159,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
}
};
- getThreadPoolManager().scheduleOnce(runnable, 0l, TimeUnit.SECONDS);
+ ThreadPool.SCHEDULED.schedule(runnable, 0l, TimeUnit.SECONDS);
}
@@ -264,10 +264,10 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
{
if(throwable instanceof ProtocolDecoderException)
{
- Throwable cause = ((ProtocolDecoderException)throwable).getCause();
+ Throwable cause = ((ProtocolDecoderException) throwable).getCause();
if(cause instanceof HttpException &&
- ((HttpException)cause).getStatusCode() == HttpStatus.CLIENT_ERROR_LENGTH_REQUIRED.code())
+ ((HttpException) cause).getStatusCode() == HttpStatus.CLIENT_ERROR_LENGTH_REQUIRED.code())
{
//Ignore - Icecast 2.4 sometimes doesn't send any headers with their HTTP responses. Mina expects a
//content-length for HTTP responses.
@@ -294,7 +294,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
{
if(object instanceof DefaultHttpResponse)
{
- DefaultHttpResponse response = (DefaultHttpResponse)object;
+ DefaultHttpResponse response = (DefaultHttpResponse) object;
switch(response.getStatus())
{
@@ -322,7 +322,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
else
{
mLog.error("Icecast HTTP broadcaster - unrecognized message [ " + object.getClass() +
- "] received:" + object.toString());
+ "] received:" + object.toString());
}
}
}
diff --git a/src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java b/src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
index 693ad674..f6d7c783 100644
--- a/src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
+++ b/src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
@@ -21,7 +21,6 @@ package audio.broadcast.icecast;
import audio.broadcast.BroadcastState;
import audio.broadcast.icecast.codec.IcecastCodecFactory;
import audio.convert.MP3AudioConverter;
-import controller.ThreadPoolManager;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoHandlerAdapter;
@@ -31,6 +30,7 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
+import util.ThreadPool;
import java.io.IOException;
import java.net.ConnectException;
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
{
- private final static Logger mLog = LoggerFactory.getLogger( IcecastTCPAudioBroadcaster.class );
+ private final static Logger mLog = LoggerFactory.getLogger(IcecastTCPAudioBroadcaster.class);
private final static String TERMINATOR = "\r\n";
private final static String SEPARATOR = ":";
private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
@@ -62,9 +62,9 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
*
* @param configuration for the Icecast stream
*/
- public IcecastTCPAudioBroadcaster(ThreadPoolManager threadPoolManager, IcecastTCPConfiguration configuration)
+ public IcecastTCPAudioBroadcaster(IcecastTCPConfiguration configuration)
{
- super(threadPoolManager, configuration);
+ super(configuration);
}
/**
@@ -90,7 +90,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
private boolean connect()
{
if(!connected() && canConnect() &&
- (mLastConnectionAttempt + RECONNECT_INTERVAL_MILLISECONDS < System.currentTimeMillis()) &&
+ (mLastConnectionAttempt + RECONNECT_INTERVAL_MILLISECONDS < System.currentTimeMillis()) &&
mConnecting.compareAndSet(false, true))
{
mLastConnectionAttempt = System.currentTimeMillis();
@@ -149,8 +149,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
}
};
- getThreadPoolManager().scheduleOnce(runnable, 0l, TimeUnit.SECONDS);
-
+ ThreadPool.SCHEDULED.schedule(runnable, 0l, TimeUnit.SECONDS);
}
return connected();
@@ -241,9 +240,9 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
@Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception
{
- if(cause instanceof IOException && ((IOException)cause).getMessage().startsWith("Connection reset"))
+ if(cause instanceof IOException && ((IOException) cause).getMessage().startsWith("Connection reset"))
{
- IOException ioe = (IOException)cause;
+ IOException ioe = (IOException) cause;
if(ioe.getMessage() != null && ioe.getMessage().startsWith("Connection reset"))
{
@@ -271,7 +270,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
{
if(object instanceof String)
{
- String message = (String)object;
+ String message = (String) object;
if(message != null && !message.trim().isEmpty())
{
diff --git a/src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java b/src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java
index 8c031150..637a721e 100644
--- a/src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java
+++ b/src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java
@@ -21,7 +21,6 @@ package audio.broadcast.shoutcast.v1;
import audio.broadcast.AudioBroadcaster;
import audio.broadcast.BroadcastState;
import audio.broadcast.IBroadcastMetadataUpdater;
-import controller.ThreadPoolManager;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
@@ -32,6 +31,7 @@ import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import util.ThreadPool;
import java.io.IOException;
import java.net.ConnectException;
@@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
{
- private final static Logger mLog = LoggerFactory.getLogger( ShoutcastV1AudioBroadcaster.class );
+ private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV1AudioBroadcaster.class);
private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
private NioSocketConnector mSocketConnector;
@@ -61,9 +61,9 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
*
* @param configuration for the Shoutcast stream
*/
- public ShoutcastV1AudioBroadcaster(ThreadPoolManager threadPoolManager, ShoutcastV1Configuration configuration)
+ public ShoutcastV1AudioBroadcaster(ShoutcastV1Configuration configuration)
{
- super(threadPoolManager, configuration);
+ super(configuration);
}
/**
@@ -71,7 +71,7 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
*/
private ShoutcastV1Configuration getConfiguration()
{
- return (ShoutcastV1Configuration)getBroadcastConfiguration();
+ return (ShoutcastV1Configuration) getBroadcastConfiguration();
}
@Override
@@ -79,7 +79,7 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
{
if(mMetadataUpdater == null)
{
- mMetadataUpdater = new ShoutcastV1BroadcastMetadataUpdater(getThreadPoolManager(), getConfiguration());
+ mMetadataUpdater = new ShoutcastV1BroadcastMetadataUpdater(getConfiguration());
}
return mMetadataUpdater;
@@ -111,7 +111,7 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
private boolean connect()
{
if(!connected() && canConnect() &&
- (mLastConnectionAttempt + RECONNECT_INTERVAL_MILLISECONDS < System.currentTimeMillis()) &&
+ (mLastConnectionAttempt + RECONNECT_INTERVAL_MILLISECONDS < System.currentTimeMillis()) &&
mConnecting.compareAndSet(false, true))
{
mLastConnectionAttempt = System.currentTimeMillis();
@@ -171,8 +171,7 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
}
};
- getThreadPoolManager().scheduleOnce(runnable, 0l, TimeUnit.SECONDS);
-
+ ThreadPool.SCHEDULED.schedule(runnable, 0l, TimeUnit.SECONDS);
}
return connected();
@@ -242,9 +241,9 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
@Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception
{
- if(cause instanceof IOException && ((IOException)cause).getMessage().startsWith("Connection reset"))
+ if(cause instanceof IOException && ((IOException) cause).getMessage().startsWith("Connection reset"))
{
- IOException ioe = (IOException)cause;
+ IOException ioe = (IOException) cause;
if(ioe.getMessage() != null && ioe.getMessage().startsWith("Connection reset"))
{
@@ -272,7 +271,7 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
{
if(object instanceof String)
{
- String message = (String)object;
+ String message = (String) object;
if(message != null && !message.trim().isEmpty())
{
diff --git a/src/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java b/src/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java
index 4c1de743..6ef77c33 100644
--- a/src/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java
+++ b/src/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java
@@ -20,7 +20,6 @@ package audio.broadcast.shoutcast.v1;
import audio.broadcast.IBroadcastMetadataUpdater;
import channel.metadata.Metadata;
-import controller.ThreadPoolManager;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
@@ -32,6 +31,7 @@ import org.apache.mina.http.api.HttpVersion;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import util.ThreadPool;
import java.io.UnsupportedEncodingException;
import java.net.ConnectException;
@@ -49,7 +49,6 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV1BroadcastMetadataUpdater.class);
private final static String UTF8 = "UTF-8";
- private ThreadPoolManager mThreadPoolManager;
private ShoutcastV1Configuration mShoutcastV1Configuration;
private NioSocketConnector mSocketConnector;
@@ -63,9 +62,8 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
* broadcaster. When multiple metadata updates are received prior to completion of the current ongoing update
* sequence, those updates will be queued and processed in the order received.
*/
- public ShoutcastV1BroadcastMetadataUpdater(ThreadPoolManager threadPoolManager, ShoutcastV1Configuration shoutcastV1Configuration)
+ public ShoutcastV1BroadcastMetadataUpdater(ShoutcastV1Configuration shoutcastV1Configuration)
{
- mThreadPoolManager = threadPoolManager;
mShoutcastV1Configuration = shoutcastV1Configuration;
}
@@ -127,7 +125,7 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
if(updateRequest != null)
{
- mThreadPoolManager.scheduleOnce(new Runnable()
+ ThreadPool.SCHEDULED.schedule(new Runnable()
{
@Override
public void run()
diff --git a/src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java b/src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java
index 85add863..95e2c6c1 100644
--- a/src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java
+++ b/src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java
@@ -38,7 +38,6 @@ import audio.broadcast.shoutcast.v2.ultravox.UltravoxMessageType;
import audio.broadcast.shoutcast.v2.ultravox.UltravoxMetadata;
import audio.broadcast.shoutcast.v2.ultravox.UltravoxProtocolFactory;
import channel.metadata.Metadata;
-import controller.ThreadPoolManager;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoHandlerAdapter;
@@ -48,6 +47,7 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
+import util.ThreadPool;
import java.io.IOException;
import java.net.ConnectException;
@@ -81,12 +81,11 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
* This broadcaster uses the Apache Mina library for the streaming socket connection. The
* ShoutcastV2IOHandler manages all interaction with the Shoutcast server and manages the overall broadcast state.
*
- * @param threadPoolManager for thread pool access
* @param configuration for the Shoutcast V2 stream
*/
- public ShoutcastV2AudioBroadcaster(ThreadPoolManager threadPoolManager, ShoutcastV2Configuration configuration)
+ public ShoutcastV2AudioBroadcaster(ShoutcastV2Configuration configuration)
{
- super(threadPoolManager, configuration);
+ super(configuration);
}
public ShoutcastV2Configuration getConfiguration()
@@ -207,8 +206,7 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
}
};
- getThreadPoolManager().scheduleOnce(runnable, 0l, TimeUnit.SECONDS);
-
+ ThreadPool.SCHEDULED.schedule(runnable, 0l, TimeUnit.SECONDS);
}
return connected();
diff --git a/src/audio/output/AudioOutput.java b/src/audio/output/AudioOutput.java
index 896fbd50..f27dd8b3 100644
--- a/src/audio/output/AudioOutput.java
+++ b/src/audio/output/AudioOutput.java
@@ -22,13 +22,12 @@ import audio.AudioEvent;
import audio.AudioPacket;
import audio.AudioPacket.Type;
import channel.metadata.Metadata;
-import controller.ThreadPoolManager;
-import controller.ThreadPoolManager.ThreadType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Broadcaster;
import sample.Listener;
import source.mixer.MixerChannel;
+import util.ThreadPool;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.BooleanControl;
@@ -59,7 +58,6 @@ public abstract class AudioOutput implements Listener, LineListener
private Listener mMetadataListener;
private Broadcaster mAudioEventBroadcaster = new Broadcaster<>();
- private ThreadPoolManager mThreadPoolManager;
private ScheduledFuture mProcessorTask;
private SourceDataLine mOutput;
@@ -82,21 +80,18 @@ public abstract class AudioOutput implements Listener, LineListener
* Maintains an internal non-blocking audio packet queue and processes this
* queue 25 times a second (every 40 ms).
*
- * @param threadPoolManager for assigning buffer processing schedule task
* @param mixer to obtain source data line
* @param mixerChannel either mono or left/right stereo
* @param audioFormat to use during playback
* @param lineInfo to use when obtaining the source data line
* @param requestedBufferSize of approximately 1 second of audio
*/
- public AudioOutput(ThreadPoolManager threadPoolManager,
- Mixer mixer,
+ public AudioOutput(Mixer mixer,
MixerChannel mixerChannel,
AudioFormat audioFormat,
Line.Info lineInfo,
int requestedBufferSize)
{
- mThreadPoolManager = threadPoolManager;
mMixer = mixer;
mMixerChannel = mixerChannel;
@@ -141,9 +136,8 @@ public abstract class AudioOutput implements Listener, LineListener
}
/* Run the queue processor task every 40 milliseconds or 25 times a second */
- mProcessorTask = mThreadPoolManager.scheduleFixedRate(
- ThreadType.AUDIO_PROCESSING, new BufferProcessor(),
- 40, TimeUnit.MILLISECONDS);
+ mProcessorTask = ThreadPool.SCHEDULED.scheduleAtFixedRate(new BufferProcessor(),
+ 0, 40, TimeUnit.MILLISECONDS);
}
mAudioStartEvent = new AudioEvent(AudioEvent.Type.AUDIO_STARTED,
@@ -170,12 +164,11 @@ public abstract class AudioOutput implements Listener, LineListener
{
mCanProcessAudio = false;
- if(mProcessorTask != null && mThreadPoolManager != null)
+ if(mProcessorTask != null)
{
- mThreadPoolManager.cancel(mProcessorTask);
+ mProcessorTask.cancel(true);
}
- mThreadPoolManager = null;
mProcessorTask = null;
mBuffer.clear();
diff --git a/src/audio/output/MonoAudioOutput.java b/src/audio/output/MonoAudioOutput.java
index a217c192..c8c7c267 100644
--- a/src/audio/output/MonoAudioOutput.java
+++ b/src/audio/output/MonoAudioOutput.java
@@ -1,74 +1,67 @@
/*******************************************************************************
- * SDR Trunk
- * Copyright (C) 2014-2016 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see ,ThreadType> mTasks =
- new HashMap,ThreadType>();
-
- private ScheduledExecutorService mExecutor;
-
- public ThreadPoolManager()
- {
- }
-
- public ScheduledExecutorService getScheduledExecutorService()
- {
- if( mExecutor == null )
- {
- mExecutor = Executors.newScheduledThreadPool( THREAD_POOL_SIZE,
- new NamingThreadFactory( "sdrtrunk" ) );
- }
-
- return mExecutor;
- }
-
- public ScheduledFuture scheduleFixedRate( ThreadType type,
- Runnable command,
- long period,
- TimeUnit unit )
- throws RejectedExecutionException
- {
- ScheduledExecutorService executorService = getScheduledExecutorService();
-
- ScheduledFuture task =
- executorService.scheduleAtFixedRate( command, 0, period, unit );
-
- mTasks.put( task, type );
-
- return task;
- }
-
- public void scheduleOnce( Runnable command, long delay, TimeUnit unit )
- throws RejectedExecutionException
- {
- ScheduledExecutorService executorService = getScheduledExecutorService();
-
- executorService.schedule( command, delay, unit );
- }
-
- public boolean cancel( ScheduledFuture task )
- {
- boolean success = task.cancel( true );
-
- mTasks.remove( task );
-
- return success;
- }
-
- public int getTaskCount( ThreadType type )
- {
- int count = 0;
-
- for( ThreadType current: mTasks.values() )
- {
- if( current == type )
- {
- count++;
- }
- }
-
- return count;
- }
-
- public enum ThreadType
- {
- AUDIO_PROCESSING,
- AUDIO_RECORDING,
- BASEBAND_RECORDING,
- SOURCE_SAMPLE_PROCESSING,
- DECIMATION,
- DECODER;
- }
-}
diff --git a/src/gui/SDRTrunk.java b/src/gui/SDRTrunk.java
index 720a7faa..401067f6 100644
--- a/src/gui/SDRTrunk.java
+++ b/src/gui/SDRTrunk.java
@@ -1,19 +1,20 @@
/*******************************************************************************
- * SDR Trunk
- * Copyright (C) 2014-2016 Dennis Sheirer
+ * sdrtrunk
+ * Copyright (C) 2014-2017 Dennis Sheirer
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
{
@@ -80,26 +78,28 @@ public class SDRTrunk implements Listener
private String mTitle;
- private boolean mLogChannelAndMemoryUsage = false;
-
public SDRTrunk()
{
- mLog.info("");
mLog.info("");
mLog.info("*******************************************************************");
mLog.info("**** sdrtrunk: a trunked radio and digital decoding application ***");
mLog.info("**** website: https://github.com/dsheirer/sdrtrunk ***");
mLog.info("*******************************************************************");
mLog.info("");
- mLog.info("");
+ mLog.info("Host CPU Cores: " + Runtime.getRuntime().availableProcessors());
+ mLog.info("Host Memory Total: " + Runtime.getRuntime().totalMemory());
+ mLog.info("Host Memory Max: " + Runtime.getRuntime().maxMemory());
+ mLog.info("Host Memory Free: " + Runtime.getRuntime().freeMemory());
//Setup the application home directory
Path home = getHomePath();
+ ThreadPool.logSettings();
+
mLog.info("Home path: " + home.toString());
//Load properties file
- if (home != null)
+ if(home != null)
{
loadProperties(home);
}
@@ -110,11 +110,9 @@ public class SDRTrunk implements Listener
TunerConfigurationModel tunerConfigurationModel = new TunerConfigurationModel();
TunerModel tunerModel = new TunerModel(tunerConfigurationModel);
- ThreadPoolManager threadPoolManager = new ThreadPoolManager();
+ mIconManager = new IconManager();
- mIconManager = new IconManager(threadPoolManager);
-
- mSettingsManager = new SettingsManager(threadPoolManager, tunerConfigurationModel);
+ mSettingsManager = new SettingsManager(tunerConfigurationModel);
AliasModel aliasModel = new AliasModel();
@@ -124,28 +122,27 @@ public class SDRTrunk implements Listener
EventLogManager eventLogManager = new EventLogManager();
- RecorderManager recorderManager = new RecorderManager(threadPoolManager);
+ RecorderManager recorderManager = new RecorderManager();
- SourceManager sourceManager = new SourceManager(tunerModel,
- mSettingsManager, threadPoolManager);
+ SourceManager sourceManager = new SourceManager(tunerModel, mSettingsManager);
ChannelProcessingManager channelProcessingManager = new ChannelProcessingManager(
- channelModel, channelMapModel, aliasModel, eventLogManager, recorderManager, sourceManager);
+ channelModel, channelMapModel, aliasModel, eventLogManager, recorderManager, sourceManager);
channelProcessingManager.addAudioPacketListener(recorderManager);
channelModel.addListener(channelProcessingManager);
ChannelSelectionManager channelSelectionManager =
- new ChannelSelectionManager(channelModel);
+ new ChannelSelectionManager(channelModel);
channelModel.addListener(channelSelectionManager);
- AliasActionManager aliasActionManager = new AliasActionManager(threadPoolManager);
+ AliasActionManager aliasActionManager = new AliasActionManager();
channelProcessingManager.addMessageListener(aliasActionManager);
- AudioManager audioManager = new AudioManager(threadPoolManager, sourceManager.getMixerManager());
+ AudioManager audioManager = new AudioManager(sourceManager.getMixerManager());
channelProcessingManager.addAudioPacketListener(audioManager);
- mBroadcastModel = new BroadcastModel(threadPoolManager, mIconManager);
+ mBroadcastModel = new BroadcastModel(mIconManager);
channelProcessingManager.addAudioPacketListener(mBroadcastModel);
@@ -153,31 +150,23 @@ public class SDRTrunk implements Listener
channelProcessingManager.addMessageListener(mapService);
mControllerPanel = new ControllerPanel(audioManager, aliasModel, mBroadcastModel,
- channelModel, channelMapModel, channelProcessingManager, mIconManager,
- mapService, mSettingsManager, sourceManager, tunerModel);
+ channelModel, channelMapModel, channelProcessingManager, mIconManager,
+ mapService, mSettingsManager, sourceManager, tunerModel);
mSpectralPanel = new SpectralDisplayPanel(channelModel,
- channelProcessingManager, mSettingsManager);
+ channelProcessingManager, mSettingsManager);
TunerSpectralDisplayManager tunerSpectralDisplayManager =
- new TunerSpectralDisplayManager(mSpectralPanel,
- channelModel, channelProcessingManager, mSettingsManager);
+ new TunerSpectralDisplayManager(mSpectralPanel,
+ channelModel, channelProcessingManager, mSettingsManager);
tunerModel.addListener(tunerSpectralDisplayManager);
tunerModel.addListener(this);
- PlaylistManager playlistManager = new PlaylistManager(threadPoolManager,
- aliasModel, mBroadcastModel, channelModel, channelMapModel);
+ PlaylistManager playlistManager = new PlaylistManager(aliasModel, mBroadcastModel, channelModel,
+ channelMapModel);
playlistManager.init();
- if (mLogChannelAndMemoryUsage)
- {
- Runnable cml = new ChannelMemoryLogger();
- channelModel.addListener((ChannelEventListener) cml);
- threadPoolManager.scheduleFixedRate(
- ThreadType.DECODER, cml, 5, TimeUnit.SECONDS);
- }
-
mLog.info("starting main application gui");
//Initialize the GUI
@@ -194,7 +183,7 @@ public class SDRTrunk implements Listener
{
mMainGui.setVisible(true);
}
- catch (Exception e)
+ catch(Exception e)
{
e.printStackTrace();
}
@@ -263,15 +252,15 @@ public class SDRTrunk implements Listener
{
Desktop.getDesktop().open(getHomePath().toFile());
}
- catch (Exception e)
+ catch(Exception e)
{
mLog.error("Couldn't open file explorer");
JOptionPane.showMessageDialog(mMainGui,
- "Can't launch file explorer - files are located at: " +
- getHomePath().toString(),
- "Can't launch file explorer",
- JOptionPane.ERROR_MESSAGE);
+ "Can't launch file explorer - files are located at: " +
+ getHomePath().toString(),
+ "Can't launch file explorer",
+ JOptionPane.ERROR_MESSAGE);
}
}
});
@@ -292,13 +281,13 @@ public class SDRTrunk implements Listener
JMenuItem exitMenu = new JMenuItem("Exit");
exitMenu.addActionListener(
- new ActionListener()
+ new ActionListener()
+ {
+ public void actionPerformed(ActionEvent event)
{
- public void actionPerformed(ActionEvent event)
- {
- System.exit(0);
- }
+ System.exit(0);
}
+ }
);
fileMenu.add(exitMenu);
@@ -313,7 +302,7 @@ public class SDRTrunk implements Listener
screenCaptureItem.setMnemonic(KeyEvent.VK_C);
screenCaptureItem.setAccelerator(
- KeyStroke.getKeyStroke(KeyEvent.VK_C, ActionEvent.ALT_MASK));
+ KeyStroke.getKeyStroke(KeyEvent.VK_C, ActionEvent.ALT_MASK));
screenCaptureItem.addActionListener(new ActionListener()
{
@@ -325,28 +314,28 @@ public class SDRTrunk implements Listener
Robot robot = new Robot();
final BufferedImage image =
- robot.createScreenCapture(mMainGui.getBounds());
+ robot.createScreenCapture(mMainGui.getBounds());
SystemProperties props = SystemProperties.getInstance();
Path capturePath = props.getApplicationFolder("screen_captures");
- if (!Files.exists(capturePath))
+ if(!Files.exists(capturePath))
{
try
{
Files.createDirectory(capturePath);
}
- catch (IOException e)
+ catch(IOException e)
{
mLog.error("Couldn't create 'screen_captures' "
- + "subdirectory in the " +
- "SDRTrunk application directory", e);
+ + "subdirectory in the " +
+ "SDRTrunk application directory", e);
}
}
String filename = TimeStamp.getTimeStamp("_") +
- "_screen_capture.png";
+ "_screen_capture.png";
final Path captureFile = capturePath.resolve(filename);
@@ -358,17 +347,17 @@ public class SDRTrunk implements Listener
try
{
ImageIO.write(image, "png",
- captureFile.toFile());
+ captureFile.toFile());
}
- catch (IOException e)
+ catch(IOException e)
{
mLog.error("Couldn't write screen capture to "
- + "file [" + captureFile.toString() + "]", e);
+ + "file [" + captureFile.toString() + "]", e);
}
}
});
}
- catch (AWTException e)
+ catch(AWTException e)
{
mLog.error("Exception while taking screen capture", e);
}
@@ -430,30 +419,30 @@ public class SDRTrunk implements Listener
{
Path propsPath = homePath.resolve("SDRTrunk.properties");
- if (!Files.exists(propsPath))
+ if(!Files.exists(propsPath))
{
try
{
mLog.info("SDRTrunk - creating application properties file [" +
- propsPath.toAbsolutePath() + "]");
+ propsPath.toAbsolutePath() + "]");
Files.createFile(propsPath);
}
- catch (IOException e)
+ catch(IOException e)
{
mLog.error("SDRTrunk - couldn't create application properties "
- + "file [" + propsPath.toAbsolutePath(), e);
+ + "file [" + propsPath.toAbsolutePath(), e);
}
}
- if (Files.exists(propsPath))
+ if(Files.exists(propsPath))
{
SystemProperties.getInstance().load(propsPath);
}
else
{
mLog.error("SDRTrunk - couldn't find or recreate the SDRTrunk " +
- "application properties file");
+ "application properties file");
}
}
@@ -466,23 +455,23 @@ public class SDRTrunk implements Listener
private Path getHomePath()
{
Path homePath = FileSystems.getDefault()
- .getPath(System.getProperty("user.home"), "SDRTrunk");
+ .getPath(System.getProperty("user.home"), "SDRTrunk");
- if (!Files.exists(homePath))
+ if(!Files.exists(homePath))
{
try
{
Files.createDirectory(homePath);
mLog.info("SDRTrunk - created application home directory [" +
- homePath.toString() + "]");
+ homePath.toString() + "]");
}
- catch (Exception e)
+ catch(Exception e)
{
homePath = null;
mLog.error("SDRTrunk: exception while creating SDRTrunk home " +
- "directory in the user's home directory", e);
+ "directory in the user's home directory", e);
}
}
@@ -492,7 +481,7 @@ public class SDRTrunk implements Listener
@Override
public void receive(TunerEvent event)
{
- if (event.getEvent() == TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY)
+ if(event.getEvent() == TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY)
{
mMainGui.setTitle(mTitle + " - " + event.getTuner().getName());
}
diff --git a/src/icon/IconManager.java b/src/icon/IconManager.java
index 5d61c1ac..ea29ee56 100644
--- a/src/icon/IconManager.java
+++ b/src/icon/IconManager.java
@@ -18,14 +18,12 @@
******************************************************************************/
package icon;
-import controller.ThreadPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
+import util.ThreadPool;
import javax.swing.*;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.xml.bind.JAXBContext;
@@ -54,16 +52,14 @@ public class IconManager
private Path mIconBackupFilePath;
private Path mIconLockFilePath;
- private ThreadPoolManager mThreadPoolManager;
private IconEditor mIconEditor;
private IconTableModel mIconTableModel;
private AtomicBoolean mSavingIcons = new AtomicBoolean();
- private Map mResizedIcons = new HashMap<>();
+ private Map mResizedIcons = new HashMap<>();
- public IconManager(ThreadPoolManager threadPoolManager)
+ public IconManager()
{
- mThreadPoolManager = threadPoolManager;
}
/**
@@ -412,7 +408,7 @@ public class IconManager
{
if(mSavingIcons.compareAndSet(false, true))
{
- mThreadPoolManager.scheduleOnce(new IconSaveTask(), 2, TimeUnit.SECONDS);
+ ThreadPool.SCHEDULED.schedule(new IconSaveTask(), 2, TimeUnit.SECONDS);
}
}
diff --git a/src/instrument/gui/DecoderSelectionFrame.java b/src/instrument/gui/DecoderSelectionFrame.java
index 23239335..c79ad61c 100644
--- a/src/instrument/gui/DecoderSelectionFrame.java
+++ b/src/instrument/gui/DecoderSelectionFrame.java
@@ -1,83 +1,77 @@
package instrument.gui;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JDesktopPane;
-import javax.swing.JInternalFrame;
-
+import alias.AliasModel;
import audio.broadcast.BroadcastModel;
+import controller.channel.ChannelModel;
+import controller.channel.map.ChannelMapModel;
import module.decode.DecodeConfigurationEditor;
import net.miginfocom.swing.MigLayout;
import playlist.PlaylistManager;
import source.IControllableFileSource;
-import alias.AliasModel;
-import controller.ThreadPoolManager;
-import controller.channel.ChannelModel;
-import controller.channel.map.ChannelMapModel;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class DecoderSelectionFrame extends JInternalFrame
{
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private DecodeConfigurationEditor mDecodeEditor = new DecodeConfigurationEditor( null );
- private PlaylistManager mPlaylistManager;
-
- private IControllableFileSource mSource;
- private JDesktopPane mDesktop;
-
- public DecoderSelectionFrame( JDesktopPane desktop,
- IControllableFileSource source )
- {
- ThreadPoolManager tpm = new ThreadPoolManager();
+ private DecodeConfigurationEditor mDecodeEditor = new DecodeConfigurationEditor(null);
+ private PlaylistManager mPlaylistManager;
- AliasModel aliasModel = new AliasModel();
- BroadcastModel broadcastModel = new BroadcastModel(tpm, null);
- ChannelModel channelModel = new ChannelModel();
- ChannelMapModel channelMapModel = new ChannelMapModel();
+ private IControllableFileSource mSource;
+ private JDesktopPane mDesktop;
- mPlaylistManager = new PlaylistManager( tpm, aliasModel, broadcastModel, channelModel, channelMapModel );
+ public DecoderSelectionFrame(JDesktopPane desktop,
+ IControllableFileSource source)
+ {
+ AliasModel aliasModel = new AliasModel();
+ BroadcastModel broadcastModel = new BroadcastModel(null);
+ ChannelModel channelModel = new ChannelModel();
+ ChannelMapModel channelMapModel = new ChannelMapModel();
- mDesktop = desktop;
- mSource = source;
-
- initGUI();
- }
-
- private void initGUI()
- {
- setLayout( new MigLayout( "", "[grow,fill]", "[][][grow,fill]" ) );
+ mPlaylistManager = new PlaylistManager(aliasModel, broadcastModel, channelModel, channelMapModel);
- setTitle( "Decoders" );
- setPreferredSize( new Dimension( 700, 450 ) );
- setSize( 700, 450 );
+ mDesktop = desktop;
+ mSource = source;
- setResizable( true );
- setClosable( true );
- setIconifiable( true );
- setMaximizable( false );
+ initGUI();
+ }
- add( mDecodeEditor, "wrap" );
-
- add( new AddDecoderButton(), "span" );
-
- }
-
- public class AddDecoderButton extends JButton
- {
- private static final long serialVersionUID = 1L;
+ private void initGUI()
+ {
+ setLayout(new MigLayout("", "[grow,fill]", "[][][grow,fill]"));
- public AddDecoderButton()
- {
- super( "Add" );
-
- addActionListener( new ActionListener()
- {
- @Override
- public void actionPerformed( ActionEvent arg0 )
- {
+ setTitle("Decoders");
+ setPreferredSize(new Dimension(700, 450));
+ setSize(700, 450);
+
+ setResizable(true);
+ setClosable(true);
+ setIconifiable(true);
+ setMaximizable(false);
+
+ add(mDecodeEditor, "wrap");
+
+ add(new AddDecoderButton(), "span");
+
+ }
+
+ public class AddDecoderButton extends JButton
+ {
+ private static final long serialVersionUID = 1L;
+
+ public AddDecoderButton()
+ {
+ super("Add");
+
+ addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent arg0)
+ {
// DecodeConfiguration config = mDecodeEditor.getDecodeConfig();
//
// if( config != null )
@@ -89,9 +83,9 @@ public class DecoderSelectionFrame extends JInternalFrame
//
// mDesktop.add( decoderFrame );
// }
- }
- } );
- }
- }
-
+ }
+ });
+ }
+ }
+
}
diff --git a/src/map/MapService.java b/src/map/MapService.java
index 38991881..a2150731 100644
--- a/src/map/MapService.java
+++ b/src/map/MapService.java
@@ -19,7 +19,6 @@
package map;
import alias.Alias;
-import controller.NamingThreadFactory;
import icon.IconManager;
import message.Message;
import sample.Listener;
@@ -28,9 +27,8 @@ import java.awt.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
public class MapService implements Listener
{
@@ -39,12 +37,7 @@ public class MapService implements Listener
private static final Color sDEFAULT_COLOR = Color.BLACK;
- private final ScheduledExecutorService scheduler =
- Executors.newScheduledThreadPool(1,
- new NamingThreadFactory("map tile fetcher"));
-
- private ArrayList mListeners =
- new ArrayList();
+ private List mListeners = new ArrayList();
private HashMap mEntities =
new HashMap();
diff --git a/src/module/ProcessingChain.java b/src/module/ProcessingChain.java
index 2adc84f6..d8a13e9a 100644
--- a/src/module/ProcessingChain.java
+++ b/src/module/ProcessingChain.java
@@ -34,7 +34,6 @@ import channel.state.DecoderStateEvent.Event;
import channel.state.IDecoderStateEventListener;
import channel.state.IDecoderStateEventProvider;
import channel.state.State;
-import controller.NamingThreadFactory;
import controller.channel.Channel.ChannelType;
import controller.channel.ChannelEvent;
import controller.channel.IChannelEventListener;
@@ -69,11 +68,10 @@ import source.tuner.TunerChannelSource;
import source.tuner.frequency.FrequencyChangeEvent;
import source.tuner.frequency.IFrequencyChangeListener;
import source.tuner.frequency.IFrequencyChangeProvider;
+import util.ThreadPool;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -110,7 +108,6 @@ public class ProcessingChain implements IChannelEventListener
private Broadcaster mUnFilteredRealBufferBroadcaster = new Broadcaster<>();
private Broadcaster mSquelchStateBroadcaster = new Broadcaster<>();
- private ScheduledExecutorService mScheduledExecutorService;
private String mName;
private AtomicBoolean mRunning = new AtomicBoolean();
@@ -170,9 +167,6 @@ public class ProcessingChain implements IChannelEventListener
mModules.clear();
- mScheduledExecutorService.shutdownNow();
- mScheduledExecutorService = null;
-
mAudioPacketBroadcaster.dispose();
mCallEventBroadcaster.dispose();
mChannelEventBroadcaster.dispose();
@@ -180,11 +174,6 @@ public class ProcessingChain implements IChannelEventListener
mMessageBroadcaster.dispose();
mFilteredRealBufferBroadcaster.dispose();
mSquelchStateBroadcaster.dispose();
-
- if(mScheduledExecutorService != null)
- {
- mScheduledExecutorService.shutdownNow();
- }
}
/**
@@ -584,18 +573,12 @@ public class ProcessingChain implements IChannelEventListener
}
}
- if(mScheduledExecutorService == null)
- {
- mScheduledExecutorService = Executors.newScheduledThreadPool(
- 1, new NamingThreadFactory("channel " + mName));
- }
-
/* Start each of the modules */
for(Module module : mModules)
{
try
{
- module.start(mScheduledExecutorService);
+ module.start(ThreadPool.SCHEDULED);
}
catch(Exception e)
{
@@ -603,7 +586,7 @@ public class ProcessingChain implements IChannelEventListener
}
}
- mSource.start(mScheduledExecutorService);
+ mSource.start(ThreadPool.SCHEDULED);
}
else
{
diff --git a/src/playlist/PlaylistManager.java b/src/playlist/PlaylistManager.java
index e04cc477..0b3f50b0 100644
--- a/src/playlist/PlaylistManager.java
+++ b/src/playlist/PlaylistManager.java
@@ -21,7 +21,6 @@ import alias.AliasEvent;
import alias.AliasModel;
import audio.broadcast.BroadcastEvent;
import audio.broadcast.BroadcastModel;
-import controller.ThreadPoolManager;
import controller.channel.Channel.ChannelType;
import controller.channel.ChannelEvent;
import controller.channel.ChannelEventListener;
@@ -33,6 +32,7 @@ import org.slf4j.LoggerFactory;
import playlist.version1.PlaylistConverterV1ToV2;
import properties.SystemProperties;
import sample.Listener;
+import util.ThreadPool;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -51,7 +51,6 @@ public class PlaylistManager implements ChannelEventListener
{
private final static Logger mLog = LoggerFactory.getLogger(PlaylistManager.class);
- private ThreadPoolManager mThreadPoolManager;
private AliasModel mAliasModel;
private BroadcastModel mBroadcastModel;
private ChannelModel mChannelModel;
@@ -72,16 +71,10 @@ public class PlaylistManager implements ChannelEventListener
* Monitors playlist changes to automatically save configuration changes
* after they occur.
*
- * @param threadPoolManager
* @param channelModel
*/
- public PlaylistManager(ThreadPoolManager threadPoolManager,
- AliasModel aliasModel,
- BroadcastModel broadcastModel,
- ChannelModel channelModel,
- ChannelMapModel channelMapModel)
+ public PlaylistManager(AliasModel aliasModel, BroadcastModel broadcastModel, ChannelModel channelModel, ChannelMapModel channelMapModel)
{
- mThreadPoolManager = threadPoolManager;
mAliasModel = aliasModel;
mBroadcastModel = broadcastModel;
mChannelModel = channelModel;
@@ -421,7 +414,7 @@ public class PlaylistManager implements ChannelEventListener
{
if(mPlaylistSavePending.compareAndSet(false, true))
{
- mThreadPoolManager.scheduleOnce(new PlaylistSaveTask(), 2, TimeUnit.SECONDS);
+ ThreadPool.SCHEDULED.schedule(new PlaylistSaveTask(), 2, TimeUnit.SECONDS);
}
}
}
diff --git a/src/properties/SystemProperties.java b/src/properties/SystemProperties.java
index aea40331..c34d2a0d 100644
--- a/src/properties/SystemProperties.java
+++ b/src/properties/SystemProperties.java
@@ -20,11 +20,11 @@ package properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import util.ThreadPool;
import java.awt.*;
import java.io.BufferedReader;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -34,8 +34,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -54,7 +52,6 @@ public class SystemProperties
private Path mPropertiesPath;
private String mApplicationName;
private AtomicBoolean mSavePending = new AtomicBoolean();
- private ScheduledExecutorService mScheduledExecutorService;
private SystemProperties()
{
@@ -83,12 +80,7 @@ public class SystemProperties
{
if(mSavePending.compareAndSet(false, true))
{
- if(mScheduledExecutorService == null)
- {
- mScheduledExecutorService = Executors.newScheduledThreadPool(1);
- }
-
- mScheduledExecutorService.schedule(new SavePropertiesTask(), 2, TimeUnit.SECONDS);
+ ThreadPool.SCHEDULED.schedule(new SavePropertiesTask(), 2, TimeUnit.SECONDS);
}
}
diff --git a/src/record/RecorderManager.java b/src/record/RecorderManager.java
index c42019bb..871fe914 100644
--- a/src/record/RecorderManager.java
+++ b/src/record/RecorderManager.java
@@ -19,13 +19,13 @@ package record;
import audio.AudioPacket;
import channel.metadata.Metadata;
-import controller.ThreadPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import record.wave.ComplexBufferWaveRecorder;
import record.wave.RealBufferWaveRecorder;
import sample.Listener;
+import util.ThreadPool;
import java.io.File;
import java.util.HashMap;
@@ -39,22 +39,18 @@ public class RecorderManager implements Listener
private Map mRecorders = new HashMap<>();
- private ThreadPoolManager mThreadPoolManager;
-
private boolean mCanStartNewRecorders = true;
/**
* Manages all audio recording for all processing channels. Reconstructs audio streams and distributes channel
* audio to each of the recorders, starting and stopping the recorders as needed.
*/
- public RecorderManager(ThreadPoolManager threadPoolManager)
+ public RecorderManager()
{
- mThreadPoolManager = threadPoolManager;
}
public void dispose()
{
- mThreadPoolManager = null;
}
@Override
@@ -91,7 +87,7 @@ public class RecorderManager implements Listener
{
recorder = new RealBufferWaveRecorder(AUDIO_SAMPLE_RATE, filePrefix);
- recorder.start(mThreadPoolManager.getScheduledExecutorService());
+ recorder.start(ThreadPool.SCHEDULED);
recorder.receive(audioPacket.getAudioBuffer());
mRecorders.put(identifier, recorder);
diff --git a/src/record/mp3/MP3Recorder.java b/src/record/mp3/MP3Recorder.java
index 747496ce..cc9dc7e8 100644
--- a/src/record/mp3/MP3Recorder.java
+++ b/src/record/mp3/MP3Recorder.java
@@ -19,37 +19,15 @@
package record.mp3;
import audio.AudioPacket;
-import audio.IAudioPacketListener;
-import audio.broadcast.BroadcastModel;
import audio.convert.MP3AudioConverter;
-import module.Module;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import properties.SystemProperties;
import record.AudioRecorder;
-import record.wave.AudioPacketMonoWaveReader;
-import sample.Listener;
-import util.TimeStamp;
-import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
/**
* MP3 recorder for converting 8 kHz PCM audio packets to MP3 and writing to .mp3 file.
diff --git a/src/settings/SettingsManager.java b/src/settings/SettingsManager.java
index 3906504b..87d65bce 100644
--- a/src/settings/SettingsManager.java
+++ b/src/settings/SettingsManager.java
@@ -17,7 +17,6 @@
******************************************************************************/
package settings;
-import controller.ThreadPoolManager;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +26,7 @@ import settings.ColorSetting.ColorSettingName;
import source.recording.RecordingConfiguration;
import source.tuner.configuration.TunerConfigurationEvent;
import source.tuner.configuration.TunerConfigurationModel;
+import util.ThreadPool;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -54,18 +54,15 @@ public class SettingsManager implements Listener
private Settings mSettings = new Settings();
private List mListeners = new ArrayList<>();
private TunerConfigurationModel mTunerConfigurationModel;
- private ThreadPoolManager mThreadPoolManager;
private boolean mLoadingSettings = false;
private AtomicBoolean mSettingsSavePending = new AtomicBoolean();
- public SettingsManager(ThreadPoolManager threadPoolManager,
- TunerConfigurationModel tunerConfigurationModel)
+ public SettingsManager(TunerConfigurationModel tunerConfigurationModel)
{
//TODO: move settings into a SettingsModel
//and update this class to only provide loading, saving, and model
//change detection producing a save.
- mThreadPoolManager = threadPoolManager;
mTunerConfigurationModel = tunerConfigurationModel;
//Register for tuner config events so that we can save the settings
@@ -481,8 +478,7 @@ public class SettingsManager implements Listener
{
if(mSettingsSavePending.compareAndSet(false, true))
{
- mThreadPoolManager.scheduleOnce(new SettingsSaveTask(),
- 2, TimeUnit.SECONDS);
+ ThreadPool.SCHEDULED.schedule(new SettingsSaveTask(), 2, TimeUnit.SECONDS);
}
}
}
diff --git a/src/source/SourceManager.java b/src/source/SourceManager.java
index cc010d06..182bbeb2 100644
--- a/src/source/SourceManager.java
+++ b/src/source/SourceManager.java
@@ -1,19 +1,20 @@
/*******************************************************************************
- * SDR Trunk
- * Copyright (C) 2014 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
+ implements IFrequencyChangeProcessor, Listener
{
- private final static Logger mLog =
- LoggerFactory.getLogger( TunerChannelSource.class );
-
- private static int CHANNEL_RATE = 48000;
- private static int CHANNEL_PASS_FREQUENCY = 12000;
-
- private LinkedTransferQueue mBuffer =
- new LinkedTransferQueue();
- private Tuner mTuner;
- private TunerChannel mTunerChannel;
- private Oscillator mMixer;
- private ComplexPrimeCICDecimate mDecimationFilter;
- private Listener mListener;
- private IFrequencyChangeProcessor mFrequencyChangeProcessor;
- private ScheduledFuture mTaskHandle;
+ private final static Logger mLog =
+ LoggerFactory.getLogger(TunerChannelSource.class);
- private long mTunerFrequency = 0;
- private int mTunerSampleRate;
- private int mChannelFrequencyCorrection = 0;
-
- private DecimationProcessor mDecimationProcessor = new DecimationProcessor();
-
- private AtomicBoolean mRunning = new AtomicBoolean();
- private boolean mExpended = false;
-
- /**
- * Provides a Digital Drop Channel (DDC) to decimate the IQ output from a
- * tuner down to a 48 kHz IQ channel rate.
- *
- * Note: this class can only be used once (started and stopped) and a new
- * tuner channel source must be requested from the tuner once this object
- * has been stopped. This is because channels are managed dynamically and
- * center tuned frequency may have changed since this source was obtained
- * and thus the tuner might no longer be able to source this channel once it
- * has been stopped.
- *
- * @param tuner to obtain wideband IQ samples from
- * @param tunerChannel specifying the center frequency for the DDC
- * @throws RejectedExecutionException if the thread pool manager cannot
- * accept the decimation processing task
- * @throws SourceException if the tuner has an issue providing IQ samples
- */
- public TunerChannelSource( Tuner tuner, TunerChannel tunerChannel )
- throws RejectedExecutionException, SourceException
+ private static int CHANNEL_RATE = 48000;
+ private static int CHANNEL_PASS_FREQUENCY = 12000;
+
+ private LinkedTransferQueue mBuffer =
+ new LinkedTransferQueue();
+ private Tuner mTuner;
+ private TunerChannel mTunerChannel;
+ private Oscillator mMixer;
+ private ComplexPrimeCICDecimate mDecimationFilter;
+ private Listener mListener;
+ private IFrequencyChangeProcessor mFrequencyChangeProcessor;
+ private ScheduledFuture mTaskHandle;
+
+ private long mTunerFrequency = 0;
+ private int mTunerSampleRate;
+ private int mChannelFrequencyCorrection = 0;
+
+ private DecimationProcessor mDecimationProcessor = new DecimationProcessor();
+
+ private AtomicBoolean mRunning = new AtomicBoolean();
+ private boolean mExpended = false;
+
+ /**
+ * Provides a Digital Drop Channel (DDC) to decimate the IQ output from a
+ * tuner down to a 48 kHz IQ channel rate.
+ *
+ * Note: this class can only be used once (started and stopped) and a new
+ * tuner channel source must be requested from the tuner once this object
+ * has been stopped. This is because channels are managed dynamically and
+ * center tuned frequency may have changed since this source was obtained
+ * and thus the tuner might no longer be able to source this channel once it
+ * has been stopped.
+ *
+ * @param tuner to obtain wideband IQ samples from
+ * @param tunerChannel specifying the center frequency for the DDC
+ * @throws RejectedExecutionException if the thread pool manager cannot
+ * accept the decimation processing task
+ * @throws SourceException if the tuner has an issue providing IQ samples
+ */
+ public TunerChannelSource(Tuner tuner, TunerChannel tunerChannel)
+ throws RejectedExecutionException, SourceException
{
- mTuner = tuner;
- mTuner.getTunerController().addListener( (IFrequencyChangeProcessor)this );
-
- mTunerChannel = tunerChannel;
+ mTuner = tuner;
+ mTuner.getTunerController().addListener((IFrequencyChangeProcessor) this);
+
+ mTunerChannel = tunerChannel;
+
+ mTunerFrequency = mTuner.getTunerController().getFrequency();
- mTunerFrequency = mTuner.getTunerController().getFrequency();
-
/* Setup the frequency translator to the current source frequency */
- long frequencyOffset = mTunerFrequency - mTunerChannel.getFrequency();
-
- mMixer = new Oscillator( frequencyOffset,
- mTuner.getTunerController().getSampleRate() );
+ long frequencyOffset = mTunerFrequency - mTunerChannel.getFrequency();
+
+ mMixer = new Oscillator(frequencyOffset,
+ mTuner.getTunerController().getSampleRate());
/* Fire a sample rate change event to setup the decimation chain */
- frequencyChanged( new FrequencyChangeEvent(
- Event.NOTIFICATION_SAMPLE_RATE_CHANGE,
- mTuner.getTunerController().getSampleRate() ) );
+ frequencyChanged(new FrequencyChangeEvent(
+ Event.NOTIFICATION_SAMPLE_RATE_CHANGE,
+ mTuner.getTunerController().getSampleRate()));
}
-
-
- public void start( ScheduledExecutorService executor )
- {
- if( mExpended )
- {
- throw new IllegalStateException( "Attempt to re-start an expended "
- + "tuner channel source. TunerChannelSource objects can only "
- + "be used once. " );
- }
-
- if( mRunning.compareAndSet( false, true ))
- {
+
+
+ public void start(ScheduledExecutorService executor)
+ {
+ if(mExpended)
+ {
+ throw new IllegalStateException("Attempt to re-start an expended "
+ + "tuner channel source. TunerChannelSource objects can only "
+ + "be used once. ");
+ }
+
+ if(mRunning.compareAndSet(false, true))
+ {
/* Schedule the decimation task to run every 10 ms (100 iterations/second) */
- mTaskHandle = executor.scheduleAtFixedRate( mDecimationProcessor,
- 0, 10, TimeUnit.MILLISECONDS );
+ mTaskHandle = executor.scheduleAtFixedRate(mDecimationProcessor,
+ 0, 10, TimeUnit.MILLISECONDS);
/* Finally, register to receive samples from the tuner */
- mTuner.addListener( (Listener)this );
- }
- else
- {
- mLog.warn( "Attempt to start() and already running tuner channel source was ignored" );
- }
- }
+ mTuner.addListener((Listener) this);
+ }
+ else
+ {
+ mLog.warn("Attempt to start() and already running tuner channel source was ignored");
+ }
+ }
- @Override
- public void reset()
- {
- }
+ @Override
+ public void reset()
+ {
+ }
- @Override
- public void stop()
- {
- if( mRunning.compareAndSet( true, false ))
- {
- mTuner.releaseChannel( this );
- mDecimationProcessor.shutdown();
-
- if( mTaskHandle != null )
- {
- mTaskHandle.cancel( true );
- mTaskHandle = null;
- }
-
- mBuffer.clear();
-
- mExpended = true;
- }
- else
- {
- mLog.warn( "Attempt to stop() and already stopped tuner channel source was ignored" );
- }
- }
+ @Override
+ public void stop()
+ {
+ if(mRunning.compareAndSet(true, false))
+ {
+ mTuner.releaseChannel(this);
+ mDecimationProcessor.shutdown();
+
+ if(mTaskHandle != null)
+ {
+ mTaskHandle.cancel(true);
+ mTaskHandle = null;
+ }
+
+ mBuffer.clear();
+
+ mExpended = true;
+ }
+ else
+ {
+ mLog.warn("Attempt to stop() and already stopped tuner channel source was ignored");
+ }
+ }
- @Override
+ @Override
public void dispose()
{
- if( !mRunning.get() )
- {
+ if(!mRunning.get())
+ {
/* Tell the tuner to release/unregister our resources */
- mTuner.getTunerController().removeListener( this );
- mTuner = null;
- mTunerChannel = null;
- mBuffer = null;
- mFrequencyChangeProcessor = null;
- mListener = null;
- mMixer = null;
- mDecimationFilter.dispose();
- mDecimationFilter = null;
- }
- }
-
- public Tuner getTuner()
- {
- return mTuner;
- }
-
- public TunerChannel getTunerChannel()
- {
- return mTunerChannel;
- }
-
- @Override
- public void receive( ComplexBuffer buffer )
- {
- if( mRunning.get() )
- {
- mBuffer.add( buffer );
- }
+ mTuner.getTunerController().removeListener(this);
+// mTuner = null;
+// mTunerChannel = null;
+// mBuffer = null;
+// mFrequencyChangeProcessor = null;
+// mListener = null;
+// mMixer = null;
+// mDecimationFilter.dispose();
+// mDecimationFilter = null;
+ }
}
- public void setFrequencyChangeListener( IFrequencyChangeProcessor processor )
+ public Tuner getTuner()
{
- mFrequencyChangeProcessor = processor;
+ return mTuner;
}
- @Override
- public void setListener( Listener listener )
- {
+ public TunerChannel getTunerChannel()
+ {
+ return mTunerChannel;
+ }
+
+ @Override
+ public void receive(ComplexBuffer buffer)
+ {
+ if(mRunning.get())
+ {
+ mBuffer.add(buffer);
+ }
+ }
+
+ public void setFrequencyChangeListener(IFrequencyChangeProcessor processor)
+ {
+ mFrequencyChangeProcessor = processor;
+ }
+
+ @Override
+ public void setListener(Listener listener)
+ {
/* Save a pointer to the listener so that if we have to change the
* decimation filter, we can re-add the listener */
- mListener = listener;
-
- mDecimationFilter.setListener( listener );
- }
+ mListener = listener;
- @Override
- public void removeListener( Listener listener )
- {
- mDecimationFilter.removeListener();
- }
-
- /**
- * Handler for frequency change events received from the tuner and channel
- * frequency correction events received from the channel consumer/listener
- */
- @Override
- public void frequencyChanged( FrequencyChangeEvent event ) throws SourceException
- {
- // Echo the event to the registered event listener
- if( mFrequencyChangeProcessor != null )
- {
- mFrequencyChangeProcessor.frequencyChanged( event );
- }
-
- switch( event.getEvent() )
- {
- case NOTIFICATION_FREQUENCY_CHANGE:
- mTunerFrequency = event.getValue().longValue();
- updateMixerFrequencyOffset();
- break;
- case REQUEST_CHANNEL_FREQUENCY_CORRECTION_CHANGE:
- mChannelFrequencyCorrection = event.getValue().intValue();
-
- updateMixerFrequencyOffset();
-
- if( mFrequencyChangeProcessor != null )
- {
- mFrequencyChangeProcessor.frequencyChanged(
- new FrequencyChangeEvent(
- Event.NOTIFICATION_CHANNEL_FREQUENCY_CORRECTION_CHANGE,
- mChannelFrequencyCorrection ) );
- }
- break;
- case NOTIFICATION_SAMPLE_RATE_CHANGE:
- int sampleRate = event.getValue().intValue();
-
- if( mTunerSampleRate != sampleRate )
- {
- mMixer.setSampleRate( sampleRate );
-
- /* Get new decimation filter */
- mDecimationFilter = FilterFactory
- .getDecimationFilter( sampleRate,
- CHANNEL_RATE,
- 1, //Order
- CHANNEL_PASS_FREQUENCY,
- 60, //dB attenuation
- WindowType.HAMMING );
-
- /* re-add the original output listener */
- mDecimationFilter.setListener( mListener );
-
- mTunerSampleRate = sampleRate;
- }
- break;
- default:
- break;
- }
+ mDecimationFilter.setListener(listener);
}
- /**
- * Calculates the local mixer frequency offset from the tuned frequency,
- * channel's requested frequency, and channel frequency correction.
- */
- private void updateMixerFrequencyOffset()
- {
- long offset = mTunerFrequency -
- mTunerChannel.getFrequency() -
- mChannelFrequencyCorrection;
+ @Override
+ public void removeListener(Listener listener)
+ {
+ mDecimationFilter.removeListener();
+ }
- mMixer.setFrequency( offset );
- }
+ /**
+ * Handler for frequency change events received from the tuner and channel
+ * frequency correction events received from the channel consumer/listener
+ */
+ @Override
+ public void frequencyChanged(FrequencyChangeEvent event) throws SourceException
+ {
+ // Echo the event to the registered event listener
+ if(mFrequencyChangeProcessor != null)
+ {
+ mFrequencyChangeProcessor.frequencyChanged(event);
+ }
+
+ switch(event.getEvent())
+ {
+ case NOTIFICATION_FREQUENCY_CHANGE:
+ mTunerFrequency = event.getValue().longValue();
+ updateMixerFrequencyOffset();
+ break;
+ case REQUEST_CHANNEL_FREQUENCY_CORRECTION_CHANGE:
+ mChannelFrequencyCorrection = event.getValue().intValue();
+
+ updateMixerFrequencyOffset();
+
+ if(mFrequencyChangeProcessor != null)
+ {
+ mFrequencyChangeProcessor.frequencyChanged(
+ new FrequencyChangeEvent(
+ Event.NOTIFICATION_CHANNEL_FREQUENCY_CORRECTION_CHANGE,
+ mChannelFrequencyCorrection));
+ }
+ break;
+ case NOTIFICATION_SAMPLE_RATE_CHANGE:
+ int sampleRate = event.getValue().intValue();
+
+ if(mTunerSampleRate != sampleRate)
+ {
+ mMixer.setSampleRate(sampleRate);
+
+ /* Get new decimation filter */
+ mDecimationFilter = FilterFactory
+ .getDecimationFilter(sampleRate,
+ CHANNEL_RATE,
+ 1, //Order
+ CHANNEL_PASS_FREQUENCY,
+ 60, //dB attenuation
+ WindowType.HAMMING);
+
+ /* re-add the original output listener */
+ mDecimationFilter.setListener(mListener);
+
+ mTunerSampleRate = sampleRate;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * Calculates the local mixer frequency offset from the tuned frequency,
+ * channel's requested frequency, and channel frequency correction.
+ */
+ private void updateMixerFrequencyOffset()
+ {
+ long offset = mTunerFrequency -
+ mTunerChannel.getFrequency() -
+ mChannelFrequencyCorrection;
+
+ mMixer.setFrequency(offset);
+ }
public int getSampleRate() throws SourceException
{
- return CHANNEL_RATE;
+ return CHANNEL_RATE;
}
public long getFrequency() throws SourceException
{
- return mTunerChannel.getFrequency();
+ return mTunerChannel.getFrequency();
}
-
+
/**
* Decimates an inbound buffer of I/Q samples from the source down to the
* standard 48000 channel sample rate
*/
- public class DecimationProcessor implements Runnable
- {
- private boolean mProcessing = true;
- private List mSampleBuffers = new ArrayList();
+ public class DecimationProcessor implements Runnable
+ {
+ private boolean mProcessing = true;
+ private List mSampleBuffers = new ArrayList();
- public void shutdown()
- {
- mProcessing = false;
- }
-
- @Override
+ public void shutdown()
+ {
+ mProcessing = false;
+ }
+
+ @Override
public void run()
{
/* General exception handler so that any errors won't kill the
* decimation thread and cause the input buffers to fill up and
* run the program out of memory */
- try
- {
- if( mProcessing )
- {
- {
-// long start = System.currentTimeMillis();
-
- mBuffer.drainTo( mSampleBuffers, 8 );
-
- for( Buffer buffer: mSampleBuffers )
- {
+ try
+ {
+ if(mProcessing)
+ {
+ {
+ mBuffer.drainTo(mSampleBuffers, 8);
+
+ for(Buffer buffer : mSampleBuffers)
+ {
/* Check to see if we've been shutdown */
- if( !mProcessing )
- {
- mBuffer.clear();
- return;
- }
- else
- {
- float[] samples = buffer.getSamples();
+ if(!mProcessing)
+ {
+ mBuffer.clear();
+ return;
+ }
+ else
+ {
+ float[] samples = buffer.getSamples();
/* We make a copy of the buffer so that we don't affect
* anyone else that is using the same buffer, like other
* channels or the spectral display */
- float[] translated = new float[ samples.length ];
+ float[] translated = new float[samples.length];
/* Perform frequency translation */
- for( int x = 0; x < samples.length; x += 2 )
- {
- mMixer.rotate();
-
- translated[ x ] = Complex.multiplyInphase(
- samples[ x ], samples[ x + 1 ], mMixer.inphase(), mMixer.quadrature() );
+ for(int x = 0; x < samples.length; x += 2)
+ {
+ mMixer.rotate();
- translated[ x + 1 ] = Complex.multiplyQuadrature(
- samples[ x ], samples[ x + 1 ], mMixer.inphase(), mMixer.quadrature() );
- }
-
- if( mProcessing && mDecimationFilter != null )
- {
- mDecimationFilter.receive( new ComplexBuffer( translated ) );
- }
- }
- }
-
-// mLog.debug( "Processed [" + mSampleBuffers.size() + "] in " + ( System.currentTimeMillis() - start ) );
-
- mSampleBuffers.clear();
- }
- }
- }
- catch( Exception e )
- {
+ translated[x] = Complex.multiplyInphase(
+ samples[x], samples[x + 1], mMixer.inphase(), mMixer.quadrature());
+
+ translated[x + 1] = Complex.multiplyQuadrature(
+ samples[x], samples[x + 1], mMixer.inphase(), mMixer.quadrature());
+ }
+
+ if(mProcessing)
+ {
+ final ComplexPrimeCICDecimate filter = mDecimationFilter;
+ filter.receive(new ComplexBuffer(translated));
+ }
+ }
+ }
+
+ mSampleBuffers.clear();
+ }
+ }
+ }
+ catch(Exception e)
+ {
/* Only log the stack trace if we're still processing */
- if( mProcessing )
- {
- mLog.error( "Error encountered during decimation process", e );
- }
- }
+ if(mProcessing)
+ {
+ mLog.error("Error encountered during decimation process", e);
+ }
+ }
/* Check to see if we've been shutdown */
- if( !mProcessing )
- {
- mBuffer.clear();
- mSampleBuffers.clear();
- }
+ if(!mProcessing)
+ {
+ mBuffer.clear();
+ mSampleBuffers.clear();
+ }
}
- }
+ }
}
diff --git a/src/source/tuner/TunerManager.java b/src/source/tuner/TunerManager.java
index 2cc230f0..0c82b839 100644
--- a/src/source/tuner/TunerManager.java
+++ b/src/source/tuner/TunerManager.java
@@ -1,31 +1,29 @@
/*******************************************************************************
- * SDR Trunk
- * Copyright (C) 2014-2016 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see datalines =
- mMixerManager.getMixerTunerDataLines();
+ Collection datalines =
+ mMixerManager.getMixerTunerDataLines();
- for( MixerTunerDataLine mixerTDL: datalines )
- {
- if( mixerTDL.getMixerTunerType().getTunerClass() == tunerClass )
- {
- return mixerTDL;
- }
- }
-
- return null;
+ for(MixerTunerDataLine mixerTDL : datalines)
+ {
+ if(mixerTDL.getMixerTunerType().getTunerClass() == tunerClass)
+ {
+ return mixerTDL;
+ }
+ }
+
+ return null;
}
-
+
public class TunerInitStatus
{
- private Tuner mTuner;
- private String mInfo;
-
- public TunerInitStatus( Tuner tuner, String info )
- {
- mTuner = tuner;
- mInfo = info;
- }
-
- public Tuner getTuner()
- {
- return mTuner;
- }
-
- public String getInfo()
- {
- return mInfo;
- }
-
- public boolean isLoaded()
- {
- return mTuner != null;
- }
+ private Tuner mTuner;
+ private String mInfo;
+
+ public TunerInitStatus(Tuner tuner, String info)
+ {
+ mTuner = tuner;
+ mInfo = info;
+ }
+
+ public Tuner getTuner()
+ {
+ return mTuner;
+ }
+
+ public String getInfo()
+ {
+ return mInfo;
+ }
+
+ public boolean isLoaded()
+ {
+ return mTuner != null;
+ }
}
}
diff --git a/src/source/tuner/airspy/AirspyTunerController.java b/src/source/tuner/airspy/AirspyTunerController.java
index eef5988a..aaab5fd4 100644
--- a/src/source/tuner/airspy/AirspyTunerController.java
+++ b/src/source/tuner/airspy/AirspyTunerController.java
@@ -1,5 +1,25 @@
package source.tuner.airspy;
+import dsp.filter.dc.DCRemovalFilter_RB;
+import dsp.filter.hilbert.HilbertTransform;
+import org.apache.commons.io.EndianUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usb4java.Device;
+import org.usb4java.DeviceHandle;
+import org.usb4java.LibUsb;
+import org.usb4java.LibUsbException;
+import org.usb4java.Transfer;
+import org.usb4java.TransferCallback;
+import sample.Broadcaster;
+import sample.Listener;
+import sample.complex.ComplexBuffer;
+import source.SourceException;
+import source.tuner.TunerController;
+import source.tuner.configuration.TunerConfiguration;
+import util.ThreadPool;
+
+import javax.usb.UsbException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.text.DecimalFormat;
@@ -11,33 +31,10 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.usb.UsbException;
-
-import org.apache.commons.io.EndianUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usb4java.Device;
-import org.usb4java.DeviceHandle;
-import org.usb4java.LibUsb;
-import org.usb4java.LibUsbException;
-import org.usb4java.Transfer;
-import org.usb4java.TransferCallback;
-
-import sample.Broadcaster;
-import sample.Listener;
-import sample.complex.ComplexBuffer;
-import source.SourceException;
-import source.tuner.TunerController;
-import source.tuner.configuration.TunerConfiguration;
-import controller.ThreadPoolManager;
-import controller.ThreadPoolManager.ThreadType;
-import dsp.filter.dc.DCRemovalFilter_RB;
-import dsp.filter.hilbert.HilbertTransform;
-
/**
- * SDR Trunk
- * Copyright (C) 2015-2016 Dennis Sheirer
- *
+ * SDR Trunk
+ * Copyright (C) 2015-2017 Dennis Sheirer
+ *
* Ported from libairspy at:
* https://github.com/airspy/host/tree/master/libairspy
* -----------------------------------------------------------------------------
@@ -46,1432 +43,1412 @@ import dsp.filter.hilbert.HilbertTransform;
* Copyright (c) 2014, Youssef Touil
* Copyright (c) 2014, Benjamin Vernoux
* Copyright (c) 2015, Ian Gilmour
- *
+ *
* All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
+ *
+ * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
+ *
+ * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
- * Neither the name of AirSpy nor the names of its contributors may be used to
- * endorse or promote products derived from this software without specific prior
+ * Neither the name of AirSpy nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without specific prior
* written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
public class AirspyTunerController extends TunerController
{
- public static final Gain LINEARITY_GAIN_DEFAULT = Gain.LINEARITY_14;
- public static final Gain SENSITIVITY_GAIN_DEFAULT = Gain.SENSITIVITY_10;
- public static final int GAIN_MIN = 1;
- public static final int GAIN_MAX = 22;
- public static final int LNA_GAIN_MIN = 0;
- public static final int LNA_GAIN_MAX = 14;
- public static final int LNA_GAIN_DEFAULT = 7;
- public static final int MIXER_GAIN_MIN = 0;
- public static final int MIXER_GAIN_MAX = 15;
- public static final int MIXER_GAIN_DEFAULT = 9;
- public static final int IF_GAIN_MIN = 0;
- public static final int IF_GAIN_MAX = 15;
- public static final int IF_GAIN_DEFAULT = 9;
- public static final long FREQUENCY_MIN = 24000000l;
- public static final long FREQUENCY_MAX = 1800000000l;
- public static final long FREQUENCY_DEFAULT = 101100000;
- public static final double USABLE_BANDWIDTH_PERCENT = 0.90;
- public static final AirspySampleRate DEFAULT_SAMPLE_RATE =
- new AirspySampleRate( 0, 10000000, "10.00 MHz" );
+ public static final Gain LINEARITY_GAIN_DEFAULT = Gain.LINEARITY_14;
+ public static final Gain SENSITIVITY_GAIN_DEFAULT = Gain.SENSITIVITY_10;
+ public static final int GAIN_MIN = 1;
+ public static final int GAIN_MAX = 22;
+ public static final int LNA_GAIN_MIN = 0;
+ public static final int LNA_GAIN_MAX = 14;
+ public static final int LNA_GAIN_DEFAULT = 7;
+ public static final int MIXER_GAIN_MIN = 0;
+ public static final int MIXER_GAIN_MAX = 15;
+ public static final int MIXER_GAIN_DEFAULT = 9;
+ public static final int IF_GAIN_MIN = 0;
+ public static final int IF_GAIN_MAX = 15;
+ public static final int IF_GAIN_DEFAULT = 9;
+ public static final long FREQUENCY_MIN = 24000000l;
+ public static final long FREQUENCY_MAX = 1800000000l;
+ public static final long FREQUENCY_DEFAULT = 101100000;
+ public static final double USABLE_BANDWIDTH_PERCENT = 0.90;
+ public static final AirspySampleRate DEFAULT_SAMPLE_RATE =
+ new AirspySampleRate(0, 10000000, "10.00 MHz");
- public static final long USB_TIMEOUT_MS = 2000l; //milliseconds
- public static final byte USB_ENDPOINT = (byte)0x81;
- public static final byte USB_INTERFACE = (byte)0x0;
- public static final int TRANSFER_BUFFER_POOL_SIZE = 16;
-
- public static final byte USB_REQUEST_IN =
- (byte)( LibUsb.ENDPOINT_IN |
- LibUsb.REQUEST_TYPE_VENDOR |
- LibUsb.RECIPIENT_DEVICE );
-
- public static final byte USB_REQUEST_OUT =
- (byte)( LibUsb.ENDPOINT_OUT |
- LibUsb.REQUEST_TYPE_VENDOR |
- LibUsb.RECIPIENT_DEVICE );
+ public static final long USB_TIMEOUT_MS = 2000l; //milliseconds
+ public static final byte USB_ENDPOINT = (byte) 0x81;
+ public static final byte USB_INTERFACE = (byte) 0x0;
+ public static final int TRANSFER_BUFFER_POOL_SIZE = 16;
- public static final DecimalFormat MHZ_FORMATTER = new DecimalFormat( "#.00 MHz" );
-
- private final static Logger mLog =
- LoggerFactory.getLogger( AirspyTunerController.class );
-
- private Device mDevice;
- private DeviceHandle mDeviceHandle;
+ public static final byte USB_REQUEST_IN =
+ (byte) (LibUsb.ENDPOINT_IN |
+ LibUsb.REQUEST_TYPE_VENDOR |
+ LibUsb.RECIPIENT_DEVICE);
- private ThreadPoolManager mThreadPoolManager;
- private LinkedTransferQueue mFilledBuffers =
- new LinkedTransferQueue();
+ public static final byte USB_REQUEST_OUT =
+ (byte) (LibUsb.ENDPOINT_OUT |
+ LibUsb.REQUEST_TYPE_VENDOR |
+ LibUsb.RECIPIENT_DEVICE);
+
+ public static final DecimalFormat MHZ_FORMATTER = new DecimalFormat("#.00 MHz");
+
+ private final static Logger mLog = LoggerFactory.getLogger(AirspyTunerController.class);
+
+ private Device mDevice;
+ private DeviceHandle mDeviceHandle;
+
+ private LinkedTransferQueue mFilledBuffers = new LinkedTransferQueue();
private Broadcaster mComplexBufferBroadcaster = new Broadcaster<>();
- private int mBufferSize = 262144;
- private BufferProcessor mBufferProcessor = new BufferProcessor();
- private AirspySampleAdapter mSampleAdapter = new AirspySampleAdapter();
- private DCRemovalFilter_RB mDCFilter = new DCRemovalFilter_RB( 0.01f );
- private HilbertTransform mHilbertTransform = new HilbertTransform();
-
- private AirspyDeviceInformation mDeviceInfo;
- private List mSampleRates = new ArrayList<>();
- private int mSampleRate = 0;
-
- public AirspyTunerController( Device device, ThreadPoolManager threadPoolManager )
- throws SourceException
- {
- super( FREQUENCY_MIN, FREQUENCY_MAX, 0, USABLE_BANDWIDTH_PERCENT );
-
- mDevice = device;
- mThreadPoolManager = threadPoolManager;
- }
-
- public void init() throws SourceException
- {
- mDeviceHandle = new DeviceHandle();
+ private int mBufferSize = 262144;
+ private BufferProcessor mBufferProcessor = new BufferProcessor();
+ private AirspySampleAdapter mSampleAdapter = new AirspySampleAdapter();
+ private DCRemovalFilter_RB mDCFilter = new DCRemovalFilter_RB(0.01f);
+ private HilbertTransform mHilbertTransform = new HilbertTransform();
- int result = LibUsb.open( mDevice, mDeviceHandle );
-
- if( result != 0 )
- {
- if( result == LibUsb.ERROR_ACCESS )
- {
- mLog.error( "Unable to access Airspy - insufficient permissions."
- + " If you are running a Linux OS, have you installed the "
- + "airspy rules file in \\etc\\udev\\rules.d ??" );
- }
-
- throw new SourceException( "Couldn't open airspy device - " +
- LibUsb.strError( result ) );
- }
+ private AirspyDeviceInformation mDeviceInfo;
+ private List mSampleRates = new ArrayList<>();
+ private int mSampleRate = 0;
- try
- {
- claimInterface();
- }
- catch( Exception e )
- {
- throw new SourceException( "Airspy Tuner Controller - error while "
- + "setting USB configuration, claiming USB interface or "
- + "reset the kernel mode driver", e );
- }
-
- try
- {
- setSamplePacking( false );
- }
- catch( LibUsbException | UsbException | UnsupportedOperationException e )
- {
- mLog.info( "Sample packing is not supported by airspy firmware" );
- }
-
- try
- {
- setReceiverMode( true );
- }
- catch( Exception e )
- {
- mLog.error( "Couldn't enable airspy receiver mode", e );
- }
+ public AirspyTunerController(Device device) throws SourceException
+ {
+ super(FREQUENCY_MIN, FREQUENCY_MAX, 0, USABLE_BANDWIDTH_PERCENT);
- setFrequency( FREQUENCY_DEFAULT );
-
- try
- {
- determineAvailableSampleRates();
- }
- catch ( LibUsbException | UsbException e )
- {
- mLog.error( "Error identifying available samples rates", e );
- }
-
- try
- {
- setSampleRate( DEFAULT_SAMPLE_RATE );
- }
- catch ( IllegalArgumentException | LibUsbException | UsbException e )
- {
- mLog.error( "Setting sample rate is not supported by firmware", e );
- }
- }
-
- /**
- * Claims the USB interface. If another application currently has
- * the interface claimed, the USB_FORCE_CLAIM_INTERFACE setting
- * will dictate if the interface is forcibly claimed from the other
- * application
- */
- private void claimInterface() throws SourceException
- {
- if( mDeviceHandle != null )
- {
- int result = LibUsb.kernelDriverActive( mDeviceHandle, USB_INTERFACE );
-
- if( result == 1 )
- {
-
- result = LibUsb.detachKernelDriver( mDeviceHandle, USB_INTERFACE );
+ mDevice = device;
+ }
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "failed attempt to detach kernel driver [" +
- LibUsb.errorName( result ) + "]" );
-
- throw new SourceException( "couldn't detach kernel driver "
- + "from device" );
- }
- }
+ public void init() throws SourceException
+ {
+ mDeviceHandle = new DeviceHandle();
- result = LibUsb.setConfiguration( mDeviceHandle, 1 );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new SourceException( "couldn't set USB configuration 1 [" +
- LibUsb.errorName( result ) + "]" );
- }
+ int result = LibUsb.open(mDevice, mDeviceHandle);
- result = LibUsb.claimInterface( mDeviceHandle, USB_INTERFACE );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new SourceException( "couldn't claim usb interface [" +
- LibUsb.errorName( result ) + "]" );
- }
- }
- else
- {
- throw new SourceException( "couldn't claim usb interface - no "
- + "device handle" );
- }
- }
-
- public static String getTransferStatus( int status )
- {
- switch( status )
- {
- case 0:
- return "TRANSFER COMPLETED (0)";
- case 1:
- return "TRANSFER ERROR (1)";
- case 2:
- return "TRANSFER TIMED OUT (2)";
- case 3:
- return "TRANSFER CANCELLED (3)";
- case 4:
- return "TRANSFER STALL (4)";
- case 5:
- return "TRANSFER NO DEVICE (5)";
- case 6:
- return "TRANSFER OVERFLOW (6)";
- default:
- return "UNKNOWN TRANSFER STATUS (" + status + ")";
- }
- }
+ if(result != 0)
+ {
+ if(result == LibUsb.ERROR_ACCESS)
+ {
+ mLog.error("Unable to access Airspy - insufficient permissions."
+ + " If you are running a Linux OS, have you installed the "
+ + "airspy rules file in \\etc\\udev\\rules.d ??");
+ }
-
- @Override
- public void apply( TunerConfiguration config ) throws SourceException
- {
- if( config instanceof AirspyTunerConfiguration )
- {
- AirspyTunerConfiguration airspy = (AirspyTunerConfiguration)config;
+ throw new SourceException("Couldn't open airspy device - " +
+ LibUsb.strError(result));
+ }
- int sampleRate = airspy.getSampleRate();
+ try
+ {
+ claimInterface();
+ }
+ catch(Exception e)
+ {
+ throw new SourceException("Airspy Tuner Controller - error while "
+ + "setting USB configuration, claiming USB interface or "
+ + "reset the kernel mode driver", e);
+ }
- AirspySampleRate rate = getSampleRate( sampleRate );
+ try
+ {
+ setSamplePacking(false);
+ }
+ catch(LibUsbException | UsbException | UnsupportedOperationException e)
+ {
+ mLog.info("Sample packing is not supported by airspy firmware");
+ }
- if( rate == null )
- {
- if( !mSampleRates.isEmpty() )
- {
- rate = mSampleRates.get( 0 );
- }
- else
- {
- rate = DEFAULT_SAMPLE_RATE;
- }
- }
-
- try
- {
- setSampleRate( rate );
- }
- catch( UsbException e )
- {
- throw new SourceException( "Couldn't set sample rate [" +
- rate.toString() + "]", e );
- }
+ try
+ {
+ setReceiverMode(true);
+ }
+ catch(Exception e)
+ {
+ mLog.error("Couldn't enable airspy receiver mode", e);
+ }
- try
- {
- setIFGain( airspy.getIFGain() );
- setMixerGain( airspy.getMixerGain() );
- setLNAGain( airspy.getLNAGain() );
-
- setMixerAGC( airspy.isMixerAGC() );
- setLNAAGC( airspy.isLNAAGC() );
+ setFrequency(FREQUENCY_DEFAULT);
- //Set the gain mode last, so custom values are already set, and
- //linearity and sensitivity modes will automatically override
- //the custom values.
- setGain( airspy.getGain() );
-
- setFrequencyCorrection( airspy.getFrequencyCorrection() );
- }
- catch( Exception e )
- {
- throw new SourceException( "Couldn't apply gain settings from "
- + "airspy config", e );
- }
-
- try
- {
- setFrequency( airspy.getFrequency() );
- }
- catch( SourceException se )
- {
- //Do nothing, we couldn't set the frequency
- }
-
- }
- else
- {
- throw new IllegalArgumentException( "Invalid tuner config:" +
- config.getClass() );
- }
- }
+ try
+ {
+ determineAvailableSampleRates();
+ }
+ catch(LibUsbException | UsbException e)
+ {
+ mLog.error("Error identifying available samples rates", e);
+ }
- @Override
- public long getTunedFrequency() throws SourceException
- {
- return mFrequencyController.getTunedFrequency();
- }
+ try
+ {
+ setSampleRate(DEFAULT_SAMPLE_RATE);
+ }
+ catch(IllegalArgumentException | LibUsbException | UsbException e)
+ {
+ mLog.error("Setting sample rate is not supported by firmware", e);
+ }
+ }
- @Override
- public void setTunedFrequency( long frequency ) throws SourceException
- {
- if( FREQUENCY_MIN <= frequency && frequency <= FREQUENCY_MAX )
- {
- ByteBuffer buffer = ByteBuffer.allocateDirect( 4 );
-
- buffer.order( ByteOrder.LITTLE_ENDIAN );
+ /**
+ * Claims the USB interface. If another application currently has
+ * the interface claimed, the USB_FORCE_CLAIM_INTERFACE setting
+ * will dictate if the interface is forcibly claimed from the other
+ * application
+ */
+ private void claimInterface() throws SourceException
+ {
+ if(mDeviceHandle != null)
+ {
+ int result = LibUsb.kernelDriverActive(mDeviceHandle, USB_INTERFACE);
- buffer.putInt( (int)frequency );
+ if(result == 1)
+ {
- buffer.rewind();
+ result = LibUsb.detachKernelDriver(mDeviceHandle, USB_INTERFACE);
- try
- {
- write( Command.SET_FREQUENCY, 0, 0, buffer );
- }
- catch( UsbException e )
- {
- mLog.error( "error setting frequency [" + frequency + "]", e );
-
- throw new SourceException( "error setting frequency [" +
- frequency + "]", e );
- }
- }
- else
- {
- throw new SourceException( "Frequency [" + frequency + "] outside "
- + "of tunable range " + FREQUENCY_MIN + "-" + FREQUENCY_MAX );
- }
- }
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("failed attempt to detach kernel driver [" +
+ LibUsb.errorName(result) + "]");
- @Override
- public int getCurrentSampleRate() throws SourceException
- {
- return mSampleRate;
- }
+ throw new SourceException("couldn't detach kernel driver "
+ + "from device");
+ }
+ }
- /**
- * Sets the sample rate to the rate specified by the index value in the
- * available sample rates map
- *
- * @param rate to a sample rate in the available samples rates map.
- *
- * @throws IllegalArgumentException if index is not a valid rate index
- * @throws LibUsbException if there was a read error or if this operation
- * is not supported by the current firmware
- *
- * @throws UsbException if there was a USB error
- */
- public void setSampleRate( AirspySampleRate rate ) throws
- LibUsbException, UsbException, SourceException
- {
- if( rate.getRate() != mSampleRate )
- {
- int result = readByte( Command.SET_SAMPLE_RATE, 0, rate.getIndex(), true );
+ result = LibUsb.setConfiguration(mDeviceHandle, 1);
- if( result != 1 )
- {
- throw new UsbException( "Error setting sample rate [" +
- rate + "] rate - return value [" + result + "]" );
- }
- else
- {
- mSampleRate = rate.getRate();
- mFrequencyController.setSampleRate( mSampleRate );
- }
- }
- }
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new SourceException("couldn't set USB configuration 1 [" +
+ LibUsb.errorName(result) + "]");
+ }
- /**
- * Returns a list of sample rates supported by the firmware version
- */
- public List getSampleRates()
- {
- return mSampleRates;
- }
-
- /**
- * Airspy sample rate object that matches the current sample rate setting.
- */
- public AirspySampleRate getAirspySampleRate()
- {
- return getSampleRate( mSampleRate );
- }
+ result = LibUsb.claimInterface(mDeviceHandle, USB_INTERFACE);
- /**
- * Airspy sample rate object that matches the specified rate in hertz, or
- * null if there are no available sample rates for the tuner that match the
- * argument value.
- */
- public AirspySampleRate getSampleRate( int rate )
- {
- for( AirspySampleRate sampleRate: mSampleRates )
- {
- if( sampleRate.getRate() == rate )
- {
- return sampleRate;
- }
- }
-
- //We should never get to here ...
- return null;
- }
-
- /**
- * Enables/Disables sample packing to allow two 12-bit samples to be packed
- * into 3 bytes (enabled) or 4 bytes (disabled).
- *
- * @param enabled
- *
- * @throws UsbException if sample packing is not supported by the current
- * device firmware or if there were usb communication issues
- */
- public void setSamplePacking( boolean enabled )
- throws LibUsbException, UsbException
- {
- int result = readByte( Command.SET_PACKING, 0, ( enabled ? 1 : 0 ), true );
-
- if( result != 1 )
- {
- throw new UsbException( "Couldnt set sample packing enabled: " + enabled );
- }
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new SourceException("couldn't claim usb interface [" +
+ LibUsb.errorName(result) + "]");
+ }
+ }
+ else
+ {
+ throw new SourceException("couldn't claim usb interface - no "
+ + "device handle");
+ }
+ }
+
+ public static String getTransferStatus(int status)
+ {
+ switch(status)
+ {
+ case 0:
+ return "TRANSFER COMPLETED (0)";
+ case 1:
+ return "TRANSFER ERROR (1)";
+ case 2:
+ return "TRANSFER TIMED OUT (2)";
+ case 3:
+ return "TRANSFER CANCELLED (3)";
+ case 4:
+ return "TRANSFER STALL (4)";
+ case 5:
+ return "TRANSFER NO DEVICE (5)";
+ case 6:
+ return "TRANSFER OVERFLOW (6)";
+ default:
+ return "UNKNOWN TRANSFER STATUS (" + status + ")";
+ }
+ }
+
+
+ @Override
+ public void apply(TunerConfiguration config) throws SourceException
+ {
+ if(config instanceof AirspyTunerConfiguration)
+ {
+ AirspyTunerConfiguration airspy = (AirspyTunerConfiguration) config;
+
+ int sampleRate = airspy.getSampleRate();
+
+ AirspySampleRate rate = getSampleRate(sampleRate);
+
+ if(rate == null)
+ {
+ if(!mSampleRates.isEmpty())
+ {
+ rate = mSampleRates.get(0);
+ }
+ else
+ {
+ rate = DEFAULT_SAMPLE_RATE;
+ }
+ }
+
+ try
+ {
+ setSampleRate(rate);
+ }
+ catch(UsbException e)
+ {
+ throw new SourceException("Couldn't set sample rate [" +
+ rate.toString() + "]", e);
+ }
+
+ try
+ {
+ setIFGain(airspy.getIFGain());
+ setMixerGain(airspy.getMixerGain());
+ setLNAGain(airspy.getLNAGain());
+
+ setMixerAGC(airspy.isMixerAGC());
+ setLNAAGC(airspy.isLNAAGC());
+
+ //Set the gain mode last, so custom values are already set, and
+ //linearity and sensitivity modes will automatically override
+ //the custom values.
+ setGain(airspy.getGain());
+
+ setFrequencyCorrection(airspy.getFrequencyCorrection());
+ }
+ catch(Exception e)
+ {
+ throw new SourceException("Couldn't apply gain settings from "
+ + "airspy config", e);
+ }
+
+ try
+ {
+ setFrequency(airspy.getFrequency());
+ }
+ catch(SourceException se)
+ {
+ //Do nothing, we couldn't set the frequency
+ }
+
+ }
+ else
+ {
+ throw new IllegalArgumentException("Invalid tuner config:" +
+ config.getClass());
+ }
+ }
+
+ @Override
+ public long getTunedFrequency() throws SourceException
+ {
+ return mFrequencyController.getTunedFrequency();
+ }
+
+ @Override
+ public void setTunedFrequency(long frequency) throws SourceException
+ {
+ if(FREQUENCY_MIN <= frequency && frequency <= FREQUENCY_MAX)
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(4);
+
+ buffer.order(ByteOrder.LITTLE_ENDIAN);
+
+ buffer.putInt((int) frequency);
+
+ buffer.rewind();
+
+ try
+ {
+ write(Command.SET_FREQUENCY, 0, 0, buffer);
+ }
+ catch(UsbException e)
+ {
+ mLog.error("error setting frequency [" + frequency + "]", e);
+
+ throw new SourceException("error setting frequency [" +
+ frequency + "]", e);
+ }
+ }
+ else
+ {
+ throw new SourceException("Frequency [" + frequency + "] outside "
+ + "of tunable range " + FREQUENCY_MIN + "-" + FREQUENCY_MAX);
+ }
+ }
+
+ @Override
+ public int getCurrentSampleRate() throws SourceException
+ {
+ return mSampleRate;
+ }
+
+ /**
+ * Sets the sample rate to the rate specified by the index value in the
+ * available sample rates map
+ *
+ * @param rate to a sample rate in the available samples rates map.
+ * @throws IllegalArgumentException if index is not a valid rate index
+ * @throws LibUsbException if there was a read error or if this operation
+ * is not supported by the current firmware
+ * @throws UsbException if there was a USB error
+ */
+ public void setSampleRate(AirspySampleRate rate) throws
+ LibUsbException, UsbException, SourceException
+ {
+ if(rate.getRate() != mSampleRate)
+ {
+ int result = readByte(Command.SET_SAMPLE_RATE, 0, rate.getIndex(), true);
+
+ if(result != 1)
+ {
+ throw new UsbException("Error setting sample rate [" +
+ rate + "] rate - return value [" + result + "]");
+ }
+ else
+ {
+ mSampleRate = rate.getRate();
+ mFrequencyController.setSampleRate(mSampleRate);
+ }
+ }
+ }
+
+ /**
+ * Returns a list of sample rates supported by the firmware version
+ */
+ public List getSampleRates()
+ {
+ return mSampleRates;
+ }
+
+ /**
+ * Airspy sample rate object that matches the current sample rate setting.
+ */
+ public AirspySampleRate getAirspySampleRate()
+ {
+ return getSampleRate(mSampleRate);
+ }
+
+ /**
+ * Airspy sample rate object that matches the specified rate in hertz, or
+ * null if there are no available sample rates for the tuner that match the
+ * argument value.
+ */
+ public AirspySampleRate getSampleRate(int rate)
+ {
+ for(AirspySampleRate sampleRate : mSampleRates)
+ {
+ if(sampleRate.getRate() == rate)
+ {
+ return sampleRate;
+ }
+ }
+
+ //We should never get to here ...
+ return null;
+ }
+
+ /**
+ * Enables/Disables sample packing to allow two 12-bit samples to be packed
+ * into 3 bytes (enabled) or 4 bytes (disabled).
+ *
+ * @param enabled
+ * @throws UsbException if sample packing is not supported by the current
+ * device firmware or if there were usb communication issues
+ */
+ public void setSamplePacking(boolean enabled)
+ throws LibUsbException, UsbException
+ {
+ int result = readByte(Command.SET_PACKING, 0, (enabled ? 1 : 0), true);
+
+ if(result != 1)
+ {
+ throw new UsbException("Couldnt set sample packing enabled: " + enabled);
+ }
/* If we didn't throw an exception above, then update the sample adapter
- * to process samples accordingly */
- mSampleAdapter.setSamplePacking( enabled );
- }
-
- /**
- * Enables/disables the mixer automatic gain setting
- *
- * @param enabled
- *
- * @throws LibUsbException on unsuccessful read operation
- * @throws UsbException on USB error
- */
- public void setMixerAGC( boolean enabled )
- throws LibUsbException, UsbException
- {
- int result = readByte( Command.SET_MIXER_AGC, 0, ( enabled ? 1 : 0 ), true );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new UsbException( "Couldnt set mixer AGC enabled: " + enabled );
- }
- }
+ * to process samples accordingly */
+ mSampleAdapter.setSamplePacking(enabled);
+ }
- /**
- * Enables/disables the low noise amplifier automatic gain setting
- *
- * @param enabled
- *
- * @throws LibUsbException on unsuccessful read operation
- * @throws UsbException on USB error
- */
- public void setLNAAGC( boolean enabled ) throws LibUsbException, UsbException
- {
- int result = readByte( Command.SET_LNA_AGC, 0, ( enabled ? 1 : 0 ), true );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new UsbException( "Couldnt set LNA AGC enabled: " + enabled );
- }
- }
-
- public void setGain( Gain gain ) throws UsbException
- {
- if( gain != Gain.CUSTOM )
- {
- setMixerAGC( false );
- setLNAAGC( false );
- setLNAGain( gain.getLNA() );
- setMixerGain( gain.getMixer() );
- setIFGain( gain.getIF() );
- }
- }
+ /**
+ * Enables/disables the mixer automatic gain setting
+ *
+ * @param enabled
+ * @throws LibUsbException on unsuccessful read operation
+ * @throws UsbException on USB error
+ */
+ public void setMixerAGC(boolean enabled)
+ throws LibUsbException, UsbException
+ {
+ int result = readByte(Command.SET_MIXER_AGC, 0, (enabled ? 1 : 0), true);
- /**
- * Sets LNA gain
- *
- * @param gain - value within range of LNA_GAIN_MIN to LNA_GAIN_MAX
- *
- * @throws LibUsbException on error in java USB wrapper
- * @throws UsbException on error in USB transfer
- * @throws IllegalArgumentException if gain value is invalid
- */
- public void setLNAGain( int gain )
- throws LibUsbException, UsbException, IllegalArgumentException
- {
- if( LNA_GAIN_MIN <= gain && gain <= LNA_GAIN_MAX )
- {
- int result = readByte( Command.SET_LNA_GAIN, 0, gain, true );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new UsbException( "Couldnt set LNA gain to: " + gain );
- }
- }
- else
- {
- throw new IllegalArgumentException( "LNA gain value [" + gain +
- "] is outside value range: " + LNA_GAIN_MIN + "-" + LNA_GAIN_MAX );
- }
- }
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new UsbException("Couldnt set mixer AGC enabled: " + enabled);
+ }
+ }
- /**
- * Sets Mixer gain
- *
- * @param gain - value within range of MIXER_GAIN_MIN to MIXER_GAIN_MAX
- *
- * @throws LibUsbException on error in java USB wrapper
- * @throws UsbException on error in USB transfer
- * @throws IllegalArgumentException if gain value is invalid
- */
- public void setMixerGain( int gain )
- throws LibUsbException, UsbException, IllegalArgumentException
- {
- if( MIXER_GAIN_MIN <= gain && gain <= MIXER_GAIN_MAX )
- {
- int result = readByte( Command.SET_MIXER_GAIN, 0, gain, true );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new UsbException( "Couldnt set mixer gain to: " + gain );
- }
- }
- else
- {
- throw new IllegalArgumentException( "Mixer gain value [" + gain +
- "] is outside value range: " + MIXER_GAIN_MIN + "-" + MIXER_GAIN_MAX );
- }
- }
+ /**
+ * Enables/disables the low noise amplifier automatic gain setting
+ *
+ * @param enabled
+ * @throws LibUsbException on unsuccessful read operation
+ * @throws UsbException on USB error
+ */
+ public void setLNAAGC(boolean enabled) throws LibUsbException, UsbException
+ {
+ int result = readByte(Command.SET_LNA_AGC, 0, (enabled ? 1 : 0), true);
- /**
- * Sets IF (VGA) gain
- *
- * @param gain - value within range of VGA_GAIN_MIN to VGA_GAIN_MAX
- *
- * @throws LibUsbException on error in java USB wrapper
- * @throws UsbException on error in USB transfer
- * @throws IllegalArgumentException if gain value is invalid
- */
- public void setIFGain( int gain )
- throws LibUsbException, UsbException, IllegalArgumentException
- {
- if( IF_GAIN_MIN <= gain && gain <= IF_GAIN_MAX )
- {
- int result = readByte( Command.SET_VGA_GAIN, 0, gain, true );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new UsbException( "Couldnt set VGA gain to: " + gain );
- }
- }
- else
- {
- throw new IllegalArgumentException( "VGA gain value [" + gain +
- "] is outside value range: " + IF_GAIN_MIN + "-" + IF_GAIN_MAX );
- }
- }
-
- public void setReceiverMode( boolean enabled ) throws LibUsbException, UsbException
- {
- //Empty buffer to throw away
- ByteBuffer buffer = ByteBuffer.allocateDirect( 0 );
-
- write( Command.RECEIVER_MODE, ( enabled ? 1 : 0 ), 0, buffer );
- }
-
- /**
- * Queries the device for available sample rates. Will always provide at
- * least the default 10 MHz sample rate.
- */
- private void determineAvailableSampleRates()
- throws LibUsbException, UsbException
- {
- mSampleRates.clear();
-
- //Get a count of available sample rates. If we get an exception, then
- //we're using an older firmware revision and only the default 10 MHz
- //rate is supported
- try
- {
- byte[] rawCount = readArray( Command.GET_SAMPLE_RATES, 0, 0, 4 );
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new UsbException("Couldnt set LNA AGC enabled: " + enabled);
+ }
+ }
- if( rawCount != null )
- {
- int count = EndianUtils.readSwappedInteger( rawCount, 0 );
+ public void setGain(Gain gain) throws UsbException
+ {
+ if(gain != Gain.CUSTOM)
+ {
+ setMixerAGC(false);
+ setLNAAGC(false);
+ setLNAGain(gain.getLNA());
+ setMixerGain(gain.getMixer());
+ setIFGain(gain.getIF());
+ }
+ }
- byte[] rawRates = readArray( Command.GET_SAMPLE_RATES, 0,
- count, ( count * 4 ) );
+ /**
+ * Sets LNA gain
+ *
+ * @param gain - value within range of LNA_GAIN_MIN to LNA_GAIN_MAX
+ * @throws LibUsbException on error in java USB wrapper
+ * @throws UsbException on error in USB transfer
+ * @throws IllegalArgumentException if gain value is invalid
+ */
+ public void setLNAGain(int gain)
+ throws LibUsbException, UsbException, IllegalArgumentException
+ {
+ if(LNA_GAIN_MIN <= gain && gain <= LNA_GAIN_MAX)
+ {
+ int result = readByte(Command.SET_LNA_GAIN, 0, gain, true);
- for( int x = 0; x < count; x++ )
- {
- int rate = EndianUtils.readSwappedInteger( rawRates, ( x * 4 ) );
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new UsbException("Couldnt set LNA gain to: " + gain);
+ }
+ }
+ else
+ {
+ throw new IllegalArgumentException("LNA gain value [" + gain +
+ "] is outside value range: " + LNA_GAIN_MIN + "-" + LNA_GAIN_MAX);
+ }
+ }
- mSampleRates.add( new AirspySampleRate( x, rate, formatSampleRate( rate ) ) );
- }
- }
- }
- catch( LibUsbException e )
- {
- //Press on, nothing else to do here ..
- }
+ /**
+ * Sets Mixer gain
+ *
+ * @param gain - value within range of MIXER_GAIN_MIN to MIXER_GAIN_MAX
+ * @throws LibUsbException on error in java USB wrapper
+ * @throws UsbException on error in USB transfer
+ * @throws IllegalArgumentException if gain value is invalid
+ */
+ public void setMixerGain(int gain)
+ throws LibUsbException, UsbException, IllegalArgumentException
+ {
+ if(MIXER_GAIN_MIN <= gain && gain <= MIXER_GAIN_MAX)
+ {
+ int result = readByte(Command.SET_MIXER_GAIN, 0, gain, true);
- if( mSampleRates.isEmpty())
- {
- mSampleRates.add( DEFAULT_SAMPLE_RATE );
- }
- }
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new UsbException("Couldnt set mixer gain to: " + gain);
+ }
+ }
+ else
+ {
+ throw new IllegalArgumentException("Mixer gain value [" + gain +
+ "] is outside value range: " + MIXER_GAIN_MIN + "-" + MIXER_GAIN_MAX);
+ }
+ }
- /**
- * Formats the rate in hertz for display as megahertz
- */
- private static String formatSampleRate( int rate )
- {
- return MHZ_FORMATTER.format( (double)rate / 1E6d );
- }
+ /**
+ * Sets IF (VGA) gain
+ *
+ * @param gain - value within range of VGA_GAIN_MIN to VGA_GAIN_MAX
+ * @throws LibUsbException on error in java USB wrapper
+ * @throws UsbException on error in USB transfer
+ * @throws IllegalArgumentException if gain value is invalid
+ */
+ public void setIFGain(int gain)
+ throws LibUsbException, UsbException, IllegalArgumentException
+ {
+ if(IF_GAIN_MIN <= gain && gain <= IF_GAIN_MAX)
+ {
+ int result = readByte(Command.SET_VGA_GAIN, 0, gain, true);
- /**
- * Device information
- */
- public AirspyDeviceInformation getDeviceInfo()
- {
- //Lazy initialization
- if( mDeviceInfo == null )
- {
- readDeviceInfo();
- }
-
- return mDeviceInfo;
- }
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new UsbException("Couldnt set VGA gain to: " + gain);
+ }
+ }
+ else
+ {
+ throw new IllegalArgumentException("VGA gain value [" + gain +
+ "] is outside value range: " + IF_GAIN_MIN + "-" + IF_GAIN_MAX);
+ }
+ }
- /**
- * Reads version information from the device and populates the info object
- */
- private void readDeviceInfo()
- {
- if( mDeviceInfo == null )
- {
- mDeviceInfo = new AirspyDeviceInformation();
- }
+ public void setReceiverMode(boolean enabled) throws LibUsbException, UsbException
+ {
+ //Empty buffer to throw away
+ ByteBuffer buffer = ByteBuffer.allocateDirect(0);
+
+ write(Command.RECEIVER_MODE, (enabled ? 1 : 0), 0, buffer);
+ }
+
+ /**
+ * Queries the device for available sample rates. Will always provide at
+ * least the default 10 MHz sample rate.
+ */
+ private void determineAvailableSampleRates()
+ throws LibUsbException, UsbException
+ {
+ mSampleRates.clear();
+
+ //Get a count of available sample rates. If we get an exception, then
+ //we're using an older firmware revision and only the default 10 MHz
+ //rate is supported
+ try
+ {
+ byte[] rawCount = readArray(Command.GET_SAMPLE_RATES, 0, 0, 4);
+
+ if(rawCount != null)
+ {
+ int count = EndianUtils.readSwappedInteger(rawCount, 0);
+
+ byte[] rawRates = readArray(Command.GET_SAMPLE_RATES, 0,
+ count, (count * 4));
+
+ for(int x = 0; x < count; x++)
+ {
+ int rate = EndianUtils.readSwappedInteger(rawRates, (x * 4));
+
+ mSampleRates.add(new AirspySampleRate(x, rate, formatSampleRate(rate)));
+ }
+ }
+ }
+ catch(LibUsbException e)
+ {
+ //Press on, nothing else to do here ..
+ }
+
+ if(mSampleRates.isEmpty())
+ {
+ mSampleRates.add(DEFAULT_SAMPLE_RATE);
+ }
+ }
+
+ /**
+ * Formats the rate in hertz for display as megahertz
+ */
+ private static String formatSampleRate(int rate)
+ {
+ return MHZ_FORMATTER.format((double) rate / 1E6d);
+ }
+
+ /**
+ * Device information
+ */
+ public AirspyDeviceInformation getDeviceInfo()
+ {
+ //Lazy initialization
+ if(mDeviceInfo == null)
+ {
+ readDeviceInfo();
+ }
+
+ return mDeviceInfo;
+ }
+
+ /**
+ * Reads version information from the device and populates the info object
+ */
+ private void readDeviceInfo()
+ {
+ if(mDeviceInfo == null)
+ {
+ mDeviceInfo = new AirspyDeviceInformation();
+ }
/* Board ID */
- try
- {
- int boardID = readByte( Command.BOARD_ID_READ, 0, 0, true );
-
- mDeviceInfo.setBoardID( boardID );
- }
- catch ( LibUsbException | UsbException e )
- {
- mLog.error( "Error reading airspy board ID", e );
- }
+ try
+ {
+ int boardID = readByte(Command.BOARD_ID_READ, 0, 0, true);
+
+ mDeviceInfo.setBoardID(boardID);
+ }
+ catch(LibUsbException | UsbException e)
+ {
+ mLog.error("Error reading airspy board ID", e);
+ }
/* Version String */
- try
- {
- //NOTE: libairspy is internally reading 127 bytes, however airspy_info
- //script is telling it to read 255 bytes ... things that make you go hmmmm
- byte[] version = readArray( Command.VERSION_STRING_READ, 0, 0, 127 );
+ try
+ {
+ //NOTE: libairspy is internally reading 127 bytes, however airspy_info
+ //script is telling it to read 255 bytes ... things that make you go hmmmm
+ byte[] version = readArray(Command.VERSION_STRING_READ, 0, 0, 127);
- mDeviceInfo.setVersion( version );
- }
- catch ( LibUsbException | UsbException e )
- {
- mLog.error( "Error reading airspy version string", e );
- }
+ mDeviceInfo.setVersion(version);
+ }
+ catch(LibUsbException | UsbException e)
+ {
+ mLog.error("Error reading airspy version string", e);
+ }
/* Part ID and Serial Number */
- try
- {
- //Read 6 x 32-bit integers = 24 bytes
- byte[] serial = readArray(
- Command.BOARD_PART_ID_SERIAL_NUMBER_READ, 0, 0, 24 );
-
- mDeviceInfo.setPartAndSerialNumber( serial );
- }
- catch ( LibUsbException | UsbException e )
- {
- mLog.error( "Error reading airspy version string", e );
- }
- }
-
- /**
- * Reads a single byte value from the device.
- *
- * @param command - airspy command
- *
- * @param value - value field for usb setup packet
- * @param index - index field for usb setup packet
- *
- * @return - byte value as an integer
- *
- * @throws LibUsbException if the operation is unsuccesful
- * @throws UsbException on any usb errors
- */
- private int readByte( Command command, int value, int index, boolean signed )
- throws LibUsbException, UsbException
- {
- if( mDeviceHandle != null )
- {
- ByteBuffer buffer = ByteBuffer.allocateDirect( 1 );
-
- int transferred = LibUsb.controlTransfer( mDeviceHandle,
- USB_REQUEST_IN,
- command.getValue(),
- (short)value,
- (short)index,
- buffer,
- USB_TIMEOUT_MS );
-
- if( transferred < 0 )
- {
- throw new LibUsbException( "read error", transferred );
- }
-
- byte result = buffer.get( 0 );
-
- if( signed )
- {
- return ( result & 0xFF );
- }
- else
- {
- return result;
- }
- }
- else
- {
- throw new LibUsbException( "device handle is null",
- LibUsb.ERROR_NO_DEVICE );
- }
- }
-
- /**
- * Reads a multi-byte value from the device
- *
- * @param command - airspy command
- * @param value - usb packet value
- * @param index - usb packet index
- * @param length - number of bytes to read
- * @return - bytes read from the device
- *
- * @throws LibUsbException if quantity of bytes read doesn't equal the
- * requested number of bytes
- * @throws UsbException on error communicating with the device
- */
- private byte[] readArray( Command command, int value, int index, int length )
- throws LibUsbException, UsbException
- {
- if( mDeviceHandle != null )
- {
- ByteBuffer buffer = ByteBuffer.allocateDirect( length );
-
- int transferred = LibUsb.controlTransfer( mDeviceHandle,
- USB_REQUEST_IN,
- command.getValue(),
- (short)value,
- (short)index,
- buffer,
- USB_TIMEOUT_MS );
-
- if( transferred < 0 )
- {
- throw new LibUsbException( "read error", transferred );
- }
-
- byte[] results = new byte[ transferred ];
-
- buffer.get( results );
-
- return results;
- }
- else
- {
- throw new LibUsbException( "device handle is null",
- LibUsb.ERROR_NO_DEVICE );
- }
- }
-
- /**
- * Writes the buffer contents to the device
- *
- * @param command - airspy command
- * @param value - usb packet value
- * @param index - usb packet index
- * @param buffer - data to write to the device
- * @throws UsbException on error
- */
- public void write( Command command, int value, int index, ByteBuffer buffer )
- throws UsbException
- {
- if( mDeviceHandle != null )
- {
- int transferred = LibUsb.controlTransfer( mDeviceHandle,
- USB_REQUEST_OUT,
- command.getValue(),
- (short)value,
- (short)index,
- buffer,
- USB_TIMEOUT_MS );
-
- if( transferred < 0 )
- {
- throw new LibUsbException( "error writing byte buffer",
- transferred );
- }
- else if( transferred != buffer.capacity() )
- {
- throw new LibUsbException( "transferred bytes [" +
- transferred + "] is not what was expected [" +
- buffer.capacity() + "]", transferred );
- }
- }
- else
- {
- throw new LibUsbException( "device handle is null",
- LibUsb.ERROR_NO_DEVICE );
- }
- }
-
- public enum GainMode
- {
- LINEARITY,
- SENSITIVITY,
- CUSTOM;
- }
-
- public enum Gain
- {
- LINEARITY_1( 1, 4, 0, 0 ),
- LINEARITY_2( 2, 5, 0, 0 ),
- LINEARITY_3( 3, 6, 1, 0 ),
- LINEARITY_4( 4, 7, 1, 0 ),
- LINEARITY_5( 5, 8, 1, 0 ),
- LINEARITY_6( 6, 9, 1, 0 ),
- LINEARITY_7( 7, 10, 2, 0 ),
- LINEARITY_8( 8, 10, 2, 1 ),
- LINEARITY_9( 9, 10, 0, 3 ),
- LINEARITY_10( 10, 10, 0, 5 ),
- LINEARITY_11( 11, 10, 1, 6 ),
- LINEARITY_12( 12, 10, 0, 8 ),
- LINEARITY_13( 13, 10, 0, 9 ),
- LINEARITY_14( 14, 10, 5, 8 ),
- LINEARITY_15( 15, 10, 6, 9 ),
- LINEARITY_16( 16, 11, 6, 9 ),
- LINEARITY_17( 17, 11, 7, 10 ),
- LINEARITY_18( 18, 11, 8, 12 ),
- LINEARITY_19( 19, 11, 9, 13 ),
- LINEARITY_20( 20, 11, 11, 14 ),
- LINEARITY_21( 21, 12, 12, 14 ),
- LINEARITY_22( 22, 13, 12, 14 ),
- SENSITIVITY_1( 1, 4, 0, 0 ),
- SENSITIVITY_2( 2, 4, 0, 1 ),
- SENSITIVITY_3( 3, 4, 0, 2 ),
- SENSITIVITY_4( 4, 4, 0, 3 ),
- SENSITIVITY_5( 5, 4, 1, 5 ),
- SENSITIVITY_6( 6, 4, 2, 6 ),
- SENSITIVITY_7( 7, 4, 2, 7 ),
- SENSITIVITY_8( 8, 4, 3, 8 ),
- SENSITIVITY_9( 9, 4, 4, 9 ),
- SENSITIVITY_10( 10, 5, 4, 9 ),
- SENSITIVITY_11( 11, 5, 4, 12 ),
- SENSITIVITY_12( 12, 5, 7, 12 ),
- SENSITIVITY_13( 13, 5, 8, 13 ),
- SENSITIVITY_14( 14, 5, 9, 14 ),
- SENSITIVITY_15( 15, 6, 9, 14 ),
- SENSITIVITY_16( 16, 7, 10, 14 ),
- SENSITIVITY_17( 17, 8, 10, 14 ),
- SENSITIVITY_18( 18, 9, 11, 14 ),
- SENSITIVITY_19( 19, 10, 12, 14 ),
- SENSITIVITY_20( 20, 11, 12, 14 ),
- SENSITIVITY_21( 21, 12, 12, 14 ),
- SENSITIVITY_22( 22, 13, 12, 14 ),
- CUSTOM( 1, 0, 0, 0 );
-
- private int mValue;
- private int mIF;
- private int mMixer;
- private int mLNA;
-
- private Gain( int value, int ifGain, int mixer, int lna )
- {
- mValue = value;
- mIF = ifGain;
- mMixer = mixer;
- mLNA = lna;
- }
-
- public int getValue()
- {
- return mValue;
- }
-
- public int getIF()
- {
- return mIF;
- }
-
- public int getMixer()
- {
- return mMixer;
- }
-
- public int getLNA()
- {
- return mLNA;
- }
-
- public static Gain getGain( GainMode mode, int value )
- {
- assert( GAIN_MIN <= value && value <= GAIN_MAX );
-
- switch( mode )
- {
- case LINEARITY:
- for( Gain gain: getLinearityGains() )
- {
- if( gain.getValue() == value )
- {
- return gain;
- }
- }
- return LINEARITY_GAIN_DEFAULT;
- case SENSITIVITY:
- for( Gain gain: getSensitivityGains() )
- {
- if( gain.getValue() == value )
- {
- return gain;
- }
- }
- return SENSITIVITY_GAIN_DEFAULT;
- case CUSTOM:
- default:
- return Gain.CUSTOM;
- }
- }
-
- public static GainMode getGainMode( Gain gain )
- {
- if( gain == CUSTOM )
- {
- return GainMode.CUSTOM;
- }
- else if( getLinearityGains().contains( gain ) )
- {
- return GainMode.LINEARITY;
- }
- else if( getSensitivityGains().contains( gain ) )
- {
- return GainMode.SENSITIVITY;
- }
-
- return GainMode.CUSTOM;
- }
-
- public static EnumSet getLinearityGains()
- {
- return EnumSet.range( LINEARITY_1, LINEARITY_22 );
- }
-
- public static EnumSet getSensitivityGains()
- {
- return EnumSet.range( SENSITIVITY_1, SENSITIVITY_22 );
- }
- }
-
-
-
- /**
- * Airspy Board Identifier
- */
- public enum BoardID
- {
- AIRSPY( 0, "Airspy" ),
- UNKNOWN( -1, "Unknown" );
-
- private int mValue;
- private String mLabel;
-
- private BoardID( int value, String label )
- {
- mValue = value;
- mLabel = label;
- }
-
- public int getValue()
- {
- return mValue;
- }
-
- public String getLabel()
- {
- return mLabel;
- }
-
- public static BoardID fromValue( int value )
- {
- if( value == 0 )
- {
- return AIRSPY;
- }
-
- return UNKNOWN;
- }
- }
-
- /**
- * Airspy Commands
- */
- public enum Command
- {
- INVALID( 0 ),
- RECEIVER_MODE( 1 ),
- SI5351C_WRITE( 2 ),
- SI5351C_READ( 3 ),
- R820T_WRITE( 4 ),
- R820T_READ( 5 ),
- SPIFLASH_ERASE( 6 ),
- SPIFLASH_WRITE( 7 ),
- SPIFLASH_READ( 8 ),
- BOARD_ID_READ( 9 ),
- VERSION_STRING_READ( 10 ),
- BOARD_PART_ID_SERIAL_NUMBER_READ( 11 ),
- SET_SAMPLE_RATE( 12 ),
- SET_FREQUENCY( 13 ),
- SET_LNA_GAIN( 14 ),
- SET_MIXER_GAIN( 15 ),
- SET_VGA_GAIN( 16 ),
- SET_LNA_AGC( 17 ),
- SET_MIXER_AGC( 18 ),
- MS_VENDOR_COMMAND( 19 ),
- SET_RF_BIAS_COMMAND( 20 ),
- GPIO_WRITE( 21 ),
- GPIO_READ( 22 ),
- GPIO_DIR__WRITE( 23 ),
- GPIO_DIR_READ( 24 ),
- GET_SAMPLE_RATES( 25 ),
- SET_PACKING( 26 );
-
- private int mValue;
-
- private Command( int value )
- {
- mValue = value;
- }
-
- public byte getValue()
- {
- return (byte)mValue;
- }
-
- public static Command fromValue( int value )
- {
- if( 0 <= value && value <= 25 )
- {
- return Command.values()[ value ];
- }
-
- return INVALID;
- }
- }
-
- public enum ReceiverMode
- {
- OFF( 0 ),
- ON( 1 );
-
- private int mValue;
-
- private ReceiverMode( int value )
- {
- mValue = value;
- }
-
- public int getValue()
- {
- return mValue;
- }
- }
-
- /**
- * General Purpose Input/Output Ports (accessible on the airspy board)
- */
- public enum GPIOPort
- {
- PORT_0( 0 ),
- PORT_1( 1 ),
- PORT_2( 2 ),
- PORT_3( 3 ),
- PORT_4( 4 ),
- PORT_5( 5 ),
- PORT_6( 6 ),
- PORT_7( 7 );
-
- private int mValue;
-
- private GPIOPort( int value )
- {
- mValue = value;
- }
-
- public int getValue()
- {
- return mValue;
- }
- }
-
- /**
- * General Purpose Input/Output Pins (accessible on the airspy board)
- */
- public enum GPIOPin
- {
- PIN_0( 0 ),
- PIN_1( 1 ),
- PIN_2( 2 ),
- PIN_3( 3 ),
- PIN_4( 4 ),
- PIN_5( 5 ),
- PIN_6( 6 ),
- PIN_7( 7 ),
- PIN_8( 8 ),
- PIN_9( 9 ),
- PIN_10( 10 ),
- PIN_11( 11 ),
- PIN_12( 12 ),
- PIN_13( 13 ),
- PIN_14( 14 ),
- PIN_15( 15 ),
- PIN_16( 16 ),
- PIN_17( 17 ),
- PIN_18( 18 ),
- PIN_19( 19 ),
- PIN_20( 20 ),
- PIN_21( 21 ),
- PIN_22( 22 ),
- PIN_23( 23 ),
- PIN_24( 24 ),
- PIN_25( 25 ),
- PIN_26( 26 ),
- PIN_27( 27 ),
- PIN_28( 28 ),
- PIN_29( 29 ),
- PIN_30( 30 ),
- PIN_31( 31 );
-
- private int mValue;
-
- private GPIOPin( int value )
- {
- mValue = value;
- }
-
- public int getValue()
- {
- return mValue;
- }
- }
-
- /**
- * Adds a sample listener. If the buffer processing thread is
- * not currently running, starts it running in a new thread.
- */
- public void addListener( Listener listener )
- {
- synchronized ( mComplexBufferBroadcaster )
- {
- mComplexBufferBroadcaster.addListener( listener );
-
- if( mBufferProcessor == null || !mBufferProcessor.isRunning() )
- {
- mBufferProcessor = new BufferProcessor();
-
- Thread thread = new Thread( mBufferProcessor );
- thread.setDaemon( true );
- thread.setName( "Airspy Buffer Processor" );
-
- thread.start();
- }
- }
- }
-
- /**
- * Removes the sample listener. If this is the last registered listener,
- * shuts down the buffer processing thread.
- */
- public void removeListener( Listener listener )
- {
- synchronized ( mComplexBufferBroadcaster )
- {
- mComplexBufferBroadcaster.removeListener( listener );
-
- if( !mComplexBufferBroadcaster.hasListeners() )
- {
- mBufferProcessor.stop();
- }
- }
- }
-
- /**
- * Buffer processing thread. Fetches samples from the Airspy Tuner and
- * dispatches them to all registered listeners
- */
- public class BufferProcessor implements Runnable, TransferCallback
- {
- private ScheduledFuture mSampleDispatcherTask;
- private LinkedTransferQueue mAvailableTransfers;
- private LinkedTransferQueue mTransfersInProgress = new LinkedTransferQueue<>();
- private AtomicBoolean mRunning = new AtomicBoolean();
- private ByteBuffer mLibUsbHandlerStatus;
- private boolean mCancel = false;
-
- @Override
- public void run()
+ try
{
- if( mRunning.compareAndSet( false, true ) )
- {
- prepareTransfers();
-
- mSampleDispatcherTask = mThreadPoolManager.scheduleFixedRate(
- ThreadType.SOURCE_SAMPLE_PROCESSING, new BufferDispatcher(),
- 20, TimeUnit.MILLISECONDS );
+ //Read 6 x 32-bit integers = 24 bytes
+ byte[] serial = readArray(
+ Command.BOARD_PART_ID_SERIAL_NUMBER_READ, 0, 0, 24);
- mLibUsbHandlerStatus = ByteBuffer.allocateDirect( 4 );
-
- List transfers = new ArrayList<>();
-
- mCancel = false;
-
- while( mRunning.get() )
- {
- mAvailableTransfers.drainTo( transfers );
-
- for( Transfer transfer: transfers )
- {
- int result = LibUsb.submitTransfer( transfer );
-
- if( result == LibUsb.SUCCESS )
- {
- mTransfersInProgress.add( transfer );
- }
- else
- {
- mLog.error( "error submitting transfer [" +
- LibUsb.errorName( result ) + "]" );
- }
- }
-
- int result = LibUsb.handleEventsTimeoutCompleted(
- null, USB_TIMEOUT_MS, mLibUsbHandlerStatus.asIntBuffer() );
-
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "error handling events for libusb" );
- }
-
- transfers.clear();
-
- mLibUsbHandlerStatus.rewind();
- }
-
- if( mCancel )
- {
- for( Transfer transfer: mTransfersInProgress )
- {
- LibUsb.cancelTransfer( transfer );
- }
-
- int result = LibUsb.handleEventsTimeoutCompleted( null,
- USB_TIMEOUT_MS, mLibUsbHandlerStatus.asIntBuffer() );
-
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "error handling events for libusb during cancel" );
- }
-
- mLibUsbHandlerStatus.rewind();
- }
- }
+ mDeviceInfo.setPartAndSerialNumber(serial);
+ }
+ catch(LibUsbException | UsbException e)
+ {
+ mLog.error("Error reading airspy version string", e);
+ }
+ }
+
+ /**
+ * Reads a single byte value from the device.
+ *
+ * @param command - airspy command
+ * @param value - value field for usb setup packet
+ * @param index - index field for usb setup packet
+ * @return - byte value as an integer
+ * @throws LibUsbException if the operation is unsuccesful
+ * @throws UsbException on any usb errors
+ */
+ private int readByte(Command command, int value, int index, boolean signed)
+ throws LibUsbException, UsbException
+ {
+ if(mDeviceHandle != null)
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(1);
+
+ int transferred = LibUsb.controlTransfer(mDeviceHandle,
+ USB_REQUEST_IN,
+ command.getValue(),
+ (short) value,
+ (short) index,
+ buffer,
+ USB_TIMEOUT_MS);
+
+ if(transferred < 0)
+ {
+ throw new LibUsbException("read error", transferred);
+ }
+
+ byte result = buffer.get(0);
+
+ if(signed)
+ {
+ return (result & 0xFF);
+ }
+ else
+ {
+ return result;
+ }
+ }
+ else
+ {
+ throw new LibUsbException("device handle is null",
+ LibUsb.ERROR_NO_DEVICE);
+ }
+ }
+
+ /**
+ * Reads a multi-byte value from the device
+ *
+ * @param command - airspy command
+ * @param value - usb packet value
+ * @param index - usb packet index
+ * @param length - number of bytes to read
+ * @return - bytes read from the device
+ * @throws LibUsbException if quantity of bytes read doesn't equal the
+ * requested number of bytes
+ * @throws UsbException on error communicating with the device
+ */
+ private byte[] readArray(Command command, int value, int index, int length)
+ throws LibUsbException, UsbException
+ {
+ if(mDeviceHandle != null)
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(length);
+
+ int transferred = LibUsb.controlTransfer(mDeviceHandle,
+ USB_REQUEST_IN,
+ command.getValue(),
+ (short) value,
+ (short) index,
+ buffer,
+ USB_TIMEOUT_MS);
+
+ if(transferred < 0)
+ {
+ throw new LibUsbException("read error", transferred);
+ }
+
+ byte[] results = new byte[transferred];
+
+ buffer.get(results);
+
+ return results;
+ }
+ else
+ {
+ throw new LibUsbException("device handle is null",
+ LibUsb.ERROR_NO_DEVICE);
+ }
+ }
+
+ /**
+ * Writes the buffer contents to the device
+ *
+ * @param command - airspy command
+ * @param value - usb packet value
+ * @param index - usb packet index
+ * @param buffer - data to write to the device
+ * @throws UsbException on error
+ */
+ public void write(Command command, int value, int index, ByteBuffer buffer)
+ throws UsbException
+ {
+ if(mDeviceHandle != null)
+ {
+ int transferred = LibUsb.controlTransfer(mDeviceHandle,
+ USB_REQUEST_OUT,
+ command.getValue(),
+ (short) value,
+ (short) index,
+ buffer,
+ USB_TIMEOUT_MS);
+
+ if(transferred < 0)
+ {
+ throw new LibUsbException("error writing byte buffer",
+ transferred);
+ }
+ else if(transferred != buffer.capacity())
+ {
+ throw new LibUsbException("transferred bytes [" +
+ transferred + "] is not what was expected [" +
+ buffer.capacity() + "]", transferred);
+ }
+ }
+ else
+ {
+ throw new LibUsbException("device handle is null",
+ LibUsb.ERROR_NO_DEVICE);
+ }
+ }
+
+ public enum GainMode
+ {
+ LINEARITY,
+ SENSITIVITY,
+ CUSTOM;
+ }
+
+ public enum Gain
+ {
+ LINEARITY_1(1, 4, 0, 0),
+ LINEARITY_2(2, 5, 0, 0),
+ LINEARITY_3(3, 6, 1, 0),
+ LINEARITY_4(4, 7, 1, 0),
+ LINEARITY_5(5, 8, 1, 0),
+ LINEARITY_6(6, 9, 1, 0),
+ LINEARITY_7(7, 10, 2, 0),
+ LINEARITY_8(8, 10, 2, 1),
+ LINEARITY_9(9, 10, 0, 3),
+ LINEARITY_10(10, 10, 0, 5),
+ LINEARITY_11(11, 10, 1, 6),
+ LINEARITY_12(12, 10, 0, 8),
+ LINEARITY_13(13, 10, 0, 9),
+ LINEARITY_14(14, 10, 5, 8),
+ LINEARITY_15(15, 10, 6, 9),
+ LINEARITY_16(16, 11, 6, 9),
+ LINEARITY_17(17, 11, 7, 10),
+ LINEARITY_18(18, 11, 8, 12),
+ LINEARITY_19(19, 11, 9, 13),
+ LINEARITY_20(20, 11, 11, 14),
+ LINEARITY_21(21, 12, 12, 14),
+ LINEARITY_22(22, 13, 12, 14),
+ SENSITIVITY_1(1, 4, 0, 0),
+ SENSITIVITY_2(2, 4, 0, 1),
+ SENSITIVITY_3(3, 4, 0, 2),
+ SENSITIVITY_4(4, 4, 0, 3),
+ SENSITIVITY_5(5, 4, 1, 5),
+ SENSITIVITY_6(6, 4, 2, 6),
+ SENSITIVITY_7(7, 4, 2, 7),
+ SENSITIVITY_8(8, 4, 3, 8),
+ SENSITIVITY_9(9, 4, 4, 9),
+ SENSITIVITY_10(10, 5, 4, 9),
+ SENSITIVITY_11(11, 5, 4, 12),
+ SENSITIVITY_12(12, 5, 7, 12),
+ SENSITIVITY_13(13, 5, 8, 13),
+ SENSITIVITY_14(14, 5, 9, 14),
+ SENSITIVITY_15(15, 6, 9, 14),
+ SENSITIVITY_16(16, 7, 10, 14),
+ SENSITIVITY_17(17, 8, 10, 14),
+ SENSITIVITY_18(18, 9, 11, 14),
+ SENSITIVITY_19(19, 10, 12, 14),
+ SENSITIVITY_20(20, 11, 12, 14),
+ SENSITIVITY_21(21, 12, 12, 14),
+ SENSITIVITY_22(22, 13, 12, 14),
+ CUSTOM(1, 0, 0, 0);
+
+ private int mValue;
+ private int mIF;
+ private int mMixer;
+ private int mLNA;
+
+ private Gain(int value, int ifGain, int mixer, int lna)
+ {
+ mValue = value;
+ mIF = ifGain;
+ mMixer = mixer;
+ mLNA = lna;
}
- /**
- * Stops the sample fetching thread
- */
- public void stop()
- {
- mCancel = true;
-
- if( mRunning.compareAndSet( true, false ) )
- {
- if( mSampleDispatcherTask != null )
- {
- mSampleDispatcherTask.cancel( true );
- mFilledBuffers.clear();
- }
- }
- }
+ public int getValue()
+ {
+ return mValue;
+ }
- /**
- * Indicates if this thread is running
- */
- public boolean isRunning()
- {
- return mRunning.get();
- }
-
- @Override
- public void processTransfer( Transfer transfer )
- {
- mTransfersInProgress.remove( transfer );
-
- switch( transfer.status() )
- {
- case LibUsb.TRANSFER_COMPLETED:
- case LibUsb.TRANSFER_STALL:
- if( transfer.actualLength() > 0 )
- {
- ByteBuffer buffer = transfer.buffer();
-
- byte[] data = new byte[ transfer.actualLength() ];
-
- buffer.get( data );
-
- buffer.rewind();
-
- if( isRunning() )
- {
- mFilledBuffers.add( data );
- }
- }
- break;
- case LibUsb.TRANSFER_CANCELLED:
- break;
- default:
+ public int getIF()
+ {
+ return mIF;
+ }
+
+ public int getMixer()
+ {
+ return mMixer;
+ }
+
+ public int getLNA()
+ {
+ return mLNA;
+ }
+
+ public static Gain getGain(GainMode mode, int value)
+ {
+ assert (GAIN_MIN <= value && value <= GAIN_MAX);
+
+ switch(mode)
+ {
+ case LINEARITY:
+ for(Gain gain : getLinearityGains())
+ {
+ if(gain.getValue() == value)
+ {
+ return gain;
+ }
+ }
+ return LINEARITY_GAIN_DEFAULT;
+ case SENSITIVITY:
+ for(Gain gain : getSensitivityGains())
+ {
+ if(gain.getValue() == value)
+ {
+ return gain;
+ }
+ }
+ return SENSITIVITY_GAIN_DEFAULT;
+ case CUSTOM:
+ default:
+ return Gain.CUSTOM;
+ }
+ }
+
+ public static GainMode getGainMode(Gain gain)
+ {
+ if(gain == CUSTOM)
+ {
+ return GainMode.CUSTOM;
+ }
+ else if(getLinearityGains().contains(gain))
+ {
+ return GainMode.LINEARITY;
+ }
+ else if(getSensitivityGains().contains(gain))
+ {
+ return GainMode.SENSITIVITY;
+ }
+
+ return GainMode.CUSTOM;
+ }
+
+ public static EnumSet getLinearityGains()
+ {
+ return EnumSet.range(LINEARITY_1, LINEARITY_22);
+ }
+
+ public static EnumSet getSensitivityGains()
+ {
+ return EnumSet.range(SENSITIVITY_1, SENSITIVITY_22);
+ }
+ }
+
+
+ /**
+ * Airspy Board Identifier
+ */
+ public enum BoardID
+ {
+ AIRSPY(0, "Airspy"),
+ UNKNOWN(-1, "Unknown");
+
+ private int mValue;
+ private String mLabel;
+
+ private BoardID(int value, String label)
+ {
+ mValue = value;
+ mLabel = label;
+ }
+
+ public int getValue()
+ {
+ return mValue;
+ }
+
+ public String getLabel()
+ {
+ return mLabel;
+ }
+
+ public static BoardID fromValue(int value)
+ {
+ if(value == 0)
+ {
+ return AIRSPY;
+ }
+
+ return UNKNOWN;
+ }
+ }
+
+ /**
+ * Airspy Commands
+ */
+ public enum Command
+ {
+ INVALID(0),
+ RECEIVER_MODE(1),
+ SI5351C_WRITE(2),
+ SI5351C_READ(3),
+ R820T_WRITE(4),
+ R820T_READ(5),
+ SPIFLASH_ERASE(6),
+ SPIFLASH_WRITE(7),
+ SPIFLASH_READ(8),
+ BOARD_ID_READ(9),
+ VERSION_STRING_READ(10),
+ BOARD_PART_ID_SERIAL_NUMBER_READ(11),
+ SET_SAMPLE_RATE(12),
+ SET_FREQUENCY(13),
+ SET_LNA_GAIN(14),
+ SET_MIXER_GAIN(15),
+ SET_VGA_GAIN(16),
+ SET_LNA_AGC(17),
+ SET_MIXER_AGC(18),
+ MS_VENDOR_COMMAND(19),
+ SET_RF_BIAS_COMMAND(20),
+ GPIO_WRITE(21),
+ GPIO_READ(22),
+ GPIO_DIR__WRITE(23),
+ GPIO_DIR_READ(24),
+ GET_SAMPLE_RATES(25),
+ SET_PACKING(26);
+
+ private int mValue;
+
+ private Command(int value)
+ {
+ mValue = value;
+ }
+
+ public byte getValue()
+ {
+ return (byte) mValue;
+ }
+
+ public static Command fromValue(int value)
+ {
+ if(0 <= value && value <= 25)
+ {
+ return Command.values()[value];
+ }
+
+ return INVALID;
+ }
+ }
+
+ public enum ReceiverMode
+ {
+ OFF(0),
+ ON(1);
+
+ private int mValue;
+
+ private ReceiverMode(int value)
+ {
+ mValue = value;
+ }
+
+ public int getValue()
+ {
+ return mValue;
+ }
+ }
+
+ /**
+ * General Purpose Input/Output Ports (accessible on the airspy board)
+ */
+ public enum GPIOPort
+ {
+ PORT_0(0),
+ PORT_1(1),
+ PORT_2(2),
+ PORT_3(3),
+ PORT_4(4),
+ PORT_5(5),
+ PORT_6(6),
+ PORT_7(7);
+
+ private int mValue;
+
+ private GPIOPort(int value)
+ {
+ mValue = value;
+ }
+
+ public int getValue()
+ {
+ return mValue;
+ }
+ }
+
+ /**
+ * General Purpose Input/Output Pins (accessible on the airspy board)
+ */
+ public enum GPIOPin
+ {
+ PIN_0(0),
+ PIN_1(1),
+ PIN_2(2),
+ PIN_3(3),
+ PIN_4(4),
+ PIN_5(5),
+ PIN_6(6),
+ PIN_7(7),
+ PIN_8(8),
+ PIN_9(9),
+ PIN_10(10),
+ PIN_11(11),
+ PIN_12(12),
+ PIN_13(13),
+ PIN_14(14),
+ PIN_15(15),
+ PIN_16(16),
+ PIN_17(17),
+ PIN_18(18),
+ PIN_19(19),
+ PIN_20(20),
+ PIN_21(21),
+ PIN_22(22),
+ PIN_23(23),
+ PIN_24(24),
+ PIN_25(25),
+ PIN_26(26),
+ PIN_27(27),
+ PIN_28(28),
+ PIN_29(29),
+ PIN_30(30),
+ PIN_31(31);
+
+ private int mValue;
+
+ private GPIOPin(int value)
+ {
+ mValue = value;
+ }
+
+ public int getValue()
+ {
+ return mValue;
+ }
+ }
+
+ /**
+ * Adds a sample listener. If the buffer processing thread is
+ * not currently running, starts it running in a new thread.
+ */
+ public void addListener(Listener listener)
+ {
+ synchronized(mComplexBufferBroadcaster)
+ {
+ mComplexBufferBroadcaster.addListener(listener);
+
+ if(mBufferProcessor == null || !mBufferProcessor.isRunning())
+ {
+ mBufferProcessor = new BufferProcessor();
+
+ Thread thread = new Thread(mBufferProcessor);
+ thread.setDaemon(true);
+ thread.setName("Airspy Buffer Processor");
+
+ thread.start();
+ }
+ }
+ }
+
+ /**
+ * Removes the sample listener. If this is the last registered listener,
+ * shuts down the buffer processing thread.
+ */
+ public void removeListener(Listener listener)
+ {
+ synchronized(mComplexBufferBroadcaster)
+ {
+ mComplexBufferBroadcaster.removeListener(listener);
+
+ if(!mComplexBufferBroadcaster.hasListeners())
+ {
+ mBufferProcessor.stop();
+ }
+ }
+ }
+
+ /**
+ * Buffer processing thread. Fetches samples from the Airspy Tuner and
+ * dispatches them to all registered listeners
+ */
+ public class BufferProcessor implements Runnable, TransferCallback
+ {
+ private ScheduledFuture mSampleDispatcherTask;
+ private LinkedTransferQueue mAvailableTransfers;
+ private LinkedTransferQueue mTransfersInProgress = new LinkedTransferQueue<>();
+ private AtomicBoolean mRunning = new AtomicBoolean();
+ private ByteBuffer mLibUsbHandlerStatus;
+ private boolean mCancel = false;
+
+ @Override
+ public void run()
+ {
+ if(mRunning.compareAndSet(false, true))
+ {
+ prepareTransfers();
+
+ mSampleDispatcherTask = ThreadPool.SCHEDULED.scheduleAtFixedRate(new BufferDispatcher(),
+ 20, 20, TimeUnit.MILLISECONDS);
+
+ mLibUsbHandlerStatus = ByteBuffer.allocateDirect(4);
+
+ List transfers = new ArrayList<>();
+
+ mCancel = false;
+
+ while(mRunning.get())
+ {
+ mAvailableTransfers.drainTo(transfers);
+
+ for(Transfer transfer : transfers)
+ {
+ int result = LibUsb.submitTransfer(transfer);
+
+ if(result == LibUsb.SUCCESS)
+ {
+ mTransfersInProgress.add(transfer);
+ }
+ else
+ {
+ mLog.error("error submitting transfer [" + LibUsb.errorName(result) + "]");
+ }
+ }
+
+ int result = LibUsb.handleEventsTimeoutCompleted(
+ null, USB_TIMEOUT_MS, mLibUsbHandlerStatus.asIntBuffer());
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("error handling events for libusb");
+ }
+
+ transfers.clear();
+
+ mLibUsbHandlerStatus.rewind();
+ }
+
+ if(mCancel)
+ {
+ for(Transfer transfer : mTransfersInProgress)
+ {
+ LibUsb.cancelTransfer(transfer);
+ }
+
+ int result = LibUsb.handleEventsTimeoutCompleted(null,
+ USB_TIMEOUT_MS, mLibUsbHandlerStatus.asIntBuffer());
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("error handling events for libusb during cancel");
+ }
+
+ mLibUsbHandlerStatus.rewind();
+ }
+ }
+ }
+
+ /**
+ * Stops the sample fetching thread
+ */
+ public void stop()
+ {
+ mCancel = true;
+
+ if(mRunning.compareAndSet(true, false))
+ {
+ if(mSampleDispatcherTask != null)
+ {
+ mSampleDispatcherTask.cancel(true);
+ mFilledBuffers.clear();
+ }
+ }
+ }
+
+ /**
+ * Indicates if this thread is running
+ */
+ public boolean isRunning()
+ {
+ return mRunning.get();
+ }
+
+ @Override
+ public void processTransfer(Transfer transfer)
+ {
+ mTransfersInProgress.remove(transfer);
+
+ switch(transfer.status())
+ {
+ case LibUsb.TRANSFER_COMPLETED:
+ case LibUsb.TRANSFER_STALL:
+ if(transfer.actualLength() > 0)
+ {
+ ByteBuffer buffer = transfer.buffer();
+
+ byte[] data = new byte[transfer.actualLength()];
+
+ buffer.get(data);
+
+ buffer.rewind();
+
+ if(isRunning())
+ {
+ mFilledBuffers.add(data);
+ }
+ }
+ break;
+ case LibUsb.TRANSFER_CANCELLED:
+ break;
+ default:
/* unexpected error */
- mLog.error( "transfer error [" +
- getTransferStatus( transfer.status() ) +
- "] transferred actual: " + transfer.actualLength() );
- }
-
- mAvailableTransfers.add( transfer );
- }
-
- /**
- * Prepares (allocates) a set of transfer buffers for use in
- * transferring data from the tuner via the bulk interface
- */
- private void prepareTransfers() throws LibUsbException
- {
- if( mAvailableTransfers == null )
- {
- mAvailableTransfers = new LinkedTransferQueue<>();
-
- for( int x = 0; x < TRANSFER_BUFFER_POOL_SIZE; x++ )
- {
- Transfer transfer = LibUsb.allocTransfer();
+ mLog.error("transfer error [" +
+ getTransferStatus(transfer.status()) +
+ "] transferred actual: " + transfer.actualLength());
+ }
- if( transfer == null )
- {
- throw new LibUsbException( "couldn't allocate transfer",
- LibUsb.ERROR_NO_MEM );
- }
-
- final ByteBuffer buffer =
- ByteBuffer.allocateDirect( mBufferSize );
-
- LibUsb.fillBulkTransfer( transfer, mDeviceHandle, USB_ENDPOINT,
- buffer, BufferProcessor.this, "Buffer", USB_TIMEOUT_MS );
+ mAvailableTransfers.add(transfer);
+ }
- mAvailableTransfers.add( transfer );
- }
- }
- }
- }
+ /**
+ * Prepares (allocates) a set of transfer buffers for use in
+ * transferring data from the tuner via the bulk interface
+ */
+ private void prepareTransfers() throws LibUsbException
+ {
+ if(mAvailableTransfers == null)
+ {
+ mAvailableTransfers = new LinkedTransferQueue<>();
- /**
- * Fetches byte[] chunks from the raw sample buffer. Converts each byte
- * array and broadcasts the array to all registered listeners
- */
- public class BufferDispatcher implements Runnable
- {
- @Override
+ for(int x = 0; x < TRANSFER_BUFFER_POOL_SIZE; x++)
+ {
+ Transfer transfer = LibUsb.allocTransfer();
+
+ if(transfer == null)
+ {
+ throw new LibUsbException("couldn't allocate transfer",
+ LibUsb.ERROR_NO_MEM);
+ }
+
+ final ByteBuffer buffer =
+ ByteBuffer.allocateDirect(mBufferSize);
+
+ LibUsb.fillBulkTransfer(transfer, mDeviceHandle, USB_ENDPOINT,
+ buffer, BufferProcessor.this, "Buffer", USB_TIMEOUT_MS);
+
+ mAvailableTransfers.add(transfer);
+ }
+ }
+ }
+ }
+
+ /**
+ * Fetches byte[] chunks from the raw sample buffer. Converts each byte
+ * array and broadcasts the array to all registered listeners
+ */
+ public class BufferDispatcher implements Runnable
+ {
+ @Override
public void run()
{
- try
- {
- ArrayList buffers = new ArrayList<>();
-
- mFilledBuffers.drainTo( buffers );
+ try
+ {
+ ArrayList buffers = new ArrayList<>();
- for( byte[] buffer: buffers )
- {
- float[] realSamples = mSampleAdapter.convert( buffer );
+ mFilledBuffers.drainTo(buffers);
- realSamples = mDCFilter.filter( realSamples );
+ for(byte[] buffer : buffers)
+ {
+ float[] realSamples = mSampleAdapter.convert(buffer);
- float[] quadratureSamples = mHilbertTransform.filter( realSamples );
-
- mComplexBufferBroadcaster.broadcast(
- new ComplexBuffer( quadratureSamples ) );
- }
- }
- catch( Exception e )
- {
- mLog.error( "error during Airspy buffer dispatching", e );
- }
+ realSamples = mDCFilter.filter(realSamples);
+
+ float[] quadratureSamples = mHilbertTransform.filter(realSamples);
+
+ mComplexBufferBroadcaster.broadcast(
+ new ComplexBuffer(quadratureSamples));
+ }
+ }
+ catch(Exception e)
+ {
+ mLog.error("error during Airspy buffer dispatching", e);
+ }
}
- }
+ }
}
diff --git a/src/source/tuner/hackrf/HackRFTunerController.java b/src/source/tuner/hackrf/HackRFTunerController.java
index 69698afe..fb570199 100644
--- a/src/source/tuner/hackrf/HackRFTunerController.java
+++ b/src/source/tuner/hackrf/HackRFTunerController.java
@@ -1,30 +1,30 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
- *
+ *
* Ported from libhackrf at:
* https://github.com/mossmann/hackrf/tree/master/host/libhackrf
- *
+ *
* Copyright (c) 2012, Jared Boone
* Copyright (c) 2013, Benjamin Vernoux
* copyright (c) 2013, Michael Ossmann
- *
+ *
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
- *
+ *
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* Neither the name of Great Scott Gadgets nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -37,34 +37,22 @@
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see mFilledBuffers =
+ new LinkedTransferQueue();
- public final static int TRANSFER_BUFFER_POOL_SIZE = 16;
-
- private LinkedTransferQueue mFilledBuffers =
- new LinkedTransferQueue();
-
private Broadcaster mComplexBufferBroadcaster = new Broadcaster<>();
-
- private ByteSampleAdapter mSampleAdapter = new ByteSampleAdapter();
- private BufferProcessor mBufferProcessor = new BufferProcessor();
-
- private HackRFSampleRate mSampleRate = HackRFSampleRate.RATE2_016MHZ;
- public int mBufferSize = 262144;
- private boolean mAmplifierEnabled = false;
-
- private Device mDevice;
- private DeviceDescriptor mDeviceDescriptor;
- private DeviceHandle mDeviceHandle;
- private ThreadPoolManager mThreadPoolManager;
-
- public HackRFTunerController( Device device, DeviceDescriptor descriptor,
- ThreadPoolManager threadPoolManager ) throws SourceException
- {
- super( MIN_FREQUENCY, MAX_FREQUENCY, DC_SPIKE_AVOID_BUFFER, USABLE_BANDWIDTH_PERCENT );
- mDevice = device;
- mDeviceDescriptor = descriptor;
- mThreadPoolManager = threadPoolManager;
- }
-
- public void init() throws SourceException
- {
- mDeviceHandle = new DeviceHandle();
-
- int result = LibUsb.open( mDevice, mDeviceHandle );
-
- if( result != 0 )
- {
- if( result == LibUsb.ERROR_ACCESS )
- {
- mLog.error( "Unable to access HackRF - insufficient permissions. "
- + "If you are running a Linux OS, have you installed the "
- + "hackRF rules file in \\etc\\udev\\rules.d ??" );
- }
-
- throw new SourceException( "Couldn't open hackrf device - " +
- LibUsb.strError( result ) );
- }
+ private ByteSampleAdapter mSampleAdapter = new ByteSampleAdapter();
+ private BufferProcessor mBufferProcessor = new BufferProcessor();
- try
- {
- claimInterface();
+ private HackRFSampleRate mSampleRate = HackRFSampleRate.RATE2_016MHZ;
+ public int mBufferSize = 262144;
+ private boolean mAmplifierEnabled = false;
- setMode( Mode.RECEIVE );
-
- setFrequency( DEFAULT_FREQUENCY );
- }
- catch( Exception e )
- {
- throw new SourceException( "HackRF Tuner Controller - couldn't "
- + "claim USB interface or get endpoint or pipe", e );
- }
- }
+ private Device mDevice;
+ private DeviceDescriptor mDeviceDescriptor;
+ private DeviceHandle mDeviceHandle;
- /**
- * Claims the USB interface. If another application currently has
- * the interface claimed, the USB_FORCE_CLAIM_INTERFACE setting
- * will dictate if the interface is forcibly claimed from the other
- * application
- */
- private void claimInterface() throws SourceException
- {
- if( mDeviceHandle != null )
- {
- int result = LibUsb.kernelDriverActive( mDeviceHandle, USB_INTERFACE );
-
- if( result == 1 )
- {
- result = LibUsb.detachKernelDriver( mDeviceHandle, USB_INTERFACE );
+ public HackRFTunerController(Device device, DeviceDescriptor descriptor) throws SourceException
+ {
+ super(MIN_FREQUENCY, MAX_FREQUENCY, DC_SPIKE_AVOID_BUFFER, USABLE_BANDWIDTH_PERCENT);
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "failed attempt to detach kernel driver [" +
- LibUsb.errorName( result ) + "]" );
-
- throw new SourceException( "couldn't detach kernel driver "
- + "from device" );
- }
- }
-
- result = LibUsb.claimInterface( mDeviceHandle, USB_INTERFACE );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new SourceException( "couldn't claim usb interface [" +
- LibUsb.errorName( result ) + "]" );
- }
- }
- else
- {
- throw new SourceException( "couldn't claim usb interface - no "
- + "device handle" );
- }
- }
+ mDevice = device;
+ mDeviceDescriptor = descriptor;
+ }
- /**
- * HackRF board identifier/type
- */
- public BoardID getBoardID() throws UsbException
- {
- int id = readByte( Request.BOARD_ID_READ, (byte)0, (byte)0, false );
-
- return BoardID.lookup( id );
- }
-
- /**
- * HackRF firmware version string
- */
- public String getFirmwareVersion() throws UsbException
- {
- ByteBuffer buffer = readArray( Request.VERSION_STRING_READ, 0, 0, 255 );
+ public void init() throws SourceException
+ {
+ mDeviceHandle = new DeviceHandle();
- byte[] data = new byte[ 255 ];
-
- buffer.get( data );
+ int result = LibUsb.open(mDevice, mDeviceHandle);
- return new String( data );
- }
-
- /**
- * HackRF part id number and serial number
- */
- public Serial getSerial() throws UsbException
- {
- ByteBuffer buffer = readArray( Request.BOARD_PARTID_SERIALNO_READ, 0, 0, 24 );
+ if(result != 0)
+ {
+ if(result == LibUsb.ERROR_ACCESS)
+ {
+ mLog.error("Unable to access HackRF - insufficient permissions. "
+ + "If you are running a Linux OS, have you installed the "
+ + "hackRF rules file in \\etc\\udev\\rules.d ??");
+ }
- return new Serial( buffer );
- }
+ throw new SourceException("Couldn't open hackrf device - " +
+ LibUsb.strError(result));
+ }
- /**
- * Sets the HackRF transceiver mode
- */
- public void setMode( Mode mode ) throws UsbException
- {
- write( Request.SET_TRANSCEIVER_MODE, mode.getNumber(), 0 );
- }
+ try
+ {
+ claimInterface();
- /**
- * Sets the HackRF baseband filter
- */
- public void setBasebandFilter( BasebandFilter filter ) throws UsbException
- {
- write( Request.BASEBAND_FILTER_BANDWIDTH_SET,
- filter.getLowValue(),
- filter.getHighValue() );
- }
+ setMode(Mode.RECEIVE);
- /**
- * Enables (true) or disables (false) the amplifier
- */
- public void setAmplifierEnabled( boolean enabled ) throws UsbException
- {
- write( Request.AMP_ENABLE, ( enabled ? 1 : 0 ), 0 );
-
- mAmplifierEnabled = enabled;
- }
-
- public boolean getAmplifier()
- {
- return mAmplifierEnabled;
- }
+ setFrequency(DEFAULT_FREQUENCY);
+ }
+ catch(Exception e)
+ {
+ throw new SourceException("HackRF Tuner Controller - couldn't "
+ + "claim USB interface or get endpoint or pipe", e);
+ }
+ }
- /**
- * Sets the IF LNA Gain
- */
- public void setLNAGain( HackRFLNAGain gain ) throws UsbException
- {
- int result = readByte( Request.SET_LNA_GAIN, 0, gain.getValue(), true );
-
- if( result != 1 )
- {
- throw new UsbException( "couldn't set lna gain to " + gain );
- }
- }
-
- /**
- * Sets the Baseband VGA Gain
- */
- public void setVGAGain( HackRFVGAGain gain ) throws UsbException
- {
- int result = readByte( Request.SET_VGA_GAIN, 0, gain.getValue(), true );
-
- if( result != 1 )
- {
- throw new UsbException( "couldn't set vga gain to " + gain );
- }
- }
+ /**
+ * Claims the USB interface. If another application currently has
+ * the interface claimed, the USB_FORCE_CLAIM_INTERFACE setting
+ * will dictate if the interface is forcibly claimed from the other
+ * application
+ */
+ private void claimInterface() throws SourceException
+ {
+ if(mDeviceHandle != null)
+ {
+ int result = LibUsb.kernelDriverActive(mDeviceHandle, USB_INTERFACE);
- /**
- * Not implemented
- */
+ if(result == 1)
+ {
+ result = LibUsb.detachKernelDriver(mDeviceHandle, USB_INTERFACE);
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("failed attempt to detach kernel driver [" +
+ LibUsb.errorName(result) + "]");
+
+ throw new SourceException("couldn't detach kernel driver "
+ + "from device");
+ }
+ }
+
+ result = LibUsb.claimInterface(mDeviceHandle, USB_INTERFACE);
+
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new SourceException("couldn't claim usb interface [" +
+ LibUsb.errorName(result) + "]");
+ }
+ }
+ else
+ {
+ throw new SourceException("couldn't claim usb interface - no "
+ + "device handle");
+ }
+ }
+
+ /**
+ * HackRF board identifier/type
+ */
+ public BoardID getBoardID() throws UsbException
+ {
+ int id = readByte(Request.BOARD_ID_READ, (byte) 0, (byte) 0, false);
+
+ return BoardID.lookup(id);
+ }
+
+ /**
+ * HackRF firmware version string
+ */
+ public String getFirmwareVersion() throws UsbException
+ {
+ ByteBuffer buffer = readArray(Request.VERSION_STRING_READ, 0, 0, 255);
+
+ byte[] data = new byte[255];
+
+ buffer.get(data);
+
+ return new String(data);
+ }
+
+ /**
+ * HackRF part id number and serial number
+ */
+ public Serial getSerial() throws UsbException
+ {
+ ByteBuffer buffer = readArray(Request.BOARD_PARTID_SERIALNO_READ, 0, 0, 24);
+
+ return new Serial(buffer);
+ }
+
+ /**
+ * Sets the HackRF transceiver mode
+ */
+ public void setMode(Mode mode) throws UsbException
+ {
+ write(Request.SET_TRANSCEIVER_MODE, mode.getNumber(), 0);
+ }
+
+ /**
+ * Sets the HackRF baseband filter
+ */
+ public void setBasebandFilter(BasebandFilter filter) throws UsbException
+ {
+ write(Request.BASEBAND_FILTER_BANDWIDTH_SET,
+ filter.getLowValue(),
+ filter.getHighValue());
+ }
+
+ /**
+ * Enables (true) or disables (false) the amplifier
+ */
+ public void setAmplifierEnabled(boolean enabled) throws UsbException
+ {
+ write(Request.AMP_ENABLE, (enabled ? 1 : 0), 0);
+
+ mAmplifierEnabled = enabled;
+ }
+
+ public boolean getAmplifier()
+ {
+ return mAmplifierEnabled;
+ }
+
+ /**
+ * Sets the IF LNA Gain
+ */
+ public void setLNAGain(HackRFLNAGain gain) throws UsbException
+ {
+ int result = readByte(Request.SET_LNA_GAIN, 0, gain.getValue(), true);
+
+ if(result != 1)
+ {
+ throw new UsbException("couldn't set lna gain to " + gain);
+ }
+ }
+
+ /**
+ * Sets the Baseband VGA Gain
+ */
+ public void setVGAGain(HackRFVGAGain gain) throws UsbException
+ {
+ int result = readByte(Request.SET_VGA_GAIN, 0, gain.getValue(), true);
+
+ if(result != 1)
+ {
+ throw new UsbException("couldn't set vga gain to " + gain);
+ }
+ }
+
+ /**
+ * Not implemented
+ */
public long getTunedFrequency() throws SourceException
{
- return mFrequencyController.getTunedFrequency();
+ return mFrequencyController.getTunedFrequency();
}
- @Override
- public void setTunedFrequency( long frequency ) throws SourceException
+ @Override
+ public void setTunedFrequency(long frequency) throws SourceException
{
- ByteBuffer buffer = ByteBuffer.allocateDirect( 8 );
- buffer.order( ByteOrder.LITTLE_ENDIAN );
-
- int mhz = (int)( frequency / 1E6 );
- int hz = (int)( frequency - ( mhz * 1E6 ) );
+ ByteBuffer buffer = ByteBuffer.allocateDirect(8);
+ buffer.order(ByteOrder.LITTLE_ENDIAN);
- buffer.putInt( mhz );
- buffer.putInt( hz );
+ int mhz = (int) (frequency / 1E6);
+ int hz = (int) (frequency - (mhz * 1E6));
- buffer.rewind();
+ buffer.putInt(mhz);
+ buffer.putInt(hz);
- try
- {
- write( Request.SET_FREQUENCY, 0, 0, buffer );
- }
- catch( UsbException e )
- {
- mLog.error( "error setting frequency [" + frequency + "]", e );
-
- throw new SourceException( "error setting frequency [" +
- frequency + "]", e );
- }
+ buffer.rewind();
+
+ try
+ {
+ write(Request.SET_FREQUENCY, 0, 0, buffer);
+ }
+ catch(UsbException e)
+ {
+ mLog.error("error setting frequency [" + frequency + "]", e);
+
+ throw new SourceException("error setting frequency [" +
+ frequency + "]", e);
+ }
}
- @Override
+ @Override
public int getCurrentSampleRate() throws SourceException
{
- return mSampleRate.getRate();
+ return mSampleRate.getRate();
}
- @Override
- public void apply( TunerConfiguration config ) throws SourceException
+ @Override
+ public void apply(TunerConfiguration config) throws SourceException
{
- if( config instanceof HackRFTunerConfiguration )
- {
- HackRFTunerConfiguration hackRFConfig =
- (HackRFTunerConfiguration)config;
-
- try
- {
- setSampleRate( hackRFConfig.getSampleRate() );
- setFrequencyCorrection( hackRFConfig.getFrequencyCorrection() );
- setAmplifierEnabled( hackRFConfig.getAmplifierEnabled() );
- setLNAGain( hackRFConfig.getLNAGain() );
- setVGAGain( hackRFConfig.getVGAGain() );
- setFrequency( getFrequency() );
- }
- catch ( UsbException e )
- {
- throw new SourceException( "Error while applying tuner "
- + "configuration", e );
- }
-
- try
- {
- setFrequency( hackRFConfig.getFrequency() );
- }
- catch( SourceException se )
- {
- //Do nothing, we couldn't set the frequency
- }
- }
- else
- {
- throw new IllegalArgumentException( "Invalid tuner configuration "
- + "type [" + config.getClass() + "]" );
- }
- }
-
- public ByteBuffer readArray( Request request,
- int value,
- int index,
- int length ) throws UsbException
- {
- if( mDeviceHandle != null )
- {
- ByteBuffer buffer = ByteBuffer.allocateDirect( length );
-
- int transferred = LibUsb.controlTransfer( mDeviceHandle,
- REQUEST_TYPE_IN,
- request.getRequestNumber(),
- (short)value,
- (short)index,
- buffer,
- USB_TIMEOUT_US );
-
- if( transferred < 0 )
- {
- throw new LibUsbException( "read error", transferred );
- }
-
- return buffer;
- }
- else
- {
- throw new LibUsbException( "device handle is null",
- LibUsb.ERROR_NO_DEVICE );
- }
- }
-
- public int read( Request request, int value, int index, int length )
- throws UsbException
- {
- if( !( length == 1 || length == 2 || length == 4 ) )
- {
- throw new IllegalArgumentException( "invalid length [" + length +
- "] must be: byte=1, short=2, int=4 to read a primitive" );
- }
-
- ByteBuffer buffer = readArray( request, value, index, length );
-
- byte[] data = new byte[ buffer.capacity() ];
-
- buffer.get( data );
-
- switch( data.length )
- {
- case 1:
- return data[ 0 ];
- case 2:
- return EndianUtils.readSwappedShort( data, 0 );
- case 4:
- return EndianUtils.readSwappedInteger( data, 0 );
- default:
- throw new UsbException( "read() primitive returned an "
- + "unrecognized byte array " + Arrays.toString( data ) );
- }
- }
-
- public int readByte( Request request, int value, int index, boolean signed )
- throws UsbException
- {
- ByteBuffer buffer = readArray( request, value, index, 1 );
-
- if( signed )
- {
- return (int)( buffer.get() );
- }
- else
- {
- return (int)( buffer.get() & 0xFF );
- }
- }
-
- public void write( Request request,
- int value,
- int index,
- ByteBuffer buffer ) throws UsbException
- {
- if( mDeviceHandle != null )
- {
- int transferred = LibUsb.controlTransfer( mDeviceHandle,
- REQUEST_TYPE_OUT,
- request.getRequestNumber(),
- (short)value,
- (short)index,
- buffer,
- USB_TIMEOUT_US );
-
- if( transferred < 0 )
- {
- throw new LibUsbException( "error writing byte buffer",
- transferred );
- }
- else if( transferred != buffer.capacity() )
- {
- throw new LibUsbException( "transferred bytes [" +
- transferred + "] is not what was expected [" +
- buffer.capacity() + "]", transferred );
- }
- }
- else
- {
- throw new LibUsbException( "device handle is null",
- LibUsb.ERROR_NO_DEVICE );
- }
- }
-
- /**
- * Sends a request that doesn't have a data payload
- */
- public void write( Request request,
- int value,
- int index ) throws UsbException
- {
- write( request, value, index, ByteBuffer.allocateDirect( 0 ) );
- }
-
- /**
- * Sample Rate
- *
- * Note: the libhackrf set sample rate method is designed to allow fractional
- * sample rates. However, since we're only using integral sample rates, we
- * simply invoke the setSampleRateManual method directly.
- */
- public void setSampleRate( HackRFSampleRate rate ) throws UsbException, SourceException
- {
- setSampleRateManual( rate.getRate(), 1 );
-
- mFrequencyController.setSampleRate( rate.getRate() );
-
- setBasebandFilter( rate.getFilter() );
-
- mSampleRate = rate;
- }
-
- public void setSampleRateManual( int frequency, int divider )
- throws UsbException
- {
- ByteBuffer buffer = ByteBuffer.allocateDirect( 8 );
-
- buffer.order( ByteOrder.LITTLE_ENDIAN );
-
- buffer.putInt( frequency );
- buffer.putInt( divider );
-
- write( Request.SET_SAMPLE_RATE, 0, 0, buffer );
- }
-
- public int getSampleRate()
- {
- return mSampleRate.getRate();
- }
-
- public enum Request
- {
- SET_TRANSCEIVER_MODE( 1 ),
- MAX2837_TRANSCEIVER_WRITE( 2 ),
- MAX2837_TRANSCEIVER_READ( 3 ),
- SI5351C_CLOCK_GENERATOR_WRITE( 4 ),
- SI5351C_CLOCK_GENERATOR_READ( 5 ),
- SET_SAMPLE_RATE( 6 ),
- BASEBAND_FILTER_BANDWIDTH_SET( 7 ),
- RFFC5071_MIXER_WRITE( 8 ),
- RFFC5071_MIXER_READ( 9 ),
- SPIFLASH_ERASE( 10 ),
- SPIFLASH_WRITE( 11 ),
- SPIFLASH_READ( 12 ),
- BOARD_ID_READ( 14 ),
- VERSION_STRING_READ( 15 ),
- SET_FREQUENCY( 16 ),
- AMP_ENABLE( 17 ),
- BOARD_PARTID_SERIALNO_READ( 18 ),
- SET_LNA_GAIN( 19 ),
- SET_VGA_GAIN( 20 ),
- SET_TXVGA_GAIN( 21 ),
- ANTENNA_ENABLE( 23 ),
- SET_FREQUENCY_EXPLICIT( 24 );
-
- private byte mRequestNumber;
-
- private Request( int number )
- {
- mRequestNumber = (byte)number;
- }
-
- public byte getRequestNumber()
- {
- return mRequestNumber;
- }
- }
-
- public enum HackRFSampleRate
- {
- RATE2_016MHZ( 2016000, "2.016 MHz", BasebandFilter.F3_50 ),
- RATE3_024MHZ( 3024000, "3.024 MHz", BasebandFilter.F5_00 ),
- RATE4_464MHZ( 4464000, "4.464 MHz", BasebandFilter.F6_00 ),
- RATE5_376MHZ( 5376000, "5.376 MHz", BasebandFilter.F7_00 ),
- RATE7_488MHZ( 7488000, "7.488 MHz", BasebandFilter.F9_00 ),
- RATE10_080MHZ( 10080000, "10.080 MHz", BasebandFilter.F12_00 ),
- RATE12_000MHZ( 12000000, "12.000 MHz", BasebandFilter.F14_00 ),
- RATE13_440MHZ( 13440000, "13.440 MHz", BasebandFilter.F15_00 ),
- RATE14_976MHZ( 14976000, "14.976 MHz", BasebandFilter.F20_00 ),
- RATE19_968MHZ( 19968000, "19.968 MHz", BasebandFilter.F24_00 );
-
- private int mRate;
- private String mLabel;
- private BasebandFilter mFilter;
-
- private HackRFSampleRate( int rate,
- String label,
- BasebandFilter filter )
- {
- mRate = rate;
- mLabel = label;
- mFilter = filter;
- }
-
- public int getRate()
- {
- return mRate;
- }
-
- public String getLabel()
- {
- return mLabel;
- }
-
- public String toString()
- {
- return mLabel;
- }
-
- public BasebandFilter getFilter()
- {
- return mFilter;
- }
- }
-
- public enum BasebandFilter
- {
- FAUTO( 0, "AUTO" ),
- F1_75( 1750000, "1.75 MHz" ),
- F2_50( 2500000, "2.50 MHz" ),
- F3_50( 3500000, "3.50 MHz" ),
- F5_00( 5000000, "5.00 MHz" ),
- F5_50( 5500000, "5.50 MHz" ),
- F6_00( 6000000, "6.00 MHz" ),
- F7_00( 7000000, "7.00 MHz" ),
- F8_00( 8000000, "8.00 MHz" ),
- F9_00( 9000000, "9.00 MHz" ),
- F10_00( 10000000, "10.00 MHz" ),
- F12_00( 12000000, "12.00 MHz" ),
- F14_00( 14000000, "14.00 MHz" ),
- F15_00( 15000000, "15.00 MHz" ),
- F20_00( 20000000, "20.00 MHz" ),
- F24_00( 24000000, "24.00 MHz" ),
- F28_00( 28000000, "28.00 MHz" );
-
- private int mBandwidth;
- private String mLabel;
-
- private BasebandFilter( int bandwidth, String label )
- {
- mBandwidth = bandwidth;
- mLabel = label;
- }
-
- public int getBandwidth()
- {
- return mBandwidth;
- }
-
- public int getHighValue()
- {
- return mBandwidth >> 16;
- }
-
- public int getLowValue()
- {
- return mBandwidth & 0xFFFF;
- }
-
- public String getLabel()
- {
- return mLabel;
- }
- }
-
- public enum BoardID
- {
- JELLYBEAN( 0x00, "HackRF Jelly Bean" ),
- JAWBREAKER( 0x01, "HackRF Jaw Breaker" ),
- HACKRF_ONE( 0x02, "HackRF One" ),
- INVALID( 0xFF, "HackRF Unknown Board" );
-
- private byte mIDNumber;
- private String mLabel;
-
- private BoardID( int number, String label )
- {
- mIDNumber = (byte)number;
- mLabel = label;
- }
-
- public String toString()
- {
- return mLabel;
- }
-
- public String getLabel()
- {
- return mLabel;
- }
-
- public byte getNumber()
- {
- return mIDNumber;
- }
-
- public static BoardID lookup( int value )
- {
- switch( value )
- {
- case 0:
- return JELLYBEAN;
- case 1:
- return JAWBREAKER;
- case 2:
- return HACKRF_ONE;
- default:
- return INVALID;
- }
- }
- }
-
- public enum Mode
- {
- OFF( 0, "Off" ),
- RECEIVE( 1, "Receive" ),
- TRANSMIT( 2, "Transmit" ),
- SS( 3, "SS" );
-
- private byte mNumber;
- private String mLabel;
-
- private Mode( int number, String label )
- {
- mNumber = (byte)number;
- mLabel = label;
- }
-
- public byte getNumber()
- {
- return mNumber;
- }
-
- public String getLabel()
- {
- return mLabel;
- }
-
- public String toString()
- {
- return mLabel;
- }
- }
-
- public enum HackRFLNAGain
- {
- GAIN_0( 0 ),
- GAIN_8( 8 ),
- GAIN_16( 16 ),
- GAIN_24( 24 ),
- GAIN_32( 32 ),
- GAIN_40( 40 );
-
- private int mValue;
-
- private HackRFLNAGain( int value )
- {
- mValue = value;
- }
-
- public int getValue()
- {
- return mValue;
- }
-
- public String toString()
- {
- return String.valueOf( mValue ) + " dB";
- }
- }
-
- /**
- * Receive (baseband) VGA Gain values
- */
- public enum HackRFVGAGain
- {
- GAIN_0( 0 ),
- GAIN_2( 2 ),
- GAIN_4( 4 ),
- GAIN_6( 6 ),
- GAIN_8( 8 ),
- GAIN_10( 10 ),
- GAIN_12( 12 ),
- GAIN_14( 14 ),
- GAIN_16( 16 ),
- GAIN_18( 18 ),
- GAIN_20( 20 ),
- GAIN_22( 22 ),
- GAIN_23( 24 ),
- GAIN_26( 26 ),
- GAIN_28( 28 ),
- GAIN_30( 30 ),
- GAIN_32( 32 ),
- GAIN_34( 34 ),
- GAIN_36( 36 ),
- GAIN_38( 38 ),
- GAIN_40( 40 ),
- GAIN_42( 42 ),
- GAIN_44( 44 ),
- GAIN_46( 46 ),
- GAIN_48( 48 ),
- GAIN_50( 50 ),
- GAIN_52( 52 ),
- GAIN_54( 54 ),
- GAIN_56( 56 ),
- GAIN_58( 58 ),
- GAIN_60( 60 ),
- GAIN_62( 62 );
-
- private int mValue;
-
- private HackRFVGAGain( int value )
- {
- mValue = value;
- }
-
- public int getValue()
- {
- return mValue;
- }
-
- public String toString()
- {
- return String.valueOf( mValue ) + " dB";
- }
- }
-
- /**
- * HackRF part id and serial number parsing class
- */
- public class Serial
- {
- private byte[] mData;
-
- public Serial( ByteBuffer buffer )
- {
- mData = new byte[ buffer.capacity() ];
-
- buffer.get( mData );
- }
-
- public String getPartID()
- {
- int part0 = EndianUtils.readSwappedInteger( mData, 0 );
- int part1 = EndianUtils.readSwappedInteger( mData, 4 );
-
- StringBuilder sb = new StringBuilder();
-
- sb.append( String.format( "%08X", part0 ) );
- sb.append( "-" );
- sb.append( String.format( "%08X", part1 ) );
-
- return sb.toString();
- }
-
- public String getSerialNumber()
- {
- int serial0 = EndianUtils.readSwappedInteger( mData, 8 );
- int serial1 = EndianUtils.readSwappedInteger( mData, 12 );
- int serial2 = EndianUtils.readSwappedInteger( mData, 16 );
- int serial3 = EndianUtils.readSwappedInteger( mData, 20 );
-
- StringBuilder sb = new StringBuilder();
-
- sb.append( String.format( "%08X", serial0 ) );
- sb.append( "-" );
- sb.append( String.format( "%08X", serial1 ) );
- sb.append( "-" );
- sb.append( String.format( "%08X", serial2 ) );
- sb.append( "-" );
- sb.append( String.format( "%08X", serial3 ) );
-
- return sb.toString();
- }
- }
-
- /**
- * Adds a sample listener. If the buffer processing thread is
- * not currently running, starts it running in a new thread.
- */
- public void addListener( Listener listener )
- {
- synchronized ( mComplexBufferBroadcaster )
- {
- mComplexBufferBroadcaster.addListener( listener );
-
- if( mBufferProcessor == null || !mBufferProcessor.isRunning() )
- {
- mBufferProcessor = new BufferProcessor();
-
- Thread thread = new Thread( mBufferProcessor );
- thread.setDaemon( true );
- thread.setName( "HackRF Sample Processor" );
-
- thread.start();
- }
- }
- }
-
- /**
- * Removes the sample listener. If this is the last registered listener,
- * shuts down the buffer processing thread.
- */
- public void removeListener( Listener listener )
- {
- synchronized ( mComplexBufferBroadcaster )
- {
- mComplexBufferBroadcaster.removeListener( listener );
-
- if( !mComplexBufferBroadcaster.hasListeners() )
- {
- mBufferProcessor.stop();
- }
- }
- }
-
- /**
- * Buffer processing thread. Fetches samples from the HackRF Tuner and
- * dispatches them to all registered listeners
- */
- public class BufferProcessor implements Runnable, TransferCallback
- {
- private ScheduledFuture mSampleDispatcherTask;
- private AtomicBoolean mRunning = new AtomicBoolean();
- private LinkedTransferQueue mAvailableTransfers;
- private LinkedTransferQueue mTransfersInProgress = new LinkedTransferQueue<>();
- private ByteBuffer mLibUsbHandlerStatus;
- private boolean mCancel = false;
-
- @Override
- public void run()
+ if(config instanceof HackRFTunerConfiguration)
{
- if( mRunning.compareAndSet( false, true ) )
- {
- prepareTransfers();
-
- mSampleDispatcherTask = mThreadPoolManager.scheduleFixedRate(
- ThreadType.SOURCE_SAMPLE_PROCESSING, new BufferDispatcher(),
- 20, TimeUnit.MILLISECONDS );
+ HackRFTunerConfiguration hackRFConfig =
+ (HackRFTunerConfiguration) config;
- mLibUsbHandlerStatus = ByteBuffer.allocateDirect( 4 );
-
- List transfers = new ArrayList<>();
-
- mCancel = false;
-
- while( mRunning.get() )
- {
- mAvailableTransfers.drainTo( transfers );
-
- for( Transfer transfer: transfers )
- {
- int result = LibUsb.submitTransfer( transfer );
-
- if( result == LibUsb.SUCCESS )
- {
- mTransfersInProgress.add( transfer );
- }
- else
- {
- mLog.error( "error submitting transfer [" +
- LibUsb.errorName( result ) + "]" );
- }
- }
-
- int result = LibUsb.handleEventsTimeoutCompleted(
- null, USB_TIMEOUT_US, mLibUsbHandlerStatus.asIntBuffer() );
-
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "error handling events for libusb" );
- }
-
- transfers.clear();
-
- mLibUsbHandlerStatus.rewind();
- }
-
- if( mCancel )
- {
- for( Transfer transfer: mTransfersInProgress )
- {
- LibUsb.cancelTransfer( transfer );
- }
-
- int result = LibUsb.handleEventsTimeoutCompleted( null,
- USB_TIMEOUT_US, mLibUsbHandlerStatus.asIntBuffer() );
-
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "error cancelling transfers in progress" );
- }
-
- mLibUsbHandlerStatus.rewind();
- }
- }
+ try
+ {
+ setSampleRate(hackRFConfig.getSampleRate());
+ setFrequencyCorrection(hackRFConfig.getFrequencyCorrection());
+ setAmplifierEnabled(hackRFConfig.getAmplifierEnabled());
+ setLNAGain(hackRFConfig.getLNAGain());
+ setVGAGain(hackRFConfig.getVGAGain());
+ setFrequency(getFrequency());
+ }
+ catch(UsbException e)
+ {
+ throw new SourceException("Error while applying tuner "
+ + "configuration", e);
+ }
+
+ try
+ {
+ setFrequency(hackRFConfig.getFrequency());
+ }
+ catch(SourceException se)
+ {
+ //Do nothing, we couldn't set the frequency
+ }
+ }
+ else
+ {
+ throw new IllegalArgumentException("Invalid tuner configuration "
+ + "type [" + config.getClass() + "]");
+ }
+ }
+
+ public ByteBuffer readArray(Request request,
+ int value,
+ int index,
+ int length) throws UsbException
+ {
+ if(mDeviceHandle != null)
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(length);
+
+ int transferred = LibUsb.controlTransfer(mDeviceHandle,
+ REQUEST_TYPE_IN,
+ request.getRequestNumber(),
+ (short) value,
+ (short) index,
+ buffer,
+ USB_TIMEOUT_US);
+
+ if(transferred < 0)
+ {
+ throw new LibUsbException("read error", transferred);
+ }
+
+ return buffer;
+ }
+ else
+ {
+ throw new LibUsbException("device handle is null",
+ LibUsb.ERROR_NO_DEVICE);
+ }
+ }
+
+ public int read(Request request, int value, int index, int length)
+ throws UsbException
+ {
+ if(!(length == 1 || length == 2 || length == 4))
+ {
+ throw new IllegalArgumentException("invalid length [" + length +
+ "] must be: byte=1, short=2, int=4 to read a primitive");
}
- /**
- * Stops the sample fetching thread
- */
- public void stop()
- {
- mCancel = true;
-
- if( mRunning.compareAndSet( true, false ) )
- {
- if( mSampleDispatcherTask != null )
- {
- mSampleDispatcherTask.cancel( true );
- mFilledBuffers.clear();
- }
- }
- }
+ ByteBuffer buffer = readArray(request, value, index, length);
- /**
- * Indicates if this thread is running
- */
- public boolean isRunning()
- {
- return mRunning.get();
- }
-
- @Override
- public void processTransfer( Transfer transfer )
- {
- mTransfersInProgress.remove( transfer );
-
- switch( transfer.status() )
- {
- case LibUsb.TRANSFER_COMPLETED:
- case LibUsb.TRANSFER_STALL:
- if( transfer.actualLength() > 0 )
- {
- ByteBuffer buffer = transfer.buffer();
-
- byte[] data = new byte[ transfer.actualLength() ];
-
- buffer.get( data );
+ byte[] data = new byte[buffer.capacity()];
- buffer.rewind();
+ buffer.get(data);
- if( isRunning() )
- {
- mFilledBuffers.add( data );
- }
- }
- break;
- case LibUsb.TRANSFER_CANCELLED:
- break;
- default:
- /* unexpected error */
- mLog.error( "transfer error [" +
- getTransferStatus( transfer.status() ) +
- "] transferred actual: " + transfer.actualLength() );
- }
-
- mAvailableTransfers.add( transfer );
- }
-
- /**
- * Prepares (allocates) a set of transfer buffers for use in
- * transferring data from the tuner via the bulk interface
- */
- private void prepareTransfers() throws LibUsbException
- {
- if( mAvailableTransfers == null )
- {
- mAvailableTransfers = new LinkedTransferQueue<>();
-
- for( int x = 0; x < TRANSFER_BUFFER_POOL_SIZE; x++ )
- {
- Transfer transfer = LibUsb.allocTransfer();
+ switch(data.length)
+ {
+ case 1:
+ return data[0];
+ case 2:
+ return EndianUtils.readSwappedShort(data, 0);
+ case 4:
+ return EndianUtils.readSwappedInteger(data, 0);
+ default:
+ throw new UsbException("read() primitive returned an "
+ + "unrecognized byte array " + Arrays.toString(data));
+ }
+ }
- if( transfer == null )
- {
- throw new LibUsbException( "couldn't allocate transfer",
- LibUsb.ERROR_NO_MEM );
- }
-
- final ByteBuffer buffer =
- ByteBuffer.allocateDirect( mBufferSize );
-
- LibUsb.fillBulkTransfer( transfer, mDeviceHandle,USB_ENDPOINT,
- buffer, BufferProcessor.this, "Buffer", USB_TIMEOUT_US );
+ public int readByte(Request request, int value, int index, boolean signed)
+ throws UsbException
+ {
+ ByteBuffer buffer = readArray(request, value, index, 1);
- mAvailableTransfers.add( transfer );
- }
- }
- }
- }
+ if(signed)
+ {
+ return (int) (buffer.get());
+ }
+ else
+ {
+ return (int) (buffer.get() & 0xFF);
+ }
+ }
- /**
- * Fetches byte[] chunks from the raw sample buffer. Converts each byte
- * array and broadcasts the array to all registered listeners
- */
- public class BufferDispatcher implements Runnable
- {
- @Override
+ public void write(Request request,
+ int value,
+ int index,
+ ByteBuffer buffer) throws UsbException
+ {
+ if(mDeviceHandle != null)
+ {
+ int transferred = LibUsb.controlTransfer(mDeviceHandle,
+ REQUEST_TYPE_OUT,
+ request.getRequestNumber(),
+ (short) value,
+ (short) index,
+ buffer,
+ USB_TIMEOUT_US);
+
+ if(transferred < 0)
+ {
+ throw new LibUsbException("error writing byte buffer",
+ transferred);
+ }
+ else if(transferred != buffer.capacity())
+ {
+ throw new LibUsbException("transferred bytes [" +
+ transferred + "] is not what was expected [" +
+ buffer.capacity() + "]", transferred);
+ }
+ }
+ else
+ {
+ throw new LibUsbException("device handle is null",
+ LibUsb.ERROR_NO_DEVICE);
+ }
+ }
+
+ /**
+ * Sends a request that doesn't have a data payload
+ */
+ public void write(Request request,
+ int value,
+ int index) throws UsbException
+ {
+ write(request, value, index, ByteBuffer.allocateDirect(0));
+ }
+
+ /**
+ * Sample Rate
+ *
+ * Note: the libhackrf set sample rate method is designed to allow fractional
+ * sample rates. However, since we're only using integral sample rates, we
+ * simply invoke the setSampleRateManual method directly.
+ */
+ public void setSampleRate(HackRFSampleRate rate) throws UsbException, SourceException
+ {
+ setSampleRateManual(rate.getRate(), 1);
+
+ mFrequencyController.setSampleRate(rate.getRate());
+
+ setBasebandFilter(rate.getFilter());
+
+ mSampleRate = rate;
+ }
+
+ public void setSampleRateManual(int frequency, int divider)
+ throws UsbException
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(8);
+
+ buffer.order(ByteOrder.LITTLE_ENDIAN);
+
+ buffer.putInt(frequency);
+ buffer.putInt(divider);
+
+ write(Request.SET_SAMPLE_RATE, 0, 0, buffer);
+ }
+
+ public int getSampleRate()
+ {
+ return mSampleRate.getRate();
+ }
+
+ public enum Request
+ {
+ SET_TRANSCEIVER_MODE(1),
+ MAX2837_TRANSCEIVER_WRITE(2),
+ MAX2837_TRANSCEIVER_READ(3),
+ SI5351C_CLOCK_GENERATOR_WRITE(4),
+ SI5351C_CLOCK_GENERATOR_READ(5),
+ SET_SAMPLE_RATE(6),
+ BASEBAND_FILTER_BANDWIDTH_SET(7),
+ RFFC5071_MIXER_WRITE(8),
+ RFFC5071_MIXER_READ(9),
+ SPIFLASH_ERASE(10),
+ SPIFLASH_WRITE(11),
+ SPIFLASH_READ(12),
+ BOARD_ID_READ(14),
+ VERSION_STRING_READ(15),
+ SET_FREQUENCY(16),
+ AMP_ENABLE(17),
+ BOARD_PARTID_SERIALNO_READ(18),
+ SET_LNA_GAIN(19),
+ SET_VGA_GAIN(20),
+ SET_TXVGA_GAIN(21),
+ ANTENNA_ENABLE(23),
+ SET_FREQUENCY_EXPLICIT(24);
+
+ private byte mRequestNumber;
+
+ private Request(int number)
+ {
+ mRequestNumber = (byte) number;
+ }
+
+ public byte getRequestNumber()
+ {
+ return mRequestNumber;
+ }
+ }
+
+ public enum HackRFSampleRate
+ {
+ RATE2_016MHZ(2016000, "2.016 MHz", BasebandFilter.F3_50),
+ RATE3_024MHZ(3024000, "3.024 MHz", BasebandFilter.F5_00),
+ RATE4_464MHZ(4464000, "4.464 MHz", BasebandFilter.F6_00),
+ RATE5_376MHZ(5376000, "5.376 MHz", BasebandFilter.F7_00),
+ RATE7_488MHZ(7488000, "7.488 MHz", BasebandFilter.F9_00),
+ RATE10_080MHZ(10080000, "10.080 MHz", BasebandFilter.F12_00),
+ RATE12_000MHZ(12000000, "12.000 MHz", BasebandFilter.F14_00),
+ RATE13_440MHZ(13440000, "13.440 MHz", BasebandFilter.F15_00),
+ RATE14_976MHZ(14976000, "14.976 MHz", BasebandFilter.F20_00),
+ RATE19_968MHZ(19968000, "19.968 MHz", BasebandFilter.F24_00);
+
+ private int mRate;
+ private String mLabel;
+ private BasebandFilter mFilter;
+
+ private HackRFSampleRate(int rate,
+ String label,
+ BasebandFilter filter)
+ {
+ mRate = rate;
+ mLabel = label;
+ mFilter = filter;
+ }
+
+ public int getRate()
+ {
+ return mRate;
+ }
+
+ public String getLabel()
+ {
+ return mLabel;
+ }
+
+ public String toString()
+ {
+ return mLabel;
+ }
+
+ public BasebandFilter getFilter()
+ {
+ return mFilter;
+ }
+ }
+
+ public enum BasebandFilter
+ {
+ FAUTO(0, "AUTO"),
+ F1_75(1750000, "1.75 MHz"),
+ F2_50(2500000, "2.50 MHz"),
+ F3_50(3500000, "3.50 MHz"),
+ F5_00(5000000, "5.00 MHz"),
+ F5_50(5500000, "5.50 MHz"),
+ F6_00(6000000, "6.00 MHz"),
+ F7_00(7000000, "7.00 MHz"),
+ F8_00(8000000, "8.00 MHz"),
+ F9_00(9000000, "9.00 MHz"),
+ F10_00(10000000, "10.00 MHz"),
+ F12_00(12000000, "12.00 MHz"),
+ F14_00(14000000, "14.00 MHz"),
+ F15_00(15000000, "15.00 MHz"),
+ F20_00(20000000, "20.00 MHz"),
+ F24_00(24000000, "24.00 MHz"),
+ F28_00(28000000, "28.00 MHz");
+
+ private int mBandwidth;
+ private String mLabel;
+
+ private BasebandFilter(int bandwidth, String label)
+ {
+ mBandwidth = bandwidth;
+ mLabel = label;
+ }
+
+ public int getBandwidth()
+ {
+ return mBandwidth;
+ }
+
+ public int getHighValue()
+ {
+ return mBandwidth >> 16;
+ }
+
+ public int getLowValue()
+ {
+ return mBandwidth & 0xFFFF;
+ }
+
+ public String getLabel()
+ {
+ return mLabel;
+ }
+ }
+
+ public enum BoardID
+ {
+ JELLYBEAN(0x00, "HackRF Jelly Bean"),
+ JAWBREAKER(0x01, "HackRF Jaw Breaker"),
+ HACKRF_ONE(0x02, "HackRF One"),
+ INVALID(0xFF, "HackRF Unknown Board");
+
+ private byte mIDNumber;
+ private String mLabel;
+
+ private BoardID(int number, String label)
+ {
+ mIDNumber = (byte) number;
+ mLabel = label;
+ }
+
+ public String toString()
+ {
+ return mLabel;
+ }
+
+ public String getLabel()
+ {
+ return mLabel;
+ }
+
+ public byte getNumber()
+ {
+ return mIDNumber;
+ }
+
+ public static BoardID lookup(int value)
+ {
+ switch(value)
+ {
+ case 0:
+ return JELLYBEAN;
+ case 1:
+ return JAWBREAKER;
+ case 2:
+ return HACKRF_ONE;
+ default:
+ return INVALID;
+ }
+ }
+ }
+
+ public enum Mode
+ {
+ OFF(0, "Off"),
+ RECEIVE(1, "Receive"),
+ TRANSMIT(2, "Transmit"),
+ SS(3, "SS");
+
+ private byte mNumber;
+ private String mLabel;
+
+ private Mode(int number, String label)
+ {
+ mNumber = (byte) number;
+ mLabel = label;
+ }
+
+ public byte getNumber()
+ {
+ return mNumber;
+ }
+
+ public String getLabel()
+ {
+ return mLabel;
+ }
+
+ public String toString()
+ {
+ return mLabel;
+ }
+ }
+
+ public enum HackRFLNAGain
+ {
+ GAIN_0(0),
+ GAIN_8(8),
+ GAIN_16(16),
+ GAIN_24(24),
+ GAIN_32(32),
+ GAIN_40(40);
+
+ private int mValue;
+
+ private HackRFLNAGain(int value)
+ {
+ mValue = value;
+ }
+
+ public int getValue()
+ {
+ return mValue;
+ }
+
+ public String toString()
+ {
+ return String.valueOf(mValue) + " dB";
+ }
+ }
+
+ /**
+ * Receive (baseband) VGA Gain values
+ */
+ public enum HackRFVGAGain
+ {
+ GAIN_0(0),
+ GAIN_2(2),
+ GAIN_4(4),
+ GAIN_6(6),
+ GAIN_8(8),
+ GAIN_10(10),
+ GAIN_12(12),
+ GAIN_14(14),
+ GAIN_16(16),
+ GAIN_18(18),
+ GAIN_20(20),
+ GAIN_22(22),
+ GAIN_23(24),
+ GAIN_26(26),
+ GAIN_28(28),
+ GAIN_30(30),
+ GAIN_32(32),
+ GAIN_34(34),
+ GAIN_36(36),
+ GAIN_38(38),
+ GAIN_40(40),
+ GAIN_42(42),
+ GAIN_44(44),
+ GAIN_46(46),
+ GAIN_48(48),
+ GAIN_50(50),
+ GAIN_52(52),
+ GAIN_54(54),
+ GAIN_56(56),
+ GAIN_58(58),
+ GAIN_60(60),
+ GAIN_62(62);
+
+ private int mValue;
+
+ private HackRFVGAGain(int value)
+ {
+ mValue = value;
+ }
+
+ public int getValue()
+ {
+ return mValue;
+ }
+
+ public String toString()
+ {
+ return String.valueOf(mValue) + " dB";
+ }
+ }
+
+ /**
+ * HackRF part id and serial number parsing class
+ */
+ public class Serial
+ {
+ private byte[] mData;
+
+ public Serial(ByteBuffer buffer)
+ {
+ mData = new byte[buffer.capacity()];
+
+ buffer.get(mData);
+ }
+
+ public String getPartID()
+ {
+ int part0 = EndianUtils.readSwappedInteger(mData, 0);
+ int part1 = EndianUtils.readSwappedInteger(mData, 4);
+
+ StringBuilder sb = new StringBuilder();
+
+ sb.append(String.format("%08X", part0));
+ sb.append("-");
+ sb.append(String.format("%08X", part1));
+
+ return sb.toString();
+ }
+
+ public String getSerialNumber()
+ {
+ int serial0 = EndianUtils.readSwappedInteger(mData, 8);
+ int serial1 = EndianUtils.readSwappedInteger(mData, 12);
+ int serial2 = EndianUtils.readSwappedInteger(mData, 16);
+ int serial3 = EndianUtils.readSwappedInteger(mData, 20);
+
+ StringBuilder sb = new StringBuilder();
+
+ sb.append(String.format("%08X", serial0));
+ sb.append("-");
+ sb.append(String.format("%08X", serial1));
+ sb.append("-");
+ sb.append(String.format("%08X", serial2));
+ sb.append("-");
+ sb.append(String.format("%08X", serial3));
+
+ return sb.toString();
+ }
+ }
+
+ /**
+ * Adds a sample listener. If the buffer processing thread is
+ * not currently running, starts it running in a new thread.
+ */
+ public void addListener(Listener listener)
+ {
+ synchronized(mComplexBufferBroadcaster)
+ {
+ mComplexBufferBroadcaster.addListener(listener);
+
+ if(mBufferProcessor == null || !mBufferProcessor.isRunning())
+ {
+ mBufferProcessor = new BufferProcessor();
+
+ Thread thread = new Thread(mBufferProcessor);
+ thread.setDaemon(true);
+ thread.setName("HackRF Sample Processor");
+
+ thread.start();
+ }
+ }
+ }
+
+ /**
+ * Removes the sample listener. If this is the last registered listener,
+ * shuts down the buffer processing thread.
+ */
+ public void removeListener(Listener listener)
+ {
+ synchronized(mComplexBufferBroadcaster)
+ {
+ mComplexBufferBroadcaster.removeListener(listener);
+
+ if(!mComplexBufferBroadcaster.hasListeners())
+ {
+ mBufferProcessor.stop();
+ }
+ }
+ }
+
+ /**
+ * Buffer processing thread. Fetches samples from the HackRF Tuner and
+ * dispatches them to all registered listeners
+ */
+ public class BufferProcessor implements Runnable, TransferCallback
+ {
+ private ScheduledFuture mSampleDispatcherTask;
+ private AtomicBoolean mRunning = new AtomicBoolean();
+ private LinkedTransferQueue mAvailableTransfers;
+ private LinkedTransferQueue mTransfersInProgress = new LinkedTransferQueue<>();
+ private ByteBuffer mLibUsbHandlerStatus;
+ private boolean mCancel = false;
+
+ @Override
public void run()
{
- try
- {
- ArrayList buffers = new ArrayList();
-
- mFilledBuffers.drainTo( buffers );
+ if(mRunning.compareAndSet(false, true))
+ {
+ prepareTransfers();
- for( byte[] buffer: buffers )
- {
- float[] samples = mSampleAdapter.convert( buffer );
-
- mComplexBufferBroadcaster.broadcast( new ComplexBuffer( samples ) );
- }
- }
- catch( Exception e )
- {
- mLog.error( "error duruing HackRF buffer dispatching", e );
- }
+ mSampleDispatcherTask = ThreadPool.SCHEDULED.scheduleAtFixedRate(new BufferDispatcher(),
+ 20, 20, TimeUnit.MILLISECONDS);
+
+ mLibUsbHandlerStatus = ByteBuffer.allocateDirect(4);
+
+ List transfers = new ArrayList<>();
+
+ mCancel = false;
+
+ while(mRunning.get())
+ {
+ mAvailableTransfers.drainTo(transfers);
+
+ for(Transfer transfer : transfers)
+ {
+ int result = LibUsb.submitTransfer(transfer);
+
+ if(result == LibUsb.SUCCESS)
+ {
+ mTransfersInProgress.add(transfer);
+ }
+ else
+ {
+ mLog.error("error submitting transfer [" +
+ LibUsb.errorName(result) + "]");
+ }
+ }
+
+ int result = LibUsb.handleEventsTimeoutCompleted(
+ null, USB_TIMEOUT_US, mLibUsbHandlerStatus.asIntBuffer());
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("error handling events for libusb");
+ }
+
+ transfers.clear();
+
+ mLibUsbHandlerStatus.rewind();
+ }
+
+ if(mCancel)
+ {
+ for(Transfer transfer : mTransfersInProgress)
+ {
+ LibUsb.cancelTransfer(transfer);
+ }
+
+ int result = LibUsb.handleEventsTimeoutCompleted(null,
+ USB_TIMEOUT_US, mLibUsbHandlerStatus.asIntBuffer());
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("error cancelling transfers in progress");
+ }
+
+ mLibUsbHandlerStatus.rewind();
+ }
+ }
}
- }
-
- public static String getTransferStatus( int status )
- {
- switch( status )
- {
- case 0:
- return "TRANSFER COMPLETED (0)";
- case 1:
- return "TRANSFER ERROR (1)";
- case 2:
- return "TRANSFER TIMED OUT (2)";
- case 3:
- return "TRANSFER CANCELLED (3)";
- case 4:
- return "TRANSFER STALL (4)";
- case 5:
- return "TRANSFER NO DEVICE (5)";
- case 6:
- return "TRANSFER OVERFLOW (6)";
- default:
- return "UNKNOWN TRANSFER STATUS (" + status + ")";
- }
- }
+
+ /**
+ * Stops the sample fetching thread
+ */
+ public void stop()
+ {
+ mCancel = true;
+
+ if(mRunning.compareAndSet(true, false))
+ {
+ if(mSampleDispatcherTask != null)
+ {
+ mSampleDispatcherTask.cancel(true);
+ mFilledBuffers.clear();
+ }
+ }
+ }
+
+ /**
+ * Indicates if this thread is running
+ */
+ public boolean isRunning()
+ {
+ return mRunning.get();
+ }
+
+ @Override
+ public void processTransfer(Transfer transfer)
+ {
+ mTransfersInProgress.remove(transfer);
+
+ switch(transfer.status())
+ {
+ case LibUsb.TRANSFER_COMPLETED:
+ case LibUsb.TRANSFER_STALL:
+ if(transfer.actualLength() > 0)
+ {
+ ByteBuffer buffer = transfer.buffer();
+
+ byte[] data = new byte[transfer.actualLength()];
+
+ buffer.get(data);
+
+ buffer.rewind();
+
+ if(isRunning())
+ {
+ mFilledBuffers.add(data);
+ }
+ }
+ break;
+ case LibUsb.TRANSFER_CANCELLED:
+ break;
+ default:
+ /* unexpected error */
+ mLog.error("transfer error [" +
+ getTransferStatus(transfer.status()) +
+ "] transferred actual: " + transfer.actualLength());
+ }
+
+ mAvailableTransfers.add(transfer);
+ }
+
+ /**
+ * Prepares (allocates) a set of transfer buffers for use in
+ * transferring data from the tuner via the bulk interface
+ */
+ private void prepareTransfers() throws LibUsbException
+ {
+ if(mAvailableTransfers == null)
+ {
+ mAvailableTransfers = new LinkedTransferQueue<>();
+
+ for(int x = 0; x < TRANSFER_BUFFER_POOL_SIZE; x++)
+ {
+ Transfer transfer = LibUsb.allocTransfer();
+
+ if(transfer == null)
+ {
+ throw new LibUsbException("couldn't allocate transfer",
+ LibUsb.ERROR_NO_MEM);
+ }
+
+ final ByteBuffer buffer =
+ ByteBuffer.allocateDirect(mBufferSize);
+
+ LibUsb.fillBulkTransfer(transfer, mDeviceHandle, USB_ENDPOINT,
+ buffer, BufferProcessor.this, "Buffer", USB_TIMEOUT_US);
+
+ mAvailableTransfers.add(transfer);
+ }
+ }
+ }
+ }
+
+ /**
+ * Fetches byte[] chunks from the raw sample buffer. Converts each byte
+ * array and broadcasts the array to all registered listeners
+ */
+ public class BufferDispatcher implements Runnable
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ ArrayList buffers = new ArrayList();
+
+ mFilledBuffers.drainTo(buffers);
+
+ for(byte[] buffer : buffers)
+ {
+ float[] samples = mSampleAdapter.convert(buffer);
+
+ mComplexBufferBroadcaster.broadcast(new ComplexBuffer(samples));
+ }
+ }
+ catch(Exception e)
+ {
+ mLog.error("error duruing HackRF buffer dispatching", e);
+ }
+ }
+ }
+
+ public static String getTransferStatus(int status)
+ {
+ switch(status)
+ {
+ case 0:
+ return "TRANSFER COMPLETED (0)";
+ case 1:
+ return "TRANSFER ERROR (1)";
+ case 2:
+ return "TRANSFER TIMED OUT (2)";
+ case 3:
+ return "TRANSFER CANCELLED (3)";
+ case 4:
+ return "TRANSFER STALL (4)";
+ case 5:
+ return "TRANSFER NO DEVICE (5)";
+ case 6:
+ return "TRANSFER OVERFLOW (6)";
+ default:
+ return "UNKNOWN TRANSFER STATUS (" + status + ")";
+ }
+ }
}
diff --git a/src/source/tuner/rtl/RTL2832TunerController.java b/src/source/tuner/rtl/RTL2832TunerController.java
index e102d4d7..d31a6499 100644
--- a/src/source/tuner/rtl/RTL2832TunerController.java
+++ b/src/source/tuner/rtl/RTL2832TunerController.java
@@ -1,26 +1,47 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
- *
+ *
* Java version based on librtlsdr
* Copyright (C) 2012-2013 by Steve Markgraf
* Copyright (C) 2012 by Dimitri Stolnikov
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see mComplexBufferBroadcaster = new Broadcaster<>();
-
- private LinkedTransferQueue mFilledBuffers =
- new LinkedTransferQueue();
-
- private SampleRateMonitor mSampleRateMonitor;
+ public final static int TRANSFER_BUFFER_POOL_SIZE = 16;
+
+ public final static byte EEPROM_ADDRESS = (byte) 0xA0;
+
+ public final static byte[] sFIR_COEFFICIENTS =
+ {
+ (byte) 0xCA, (byte) 0xDC, (byte) 0xD7, (byte) 0xD8, (byte) 0xE0,
+ (byte) 0xF2, (byte) 0x0E, (byte) 0x35, (byte) 0x06, (byte) 0x50,
+ (byte) 0x9C, (byte) 0x0D, (byte) 0x71, (byte) 0x11, (byte) 0x14,
+ (byte) 0x71, (byte) 0x74, (byte) 0x19, (byte) 0x41, (byte) 0xA5
+ };
+
+ public static final SampleRate DEFAULT_SAMPLE_RATE =
+ SampleRate.RATE_0_960MHZ;
+
+ protected Device mDevice;
+ protected DeviceDescriptor mDeviceDescriptor;
+ protected DeviceHandle mDeviceHandle;
+
+ private SampleRate mSampleRate = DEFAULT_SAMPLE_RATE;
+
+ private BufferProcessor mBufferProcessor;
+
+ private ByteSampleAdapter mSampleAdapter = new ByteSampleAdapter();
+
+ private Broadcaster mComplexBufferBroadcaster = new Broadcaster<>();
+
+ private LinkedTransferQueue mFilledBuffers =
+ new LinkedTransferQueue();
+
+ private SampleRateMonitor mSampleRateMonitor;
private AtomicInteger mSampleCounter = new AtomicInteger();
- private static final DecimalFormat mDecimalFormatter =
- new DecimalFormat( "###,###,###.0" );
- private static final DecimalFormat mPercentFormatter =
- new DecimalFormat( "###.00" );
-
- protected int mOscillatorFrequency = 28800000; //28.8 MHz
- public int mBufferSize = 131072;
+ private static final DecimalFormat mDecimalFormatter =
+ new DecimalFormat("###,###,###.0");
+ private static final DecimalFormat mPercentFormatter =
+ new DecimalFormat("###.00");
- protected Descriptor mDescriptor;
- private ThreadPoolManager mThreadPoolManager;
-
- /**
- * Abstract tuner controller device. Use the static getTunerClass() method
- * to determine the tuner type, and construct the corresponding child
- * tuner controller class for that tuner type.
- */
- public RTL2832TunerController( Device device,
- DeviceDescriptor deviceDescriptor,
- ThreadPoolManager threadPoolManager,
- long minTunableFrequency,
- long maxTunableFrequency,
- int centerUnusableBandwidth,
- double usableBandwidthPercentage ) throws SourceException
- {
- super( minTunableFrequency,
- maxTunableFrequency,
- centerUnusableBandwidth,
- usableBandwidthPercentage );
-
- mThreadPoolManager = threadPoolManager;
+ protected int mOscillatorFrequency = 28800000; //28.8 MHz
+ public int mBufferSize = 131072;
- mDevice = device;
- mDeviceDescriptor = deviceDescriptor;
- }
+ protected Descriptor mDescriptor;
-
- public void init() throws SourceException
- {
- mDeviceHandle = new DeviceHandle();
-
- int result = LibUsb.open( mDevice, mDeviceHandle );
+ /**
+ * Abstract tuner controller device. Use the static getTunerClass() method
+ * to determine the tuner type, and construct the corresponding child
+ * tuner controller class for that tuner type.
+ */
+ public RTL2832TunerController(Device device, DeviceDescriptor deviceDescriptor, long minTunableFrequency,
+ long maxTunableFrequency, int centerUnusableBandwidth,
+ double usableBandwidthPercentage) throws SourceException
+ {
+ super(minTunableFrequency,
+ maxTunableFrequency,
+ centerUnusableBandwidth,
+ usableBandwidthPercentage);
- if( result != LibUsb.SUCCESS )
- {
- mDeviceHandle = null;
-
- throw new SourceException( "libusb couldn't open RTL2832 usb "
- + "device [" + LibUsb.errorName( result ) + "]" );
- }
+ mDevice = device;
+ mDeviceDescriptor = deviceDescriptor;
+ }
- claimInterface( mDeviceHandle );
- try
- {
- setSampleRate( DEFAULT_SAMPLE_RATE );
- }
- catch( Exception e )
- {
- throw new SourceException( "RTL2832 Tuner Controller - couldn't "
- + "set default sample rate", e );
- }
+ public void init() throws SourceException
+ {
+ mDeviceHandle = new DeviceHandle();
- byte[] eeprom = null;
-
- try
- {
- /* Read the contents of the 256-byte EEPROM */
- eeprom = readEEPROM( mDeviceHandle, (short)0, 256 );
- }
- catch( Exception e )
- {
- mLog.error( "error while reading the EEPROM device descriptor", e );
- }
-
- try
- {
- mDescriptor = new Descriptor( eeprom );
+ int result = LibUsb.open(mDevice, mDeviceHandle);
- if( eeprom == null )
- {
- mLog.error( "eeprom byte array was null - constructed "
- + "empty descriptor object" );
- }
- }
- catch( Exception e )
- {
- mLog.error( "error while constructing device descriptor using "
- + "descriptor byte array " +
- ( eeprom == null ? "[null]" : Arrays.toString( eeprom )), e );
- }
- }
-
- /**
- * Claims the USB interface. Attempts to detach the active kernel driver
- * if one is currently attached.
- */
- public static void claimInterface( DeviceHandle handle ) throws SourceException
- {
- if( handle != null )
- {
- int result = LibUsb.kernelDriverActive( handle, USB_INTERFACE );
-
- if( result == 1 )
- {
- result = LibUsb.detachKernelDriver( handle, USB_INTERFACE );
+ if(result != LibUsb.SUCCESS)
+ {
+ mDeviceHandle = null;
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "failed attempt to detach kernel driver [" +
- LibUsb.errorName( result ) + "]" );
-
- throw new SourceException( "couldn't detach kernel driver "
- + "from device" );
- }
- }
-
- result = LibUsb.claimInterface( handle, USB_INTERFACE );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new SourceException( "couldn't claim usb interface [" +
- LibUsb.errorName( result ) + "]" );
- }
- }
- else
- {
- throw new SourceException( "couldn't claim usb interface - no "
- + "device handle" );
- }
- }
-
- public static void releaseInterface( DeviceHandle handle )
- throws SourceException
- {
- int result = LibUsb.releaseInterface( handle, USB_INTERFACE );
-
- if( result != LibUsb.SUCCESS )
- {
- throw new SourceException( "couldn't release interface [" +
- LibUsb.errorName( result ) + "]" );
- }
- }
+ throw new SourceException("libusb couldn't open RTL2832 usb "
+ + "device [" + LibUsb.errorName(result) + "]");
+ }
- /**
- * Descriptor contains all identifiers and labels parsed from the EEPROM.
- *
- * May return null if unable to get 256 byte eeprom descriptor from tuner
- * or if the descriptor doesn't begin with byte values of 0x28 and 0x32
- * meaning it is a valid (and can be parsed) RTL2832 descriptor
- */
- public Descriptor getDescriptor()
- {
- if( mDescriptor != null && mDescriptor.isValid() )
- {
- return mDescriptor;
- }
+ claimInterface(mDeviceHandle);
- return null;
- }
-
- public void setSamplingMode( SampleMode mode ) throws LibUsbException
- {
- switch( mode )
- {
- case QUADRATURE:
+ try
+ {
+ setSampleRate(DEFAULT_SAMPLE_RATE);
+ }
+ catch(Exception e)
+ {
+ throw new SourceException("RTL2832 Tuner Controller - couldn't "
+ + "set default sample rate", e);
+ }
+
+ byte[] eeprom = null;
+
+ try
+ {
+ /* Read the contents of the 256-byte EEPROM */
+ eeprom = readEEPROM(mDeviceHandle, (short) 0, 256);
+ }
+ catch(Exception e)
+ {
+ mLog.error("error while reading the EEPROM device descriptor", e);
+ }
+
+ try
+ {
+ mDescriptor = new Descriptor(eeprom);
+
+ if(eeprom == null)
+ {
+ mLog.error("eeprom byte array was null - constructed "
+ + "empty descriptor object");
+ }
+ }
+ catch(Exception e)
+ {
+ mLog.error("error while constructing device descriptor using "
+ + "descriptor byte array " +
+ (eeprom == null ? "[null]" : Arrays.toString(eeprom)), e);
+ }
+ }
+
+ /**
+ * Claims the USB interface. Attempts to detach the active kernel driver
+ * if one is currently attached.
+ */
+ public static void claimInterface(DeviceHandle handle) throws SourceException
+ {
+ if(handle != null)
+ {
+ int result = LibUsb.kernelDriverActive(handle, USB_INTERFACE);
+
+ if(result == 1)
+ {
+ result = LibUsb.detachKernelDriver(handle, USB_INTERFACE);
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("failed attempt to detach kernel driver [" +
+ LibUsb.errorName(result) + "]");
+
+ throw new SourceException("couldn't detach kernel driver "
+ + "from device");
+ }
+ }
+
+ result = LibUsb.claimInterface(handle, USB_INTERFACE);
+
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new SourceException("couldn't claim usb interface [" +
+ LibUsb.errorName(result) + "]");
+ }
+ }
+ else
+ {
+ throw new SourceException("couldn't claim usb interface - no "
+ + "device handle");
+ }
+ }
+
+ public static void releaseInterface(DeviceHandle handle)
+ throws SourceException
+ {
+ int result = LibUsb.releaseInterface(handle, USB_INTERFACE);
+
+ if(result != LibUsb.SUCCESS)
+ {
+ throw new SourceException("couldn't release interface [" +
+ LibUsb.errorName(result) + "]");
+ }
+ }
+
+ /**
+ * Descriptor contains all identifiers and labels parsed from the EEPROM.
+ *
+ * May return null if unable to get 256 byte eeprom descriptor from tuner
+ * or if the descriptor doesn't begin with byte values of 0x28 and 0x32
+ * meaning it is a valid (and can be parsed) RTL2832 descriptor
+ */
+ public Descriptor getDescriptor()
+ {
+ if(mDescriptor != null && mDescriptor.isValid())
+ {
+ return mDescriptor;
+ }
+
+ return null;
+ }
+
+ public void setSamplingMode(SampleMode mode) throws LibUsbException
+ {
+ switch(mode)
+ {
+ case QUADRATURE:
/* Set intermediate frequency to 0 Hz */
- setIFFrequency( 0 );
+ setIFFrequency(0);
/* Enable I/Q ADC Input */
- writeDemodRegister( mDeviceHandle,
- Page.ZERO,
- (short)0x08,
- (short)0xCD,
- 1 );
+ writeDemodRegister(mDeviceHandle,
+ Page.ZERO,
+ (short) 0x08,
+ (short) 0xCD,
+ 1);
/* Enable zero-IF mode */
- writeDemodRegister( mDeviceHandle,
- Page.ONE,
- (short)0xB1,
- (short)0x1B,
- 1 );
+ writeDemodRegister(mDeviceHandle,
+ Page.ONE,
+ (short) 0xB1,
+ (short) 0x1B,
+ 1);
/* Set default i/q path */
- writeDemodRegister( mDeviceHandle,
- Page.ZERO,
- (short)0x06,
- (short)0x80,
- 1 );
- break;
- case DIRECT:
- default:
- throw new LibUsbException( "QUADRATURE mode is the only mode "
- + "currently supported", LibUsb.ERROR_NOT_SUPPORTED );
- }
- }
-
- public void setIFFrequency( int frequency ) throws LibUsbException
- {
- long ifFrequency = ( (long)TWO_TO_22_POWER * (long)frequency ) /
- (long)mOscillatorFrequency * -1;
+ writeDemodRegister(mDeviceHandle,
+ Page.ZERO,
+ (short) 0x06,
+ (short) 0x80,
+ 1);
+ break;
+ case DIRECT:
+ default:
+ throw new LibUsbException("QUADRATURE mode is the only mode "
+ + "currently supported", LibUsb.ERROR_NOT_SUPPORTED);
+ }
+ }
+
+ public void setIFFrequency(int frequency) throws LibUsbException
+ {
+ long ifFrequency = ((long) TWO_TO_22_POWER * (long) frequency) /
+ (long) mOscillatorFrequency * -1;
/* Write byte 2 (high) */
- writeDemodRegister( mDeviceHandle,
- Page.ONE,
- (short)0x19,
- (short)( Long.rotateRight( ifFrequency, 16 ) & 0x3F ),
- 1 );
+ writeDemodRegister(mDeviceHandle,
+ Page.ONE,
+ (short) 0x19,
+ (short) (Long.rotateRight(ifFrequency, 16) & 0x3F),
+ 1);
/* Write byte 1 (middle) */
- writeDemodRegister( mDeviceHandle,
- Page.ONE,
- (short)0x1A,
- (short)( Long.rotateRight( ifFrequency, 8 ) & 0xFF ),
- 1 );
+ writeDemodRegister(mDeviceHandle,
+ Page.ONE,
+ (short) 0x1A,
+ (short) (Long.rotateRight(ifFrequency, 8) & 0xFF),
+ 1);
/* Write byte 0 (low) */
- writeDemodRegister( mDeviceHandle,
- Page.ONE,
- (short)0x1B,
- (short)( ifFrequency & 0xFF ),
- 1 );
- }
+ writeDemodRegister(mDeviceHandle,
+ Page.ONE,
+ (short) 0x1B,
+ (short) (ifFrequency & 0xFF),
+ 1);
+ }
- public abstract void initTuner( boolean controlI2CRepeater )
- throws UsbException;
+ public abstract void initTuner(boolean controlI2CRepeater)
+ throws UsbException;
- /**
- * Provides a unique identifier to use in distinctly identifying this
- * tuner from among other tuners of the same type, so that we can fetch a
- * tuner configuration from the settings manager for this specific tuner.
- *
- * @return serial number of the device
- */
- public String getUniqueID()
- {
- if( mDescriptor != null && mDescriptor.hasSerial() )
- {
- return mDescriptor.getSerial();
- }
- else
- {
- int serial =
- ( 0xFF & mDeviceDescriptor.iSerialNumber() );
+ /**
+ * Provides a unique identifier to use in distinctly identifying this
+ * tuner from among other tuners of the same type, so that we can fetch a
+ * tuner configuration from the settings manager for this specific tuner.
+ *
+ * @return serial number of the device
+ */
+ public String getUniqueID()
+ {
+ if(mDescriptor != null && mDescriptor.hasSerial())
+ {
+ return mDescriptor.getSerial();
+ }
+ else
+ {
+ int serial =
+ (0xFF & mDeviceDescriptor.iSerialNumber());
- return "SER#" + serial;
- }
- }
-
- public abstract void setSampleRateFilters( int sampleRate )
- throws SourceException;
-
- public abstract TunerType getTunerType();
-
- public static TunerType identifyTunerType( Device device )
- throws SourceException
- {
- DeviceHandle handle = new DeviceHandle();
-
- int reason = LibUsb.open( device, handle );
-
- if( reason != LibUsb.SUCCESS )
- {
- throw new SourceException( "couldn't open device - check permissions"
- + " (udev.rule) [" + LibUsb.errorName( reason ) + "]" );
- }
-
- TunerType tunerClass = TunerType.UNKNOWN;
-
- try
- {
- claimInterface( handle );
+ return "SER#" + serial;
+ }
+ }
+
+ public abstract void setSampleRateFilters(int sampleRate)
+ throws SourceException;
+
+ public abstract TunerType getTunerType();
+
+ public static TunerType identifyTunerType(Device device)
+ throws SourceException
+ {
+ DeviceHandle handle = new DeviceHandle();
+
+ int reason = LibUsb.open(device, handle);
+
+ if(reason != LibUsb.SUCCESS)
+ {
+ throw new SourceException("couldn't open device - check permissions"
+ + " (udev.rule) [" + LibUsb.errorName(reason) + "]");
+ }
+
+ TunerType tunerClass = TunerType.UNKNOWN;
+
+ try
+ {
+ claimInterface(handle);
/* Perform a dummy write to see if the device needs reset */
- boolean resetRequired = false;
-
- try
- {
- writeRegister( handle,
- Block.USB,
- Address.USB_SYSCTL.getAddress(),
- 0x09,
- 1 );
- }
- catch( LibUsbException e )
- {
-
- if( e.getErrorCode() < 0 )
- {
- mLog.error( "error performing dummy write - attempting "
- + "device reset", e );
+ boolean resetRequired = false;
- resetRequired = true;
- }
- else
- {
- throw new SourceException( "error performing dummy write "
- + "to device [" + LibUsb.errorName(
- e.getErrorCode() ) + "]", e );
- }
- }
+ try
+ {
+ writeRegister(handle,
+ Block.USB,
+ Address.USB_SYSCTL.getAddress(),
+ 0x09,
+ 1);
+ }
+ catch(LibUsbException e)
+ {
- if( resetRequired )
- {
- reason = LibUsb.resetDevice( handle );
-
- try
- {
- writeRegister( handle,
- Block.USB,
- Address.USB_SYSCTL.getAddress(),
- 0x09,
- 1 );
- }
- catch( LibUsbException e2 )
- {
- mLog.error( "device reset attempted, but lost device handle. "
- + "Try restarting the application to use this device" );
+ if(e.getErrorCode() < 0)
+ {
+ mLog.error("error performing dummy write - attempting "
+ + "device reset", e);
- throw new SourceException( "couldn't reset device" );
- }
- }
+ resetRequired = true;
+ }
+ else
+ {
+ throw new SourceException("error performing dummy write "
+ + "to device [" + LibUsb.errorName(
+ e.getErrorCode()) + "]", e);
+ }
+ }
+
+ if(resetRequired)
+ {
+ reason = LibUsb.resetDevice(handle);
+
+ try
+ {
+ writeRegister(handle,
+ Block.USB,
+ Address.USB_SYSCTL.getAddress(),
+ 0x09,
+ 1);
+ }
+ catch(LibUsbException e2)
+ {
+ mLog.error("device reset attempted, but lost device handle. "
+ + "Try restarting the application to use this device");
+
+ throw new SourceException("couldn't reset device");
+ }
+ }
/* Initialize the baseband */
- initBaseband( handle );
+ initBaseband(handle);
- enableI2CRepeater( handle, true );
-
- boolean controlI2CRepeater = false;
+ enableI2CRepeater(handle, true);
+
+ boolean controlI2CRepeater = false;
/* Test for each tuner type until we find the correct one */
- if( isTuner( TunerTypeCheck.E4K, handle, controlI2CRepeater ) )
- {
- tunerClass = TunerType.ELONICS_E4000;
- }
- else if( isTuner( TunerTypeCheck.FC0013, handle, controlI2CRepeater ) )
- {
- tunerClass = TunerType.FITIPOWER_FC0013;
- }
- else if( isTuner( TunerTypeCheck.R820T, handle, controlI2CRepeater ) )
- {
- tunerClass = TunerType.RAFAELMICRO_R820T;
- }
- else if( isTuner( TunerTypeCheck.R828D, handle, controlI2CRepeater ) )
- {
- tunerClass = TunerType.RAFAELMICRO_R828D;
- }
- else if( isTuner( TunerTypeCheck.FC2580, handle, controlI2CRepeater ) )
- {
- tunerClass = TunerType.FCI_FC2580;
- }
- else if( isTuner( TunerTypeCheck.FC0012, handle, controlI2CRepeater ) )
- {
- tunerClass = TunerType.FITIPOWER_FC0012;
- }
-
- enableI2CRepeater( handle, false );
+ if(isTuner(TunerTypeCheck.E4K, handle, controlI2CRepeater))
+ {
+ tunerClass = TunerType.ELONICS_E4000;
+ }
+ else if(isTuner(TunerTypeCheck.FC0013, handle, controlI2CRepeater))
+ {
+ tunerClass = TunerType.FITIPOWER_FC0013;
+ }
+ else if(isTuner(TunerTypeCheck.R820T, handle, controlI2CRepeater))
+ {
+ tunerClass = TunerType.RAFAELMICRO_R820T;
+ }
+ else if(isTuner(TunerTypeCheck.R828D, handle, controlI2CRepeater))
+ {
+ tunerClass = TunerType.RAFAELMICRO_R828D;
+ }
+ else if(isTuner(TunerTypeCheck.FC2580, handle, controlI2CRepeater))
+ {
+ tunerClass = TunerType.FCI_FC2580;
+ }
+ else if(isTuner(TunerTypeCheck.FC0012, handle, controlI2CRepeater))
+ {
+ tunerClass = TunerType.FITIPOWER_FC0012;
+ }
- releaseInterface( handle );
-
- LibUsb.close( handle );
- }
- catch( Exception e )
- {
- mLog.error( "error while determining tuner type", e );
- }
-
- return tunerClass;
- }
+ enableI2CRepeater(handle, false);
+
+ releaseInterface(handle);
+
+ LibUsb.close(handle);
+ }
+ catch(Exception e)
+ {
+ mLog.error("error while determining tuner type", e);
+ }
+
+ return tunerClass;
+ }
/**
* Releases the USB interface
*/
public void release()
{
- try
+ try
{
- if( mBufferProcessor.isRunning() )
- {
- mBufferProcessor.stop();
- }
-
- LibUsb.releaseInterface( mDeviceHandle, USB_INTERFACE );
-
- LibUsb.exit( null );
+ if(mBufferProcessor.isRunning())
+ {
+ mBufferProcessor.stop();
+ }
+
+ LibUsb.releaseInterface(mDeviceHandle, USB_INTERFACE);
+
+ LibUsb.exit(null);
}
- catch ( Exception e )
+ catch(Exception e)
{
- mLog.error( "attempt to release USB interface failed", e );
+ mLog.error("attempt to release USB interface failed", e);
}
}
-
- public void resetUSBBuffer() throws LibUsbException
- {
- writeRegister( mDeviceHandle, Block.USB, Address.USB_EPA_CTL.getAddress(), 0x1002, 2 );
- writeRegister( mDeviceHandle, Block.USB, Address.USB_EPA_CTL.getAddress(), 0x0000, 2 );
- }
-
- public static void initBaseband( DeviceHandle handle ) throws LibUsbException
- {
+
+ public void resetUSBBuffer() throws LibUsbException
+ {
+ writeRegister(mDeviceHandle, Block.USB, Address.USB_EPA_CTL.getAddress(), 0x1002, 2);
+ writeRegister(mDeviceHandle, Block.USB, Address.USB_EPA_CTL.getAddress(), 0x0000, 2);
+ }
+
+ public static void initBaseband(DeviceHandle handle) throws LibUsbException
+ {
/* Initialize USB */
- writeRegister( handle, Block.USB, Address.USB_SYSCTL.getAddress(), 0x09, 1 );
- writeRegister( handle, Block.USB, Address.USB_EPA_MAXPKT.getAddress(), 0x0002, 2 );
- writeRegister( handle, Block.USB, Address.USB_EPA_CTL.getAddress(), 0x1002, 2 );
+ writeRegister(handle, Block.USB, Address.USB_SYSCTL.getAddress(), 0x09, 1);
+ writeRegister(handle, Block.USB, Address.USB_EPA_MAXPKT.getAddress(), 0x0002, 2);
+ writeRegister(handle, Block.USB, Address.USB_EPA_CTL.getAddress(), 0x1002, 2);
/* Power on demod */
- writeRegister( handle, Block.SYS, Address.DEMOD_CTL_1.getAddress(), 0x22, 1 );
- writeRegister( handle, Block.SYS, Address.DEMOD_CTL.getAddress(), 0xE8, 1 );
+ writeRegister(handle, Block.SYS, Address.DEMOD_CTL_1.getAddress(), 0x22, 1);
+ writeRegister(handle, Block.SYS, Address.DEMOD_CTL.getAddress(), 0xE8, 1);
/* Reset demod */
- writeDemodRegister( handle, Page.ONE, (short)0x01, 0x14, 1 ); //Bit 3 = soft reset
- writeDemodRegister( handle, Page.ONE, (short)0x01, 0x10, 1 );
+ writeDemodRegister(handle, Page.ONE, (short) 0x01, 0x14, 1); //Bit 3 = soft reset
+ writeDemodRegister(handle, Page.ONE, (short) 0x01, 0x10, 1);
/* Disable spectrum inversion and adjacent channel rejection */
- writeDemodRegister( handle, Page.ONE, (short)0x15, 0x00, 1 );
- writeDemodRegister( handle, Page.ONE, (short)0x16, 0x0000, 2 );
+ writeDemodRegister(handle, Page.ONE, (short) 0x15, 0x00, 1);
+ writeDemodRegister(handle, Page.ONE, (short) 0x16, 0x0000, 2);
/* Clear DDC shift and IF frequency registers */
- writeDemodRegister( handle, Page.ONE, (short)0x16, 0x00, 1 );
- writeDemodRegister( handle, Page.ONE, (short)0x17, 0x00, 1 );
- writeDemodRegister( handle, Page.ONE, (short)0x18, 0x00, 1 );
- writeDemodRegister( handle, Page.ONE, (short)0x19, 0x00, 1 );
- writeDemodRegister( handle, Page.ONE, (short)0x1A, 0x00, 1 );
- writeDemodRegister( handle, Page.ONE, (short)0x1B, 0x00, 1 );
+ writeDemodRegister(handle, Page.ONE, (short) 0x16, 0x00, 1);
+ writeDemodRegister(handle, Page.ONE, (short) 0x17, 0x00, 1);
+ writeDemodRegister(handle, Page.ONE, (short) 0x18, 0x00, 1);
+ writeDemodRegister(handle, Page.ONE, (short) 0x19, 0x00, 1);
+ writeDemodRegister(handle, Page.ONE, (short) 0x1A, 0x00, 1);
+ writeDemodRegister(handle, Page.ONE, (short) 0x1B, 0x00, 1);
/* Set FIR coefficients */
- for( int x = 0; x < sFIR_COEFFICIENTS.length; x++ )
- {
- writeDemodRegister( handle,
- Page.ONE,
- (short)( 0x1C + x ),
- sFIR_COEFFICIENTS[ x ],
- 1 );
- }
+ for(int x = 0; x < sFIR_COEFFICIENTS.length; x++)
+ {
+ writeDemodRegister(handle,
+ Page.ONE,
+ (short) (0x1C + x),
+ sFIR_COEFFICIENTS[x],
+ 1);
+ }
/* Enable SDR mode, disable DAGC (bit 5) */
- writeDemodRegister( handle, Page.ZERO, (short)0x19, 0x05, 1 );
+ writeDemodRegister(handle, Page.ZERO, (short) 0x19, 0x05, 1);
/* Init FSM state-holding register */
- writeDemodRegister( handle, Page.ONE, (short)0x93, 0xF0, 1 );
- writeDemodRegister( handle, Page.ONE, (short)0x94, 0x0F, 1 );
+ writeDemodRegister(handle, Page.ONE, (short) 0x93, 0xF0, 1);
+ writeDemodRegister(handle, Page.ONE, (short) 0x94, 0x0F, 1);
/* Disable AGC (en_dagc, bit 0) (seems to have no effect) */
- writeDemodRegister( handle, Page.ONE, (short)0x11, 0x00, 1 );
+ writeDemodRegister(handle, Page.ONE, (short) 0x11, 0x00, 1);
/* Disable RF and IF AGC loop */
- writeDemodRegister( handle, Page.ONE, (short)0x04, 0x00, 1 );
+ writeDemodRegister(handle, Page.ONE, (short) 0x04, 0x00, 1);
/* Disable PID filter */
- writeDemodRegister( handle, Page.ZERO, (short)0x61, 0x60, 1 );
+ writeDemodRegister(handle, Page.ZERO, (short) 0x61, 0x60, 1);
/* opt_adc_iq = 0, default ADC_I/ADC_Q datapath */
- writeDemodRegister( handle, Page.ZERO, (short)0x06, 0x80, 1 );
+ writeDemodRegister(handle, Page.ZERO, (short) 0x06, 0x80, 1);
/* Enable Zero-if mode (en_bbin bit),
* DC cancellation (en_dc_est),
* IQ estimation/compensation (en_iq_comp, en_iq_est) */
- writeDemodRegister( handle, Page.ONE, (short)0xB1, 0x1B, 1 );
+ writeDemodRegister(handle, Page.ONE, (short) 0xB1, 0x1B, 1);
/* Disable 4.096 MHz clock output on pin TP_CK0 */
- writeDemodRegister( handle, Page.ZERO, (short)0x0D, 0x83, 1 );
- }
-
- protected void deinitBaseband( DeviceHandle handle )
- throws IllegalArgumentException, UsbDisconnectedException, UsbException
- {
- writeRegister( handle, Block.SYS, Address.DEMOD_CTL.getAddress(), 0x20, 1);
- }
+ writeDemodRegister(handle, Page.ZERO, (short) 0x0D, 0x83, 1);
+ }
- /**
- * Sets the General Purpose Input/Output (GPIO) register bit
- *
- * @param handle - USB tuner device
- * @param bitMask - bit mask with one for targeted register bits and zero
- * for the non-targeted register bits
- * @param enabled - true to set the bit and false to clear the bit
- * @throws UsbDisconnectedException - if the tuner device is disconnected
- * @throws UsbException - if there is a USB error while communicating with
- * the device
- */
- protected static void setGPIOBit( DeviceHandle handle,
- byte bitMask,
- boolean enabled ) throws LibUsbException
- {
- //Get current register value
- int value = readRegister( handle, Block.SYS, Address.GPO.getAddress(), 1 );
+ protected void deinitBaseband(DeviceHandle handle)
+ throws IllegalArgumentException, UsbDisconnectedException, UsbException
+ {
+ writeRegister(handle, Block.SYS, Address.DEMOD_CTL.getAddress(), 0x20, 1);
+ }
- //Update the masked bits
- if( enabled )
- {
- value |= bitMask;
- }
- else
- {
- value &= ~bitMask;
- }
+ /**
+ * Sets the General Purpose Input/Output (GPIO) register bit
+ *
+ * @param handle - USB tuner device
+ * @param bitMask - bit mask with one for targeted register bits and zero
+ * for the non-targeted register bits
+ * @param enabled - true to set the bit and false to clear the bit
+ * @throws UsbDisconnectedException - if the tuner device is disconnected
+ * @throws UsbException - if there is a USB error while communicating with
+ * the device
+ */
+ protected static void setGPIOBit(DeviceHandle handle,
+ byte bitMask,
+ boolean enabled) throws LibUsbException
+ {
+ //Get current register value
+ int value = readRegister(handle, Block.SYS, Address.GPO.getAddress(), 1);
- //Write the change back to the device
- writeRegister( handle, Block.SYS, Address.GPO.getAddress(), value, 1 );
- }
+ //Update the masked bits
+ if(enabled)
+ {
+ value |= bitMask;
+ }
+ else
+ {
+ value &= ~bitMask;
+ }
- /**
- * Enables GPIO Output
- * @param handle - usb tuner device
- * @param bitMask - mask containing one bit value in targeted bit field(s)
- * @throws UsbDisconnectedException
- * @throws UsbException
- */
- protected static void setGPIOOutput( DeviceHandle handle, byte bitMask )
- throws LibUsbException
- {
- //Get current register value
- int value = readRegister( handle, Block.SYS, Address.GPD.getAddress(), 1 );
+ //Write the change back to the device
+ writeRegister(handle, Block.SYS, Address.GPO.getAddress(), value, 1);
+ }
- //Mask the value and rewrite it
- writeRegister( handle, Block.SYS, Address.GPO.getAddress(),
- value & ~bitMask, 1 );
-
- //Get current register value
- value = readRegister( handle, Block.SYS, Address.GPOE.getAddress(), 1 );
+ /**
+ * Enables GPIO Output
+ *
+ * @param handle - usb tuner device
+ * @param bitMask - mask containing one bit value in targeted bit field(s)
+ * @throws UsbDisconnectedException
+ * @throws UsbException
+ */
+ protected static void setGPIOOutput(DeviceHandle handle, byte bitMask)
+ throws LibUsbException
+ {
+ //Get current register value
+ int value = readRegister(handle, Block.SYS, Address.GPD.getAddress(), 1);
- //Mask the value and rewrite it
- writeRegister( handle, Block.SYS, Address.GPOE.getAddress(),
- value | bitMask, 1 );
- }
-
- protected static void enableI2CRepeater( DeviceHandle handle,
- boolean enabled )
- throws LibUsbException
- {
- Page page = Page.ONE;
- short address = 1;
- int value;
-
- if( enabled )
- {
- value = 0x18; //ON
- }
- else
- {
- value = 0x10; //OFF
- }
+ //Mask the value and rewrite it
+ writeRegister(handle, Block.SYS, Address.GPO.getAddress(),
+ value & ~bitMask, 1);
- writeDemodRegister( handle, page, address, value, 1 );
- }
-
- protected boolean isI2CRepeaterEnabled() throws SourceException
- {
- int register = readDemodRegister( mDeviceHandle, Page.ONE, (short)0x1, 1 );
-
- return register == 0x18;
- }
-
- protected static int readI2CRegister( DeviceHandle handle,
- byte i2CAddress,
- byte i2CRegister,
- boolean controlI2CRepeater )
- throws LibUsbException
- {
- short address = (short)( i2CAddress & 0xFF );
+ //Get current register value
+ value = readRegister(handle, Block.SYS, Address.GPOE.getAddress(), 1);
- ByteBuffer buffer = ByteBuffer.allocateDirect( 1 );
- buffer.put( i2CRegister );
- buffer.rewind();
-
- ByteBuffer data = ByteBuffer.allocateDirect( 1 );
+ //Mask the value and rewrite it
+ writeRegister(handle, Block.SYS, Address.GPOE.getAddress(),
+ value | bitMask, 1);
+ }
- if( controlI2CRepeater )
- {
- enableI2CRepeater( handle, true );
+ protected static void enableI2CRepeater(DeviceHandle handle,
+ boolean enabled)
+ throws LibUsbException
+ {
+ Page page = Page.ONE;
+ short address = 1;
+ int value;
- write( handle, address, Block.I2C, buffer );
- read( handle, address, Block.I2C, data );
+ if(enabled)
+ {
+ value = 0x18; //ON
+ }
+ else
+ {
+ value = 0x10; //OFF
+ }
- enableI2CRepeater( handle, false );
- }
- else
- {
- write( handle, address, Block.I2C, buffer );
- read( handle, address, Block.I2C, data );
- }
-
- return (int)( data.get() & 0xFF );
- }
-
- protected void writeI2CRegister( DeviceHandle handle,
- byte i2CAddress,
- byte i2CRegister,
- byte value,
- boolean controlI2CRepeater ) throws LibUsbException
- {
-
- short address = (short)( i2CAddress & 0xFF );
+ writeDemodRegister(handle, page, address, value, 1);
+ }
- ByteBuffer buffer = ByteBuffer.allocateDirect( 2 );
- buffer.put( i2CRegister );
- buffer.put( value );
+ protected boolean isI2CRepeaterEnabled() throws SourceException
+ {
+ int register = readDemodRegister(mDeviceHandle, Page.ONE, (short) 0x1, 1);
- buffer.rewind();
+ return register == 0x18;
+ }
- if( controlI2CRepeater )
- {
- enableI2CRepeater( handle, true );
- write( handle, address, Block.I2C, buffer );
- enableI2CRepeater( handle, false );
- }
- else
- {
- write( handle, address, Block.I2C, buffer );
- }
- }
+ protected static int readI2CRegister(DeviceHandle handle,
+ byte i2CAddress,
+ byte i2CRegister,
+ boolean controlI2CRepeater)
+ throws LibUsbException
+ {
+ short address = (short) (i2CAddress & 0xFF);
- protected static void writeDemodRegister( DeviceHandle handle,
- Page page,
- short address,
- int value,
- int length ) throws LibUsbException
- {
- ByteBuffer buffer = ByteBuffer.allocateDirect( length );
- buffer.order( ByteOrder.BIG_ENDIAN );
-
- if( length == 1 )
- {
- buffer.put( (byte)( value & 0xFF ) );
- }
- else if( length == 2 )
- {
- buffer.putShort( (short)( value & 0xFFFF ) );
- }
- else
- {
- throw new IllegalArgumentException( "Cannot write value greater "
- + "than 16 bits to the register - length [" + length + "]" );
- }
+ ByteBuffer buffer = ByteBuffer.allocateDirect(1);
+ buffer.put(i2CRegister);
+ buffer.rewind();
- short index = (short)( 0x10 | page.getPage() );
-
- short newAddress = (short)( address << 8 | 0x20 );
+ ByteBuffer data = ByteBuffer.allocateDirect(1);
- write( handle, newAddress, index, buffer );
-
- readDemodRegister( handle, Page.TEN, (short)1, length );
- }
+ if(controlI2CRepeater)
+ {
+ enableI2CRepeater(handle, true);
- protected static int readDemodRegister( DeviceHandle handle,
- Page page,
- short address,
- int length ) throws LibUsbException
- {
- short index = page.getPage();
- short newAddress = (short)( ( address << 8 ) | 0x20 );
-
- ByteBuffer buffer = ByteBuffer.allocateDirect( length );
-
- read( handle, newAddress, index, buffer );
- buffer.order( ByteOrder.LITTLE_ENDIAN );
+ write(handle, address, Block.I2C, buffer);
+ read(handle, address, Block.I2C, data);
- if( length == 2 )
- {
- return (int)( buffer.getShort() & 0xFFFF );
- }
- else
- {
- return (int)( buffer.get() & 0xFF );
- }
- }
-
- protected static void writeRegister( DeviceHandle handle,
- Block block,
- short address,
- int value,
- int length ) throws LibUsbException
- {
- ByteBuffer buffer = ByteBuffer.allocateDirect( length );
- buffer.order( ByteOrder.BIG_ENDIAN );
-
- if( length == 1 )
- {
- buffer.put( (byte)( value & 0xFF ) ) ;
- }
- else if( length == 2 )
- {
- buffer.putShort( (short)value );
- }
- else
- {
- throw new IllegalArgumentException( "Cannot write value greater "
- + "than 16 bits to the register - length [" + length + "]" );
- }
-
- buffer.rewind();
+ enableI2CRepeater(handle, false);
+ }
+ else
+ {
+ write(handle, address, Block.I2C, buffer);
+ read(handle, address, Block.I2C, data);
+ }
- write( handle, address, block, buffer );
- }
+ return (int) (data.get() & 0xFF);
+ }
- protected static int readRegister( DeviceHandle handle,
- Block block,
- short address,
- int length ) throws LibUsbException
- {
- ByteBuffer buffer = ByteBuffer.allocateDirect( 2 );
+ protected void writeI2CRegister(DeviceHandle handle,
+ byte i2CAddress,
+ byte i2CRegister,
+ byte value,
+ boolean controlI2CRepeater) throws LibUsbException
+ {
- read( handle, address, block, buffer );
+ short address = (short) (i2CAddress & 0xFF);
- buffer.order( ByteOrder.LITTLE_ENDIAN );
-
- if( length == 2 )
- {
- return (int)( buffer.getShort() & 0xFFFF );
- }
- else
- {
- return (int)( buffer.get() & 0xFF );
- }
- }
+ ByteBuffer buffer = ByteBuffer.allocateDirect(2);
+ buffer.put(i2CRegister);
+ buffer.put(value);
- /**
- */
- protected static void write( DeviceHandle handle,
- short address,
- Block block,
- ByteBuffer buffer ) throws LibUsbException
- {
- write( handle, address, block.getWriteIndex(), buffer );
- }
-
- protected static void write( DeviceHandle handle,
- short value,
- short index,
- ByteBuffer buffer ) throws LibUsbException
- {
- if( handle != null )
- {
- int transferred = LibUsb.controlTransfer( handle,
- CONTROL_ENDPOINT_OUT,
- REQUEST_ZERO,
- value,
- index,
- buffer,
- TIMEOUT_US );
+ buffer.rewind();
- if( transferred < 0 )
- {
- throw new LibUsbException( "error writing byte buffer",
- transferred );
- }
- else if( transferred != buffer.capacity() )
- {
- throw new LibUsbException( "transferred bytes [" +
- transferred + "] is not what was expected [" +
- buffer.capacity() + "]", transferred );
- }
- }
- else
- {
- throw new LibUsbException( "device handle is null",
- LibUsb.ERROR_NO_DEVICE );
- }
- }
+ if(controlI2CRepeater)
+ {
+ enableI2CRepeater(handle, true);
+ write(handle, address, Block.I2C, buffer);
+ enableI2CRepeater(handle, false);
+ }
+ else
+ {
+ write(handle, address, Block.I2C, buffer);
+ }
+ }
- /**
- * Performs a control type read
- */
- protected static void read( DeviceHandle handle,
- short address,
- short index,
- ByteBuffer buffer ) throws LibUsbException
- {
- if( handle != null )
- {
- int transferred = LibUsb.controlTransfer( handle,
- CONTROL_ENDPOINT_IN,
- REQUEST_ZERO,
- address,
- index,
- buffer,
- TIMEOUT_US );
+ protected static void writeDemodRegister(DeviceHandle handle,
+ Page page,
+ short address,
+ int value,
+ int length) throws LibUsbException
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(length);
+ buffer.order(ByteOrder.BIG_ENDIAN);
- if( transferred < 0 )
- {
- throw new LibUsbException( "read error", transferred );
- }
- else if( transferred != buffer.capacity() )
- {
- throw new LibUsbException( "transferred bytes [" +
- transferred + "] is not what was expected [" +
- buffer.capacity() + "]", transferred );
- }
- }
- else
- {
- throw new LibUsbException( "device handle is null",
- LibUsb.ERROR_NO_DEVICE );
- }
- }
-
- /**
- * Reads byte array from index at the address.
- *
- * @return big-endian byte array (needs to be swapped to be usable)
- *
- */
- protected static void read( DeviceHandle handle,
- short address,
- Block block,
- ByteBuffer buffer ) throws LibUsbException
- {
- read( handle, address, block.getReadIndex(), buffer );
- }
+ if(length == 1)
+ {
+ buffer.put((byte) (value & 0xFF));
+ }
+ else if(length == 2)
+ {
+ buffer.putShort((short) (value & 0xFFFF));
+ }
+ else
+ {
+ throw new IllegalArgumentException("Cannot write value greater "
+ + "than 16 bits to the register - length [" + length + "]");
+ }
- /**
- * Tests if the specified tuner type is contained in the usb tuner device.
- *
- * @param type - tuner type to test for
- * @param handle - handle to the usb tuner device
- * @param controlI2CRepeater - indicates if the method should control the
- * I2C repeater independently
- *
- * @return - true if the device is the specified tuner type
- */
- protected static boolean isTuner( TunerTypeCheck type,
- DeviceHandle handle,
- boolean controlI2CRepeater )
- {
- try
- {
- if( type == TunerTypeCheck.FC0012 ||
- type == TunerTypeCheck.FC2580 )
- {
- /* Initialize the GPIOs */
- setGPIOOutput( handle, (byte)0x20 );
+ short index = (short) (0x10 | page.getPage());
- /* Reset tuner before probing */
- setGPIOBit( handle, (byte)0x20, true );
- setGPIOBit( handle, (byte)0x20, false );
- }
-
- int value = readI2CRegister( handle, type.getI2CAddress(),
- type.getCheckAddress(), controlI2CRepeater );
+ short newAddress = (short) (address << 8 | 0x20);
- if( type == TunerTypeCheck.FC2580 )
- {
- return ( ( value & 0x7F ) == type.getCheckValue() );
- }
- else
- {
- return ( value == type.getCheckValue() );
- }
- }
- catch( LibUsbException e )
- {
- //Do nothing ... it's not the specified tuner
- }
-
- return false;
- }
+ write(handle, newAddress, index, buffer);
- public int getCurrentSampleRate() throws SourceException
- {
- return mSampleRate.getRate();
- }
-
- public int getSampleRateFromTuner() throws SourceException
- {
+ readDemodRegister(handle, Page.TEN, (short) 1, length);
+ }
+
+ protected static int readDemodRegister(DeviceHandle handle,
+ Page page,
+ short address,
+ int length) throws LibUsbException
+ {
+ short index = page.getPage();
+ short newAddress = (short) ((address << 8) | 0x20);
+
+ ByteBuffer buffer = ByteBuffer.allocateDirect(length);
+
+ read(handle, newAddress, index, buffer);
+ buffer.order(ByteOrder.LITTLE_ENDIAN);
+
+ if(length == 2)
+ {
+ return (int) (buffer.getShort() & 0xFFFF);
+ }
+ else
+ {
+ return (int) (buffer.get() & 0xFF);
+ }
+ }
+
+ protected static void writeRegister(DeviceHandle handle,
+ Block block,
+ short address,
+ int value,
+ int length) throws LibUsbException
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(length);
+ buffer.order(ByteOrder.BIG_ENDIAN);
+
+ if(length == 1)
+ {
+ buffer.put((byte) (value & 0xFF));
+ }
+ else if(length == 2)
+ {
+ buffer.putShort((short) value);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Cannot write value greater "
+ + "than 16 bits to the register - length [" + length + "]");
+ }
+
+ buffer.rewind();
+
+ write(handle, address, block, buffer);
+ }
+
+ protected static int readRegister(DeviceHandle handle,
+ Block block,
+ short address,
+ int length) throws LibUsbException
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(2);
+
+ read(handle, address, block, buffer);
+
+ buffer.order(ByteOrder.LITTLE_ENDIAN);
+
+ if(length == 2)
+ {
+ return (int) (buffer.getShort() & 0xFFFF);
+ }
+ else
+ {
+ return (int) (buffer.get() & 0xFF);
+ }
+ }
+
+ /**
+ */
+ protected static void write(DeviceHandle handle,
+ short address,
+ Block block,
+ ByteBuffer buffer) throws LibUsbException
+ {
+ write(handle, address, block.getWriteIndex(), buffer);
+ }
+
+ protected static void write(DeviceHandle handle,
+ short value,
+ short index,
+ ByteBuffer buffer) throws LibUsbException
+ {
+ if(handle != null)
+ {
+ int transferred = LibUsb.controlTransfer(handle,
+ CONTROL_ENDPOINT_OUT,
+ REQUEST_ZERO,
+ value,
+ index,
+ buffer,
+ TIMEOUT_US);
+
+ if(transferred < 0)
+ {
+ throw new LibUsbException("error writing byte buffer",
+ transferred);
+ }
+ else if(transferred != buffer.capacity())
+ {
+ throw new LibUsbException("transferred bytes [" +
+ transferred + "] is not what was expected [" +
+ buffer.capacity() + "]", transferred);
+ }
+ }
+ else
+ {
+ throw new LibUsbException("device handle is null",
+ LibUsb.ERROR_NO_DEVICE);
+ }
+ }
+
+ /**
+ * Performs a control type read
+ */
+ protected static void read(DeviceHandle handle,
+ short address,
+ short index,
+ ByteBuffer buffer) throws LibUsbException
+ {
+ if(handle != null)
+ {
+ int transferred = LibUsb.controlTransfer(handle,
+ CONTROL_ENDPOINT_IN,
+ REQUEST_ZERO,
+ address,
+ index,
+ buffer,
+ TIMEOUT_US);
+
+ if(transferred < 0)
+ {
+ throw new LibUsbException("read error", transferred);
+ }
+ else if(transferred != buffer.capacity())
+ {
+ throw new LibUsbException("transferred bytes [" +
+ transferred + "] is not what was expected [" +
+ buffer.capacity() + "]", transferred);
+ }
+ }
+ else
+ {
+ throw new LibUsbException("device handle is null",
+ LibUsb.ERROR_NO_DEVICE);
+ }
+ }
+
+ /**
+ * Reads byte array from index at the address.
+ *
+ * @return big-endian byte array (needs to be swapped to be usable)
+ */
+ protected static void read(DeviceHandle handle,
+ short address,
+ Block block,
+ ByteBuffer buffer) throws LibUsbException
+ {
+ read(handle, address, block.getReadIndex(), buffer);
+ }
+
+ /**
+ * Tests if the specified tuner type is contained in the usb tuner device.
+ *
+ * @param type - tuner type to test for
+ * @param handle - handle to the usb tuner device
+ * @param controlI2CRepeater - indicates if the method should control the
+ * I2C repeater independently
+ * @return - true if the device is the specified tuner type
+ */
+ protected static boolean isTuner(TunerTypeCheck type,
+ DeviceHandle handle,
+ boolean controlI2CRepeater)
+ {
try
{
- int high= readDemodRegister( mDeviceHandle, Page.ONE, (short)0x9F, 2 );
- int low = readDemodRegister( mDeviceHandle, Page.ONE, (short)0xA1, 2 );
+ if(type == TunerTypeCheck.FC0012 ||
+ type == TunerTypeCheck.FC2580)
+ {
+ /* Initialize the GPIOs */
+ setGPIOOutput(handle, (byte) 0x20);
- int ratio = Integer.rotateLeft( high, 16 ) | low;
-
- int rate = (int)( mOscillatorFrequency * TWO_TO_22_POWER / ratio );
-
- SampleRate sampleRate = SampleRate.getClosest( rate );
+ /* Reset tuner before probing */
+ setGPIOBit(handle, (byte) 0x20, true);
+ setGPIOBit(handle, (byte) 0x20, false);
+ }
+
+ int value = readI2CRegister(handle, type.getI2CAddress(),
+ type.getCheckAddress(), controlI2CRepeater);
+
+ if(type == TunerTypeCheck.FC2580)
+ {
+ return ((value & 0x7F) == type.getCheckValue());
+ }
+ else
+ {
+ return (value == type.getCheckValue());
+ }
+ }
+ catch(LibUsbException e)
+ {
+ //Do nothing ... it's not the specified tuner
+ }
+
+ return false;
+ }
+
+ public int getCurrentSampleRate() throws SourceException
+ {
+ return mSampleRate.getRate();
+ }
+
+ public int getSampleRateFromTuner() throws SourceException
+ {
+ try
+ {
+ int high = readDemodRegister(mDeviceHandle, Page.ONE, (short) 0x9F, 2);
+ int low = readDemodRegister(mDeviceHandle, Page.ONE, (short) 0xA1, 2);
+
+ int ratio = Integer.rotateLeft(high, 16) | low;
+
+ int rate = (int) (mOscillatorFrequency * TWO_TO_22_POWER / ratio);
+
+ SampleRate sampleRate = SampleRate.getClosest(rate);
/* If we're not currently set to this rate, set it as the current rate */
- if( sampleRate.getRate() != rate )
- {
- setSampleRate( sampleRate );
-
- return sampleRate.getRate();
- }
+ if(sampleRate.getRate() != rate)
+ {
+ setSampleRate(sampleRate);
+
+ return sampleRate.getRate();
+ }
}
- catch ( Exception e )
+ catch(Exception e)
{
- throw new SourceException( "RTL2832 Tuner Controller - cannot get "
- + "current sample rate", e );
+ throw new SourceException("RTL2832 Tuner Controller - cannot get "
+ + "current sample rate", e);
}
return DEFAULT_SAMPLE_RATE.getRate();
- }
-
- public void setSampleRate( SampleRate sampleRate ) throws SourceException
- {
+ }
+
+ public void setSampleRate(SampleRate sampleRate) throws SourceException
+ {
/* Write high-order 16-bits of sample rate ratio to demod register */
- writeDemodRegister( mDeviceHandle, Page.ONE, (short)0x9F,
- sampleRate.getRatioHighBits(), 2 );
+ writeDemodRegister(mDeviceHandle, Page.ONE, (short) 0x9F,
+ sampleRate.getRatioHighBits(), 2);
/* Write low-order 16-bits of sample rate ratio to demod register.
* Note: none of the defined rates have a low order ratio value, so we
* simply write a zero to the register */
- writeDemodRegister( mDeviceHandle, Page.ONE, (short)0xA1, 0, 2 );
+ writeDemodRegister(mDeviceHandle, Page.ONE, (short) 0xA1, 0, 2);
/* Set sample rate correction to 0 */
- setSampleRateFrequencyCorrection( 0 );
+ setSampleRateFrequencyCorrection(0);
/* Reset the demod for the changes to take effect */
- writeDemodRegister( mDeviceHandle, Page.ONE, (short)0x01, 0x14, 1 );
- writeDemodRegister( mDeviceHandle, Page.ONE, (short)0x01, 0x10, 1 );
+ writeDemodRegister(mDeviceHandle, Page.ONE, (short) 0x01, 0x14, 1);
+ writeDemodRegister(mDeviceHandle, Page.ONE, (short) 0x01, 0x10, 1);
/* Apply any tuner specific sample rate filter settings */
- setSampleRateFilters( sampleRate.getRate() );
+ setSampleRateFilters(sampleRate.getRate());
- mSampleRate = sampleRate;
+ mSampleRate = sampleRate;
- mFrequencyController.setSampleRate( sampleRate.getRate() );
-
- if( mSampleRateMonitor != null )
- {
- mSampleRateMonitor.setSampleRate( mSampleRate.getRate() );
- }
- }
-
- public void setSampleRateFrequencyCorrection( int ppm ) throws SourceException
- {
- int offset = -ppm * TWO_TO_22_POWER / 1000000;
-
- writeDemodRegister( mDeviceHandle,
- Page.ONE,
- (short)0x3F,
- ( offset & 0xFF ),
- 1 );
- writeDemodRegister( mDeviceHandle,
- Page.ONE,
- (short)0x3E,
- ( Integer.rotateRight( offset, 8 ) & 0xFF ),
- 1 );
+ mFrequencyController.setSampleRate(sampleRate.getRate());
+
+ if(mSampleRateMonitor != null)
+ {
+ mSampleRateMonitor.setSampleRate(mSampleRate.getRate());
+ }
+ }
+
+ public void setSampleRateFrequencyCorrection(int ppm) throws SourceException
+ {
+ int offset = -ppm * TWO_TO_22_POWER / 1000000;
+
+ writeDemodRegister(mDeviceHandle,
+ Page.ONE,
+ (short) 0x3F,
+ (offset & 0xFF),
+ 1);
+ writeDemodRegister(mDeviceHandle,
+ Page.ONE,
+ (short) 0x3E,
+ (Integer.rotateRight(offset, 8) & 0xFF),
+ 1);
/* Test to retune controller to apply frequency correction */
- try
- {
- mFrequencyController.setFrequency( mFrequencyController.getFrequency() );
- }
- catch( Exception e )
- {
- throw new SourceException( "couldn't set sample rate frequency correction", e );
- }
- }
-
- public int getSampleRateFrequencyCorrection() throws UsbException
- {
- int high = readDemodRegister( mDeviceHandle, Page.ONE, (short)0x3E, 1 );
- int low = readDemodRegister( mDeviceHandle, Page.ONE, (short)0x3F, 1 );
-
- return ( Integer.rotateLeft( high, 8 ) | low );
- }
+ try
+ {
+ mFrequencyController.setFrequency(mFrequencyController.getFrequency());
+ }
+ catch(Exception e)
+ {
+ throw new SourceException("couldn't set sample rate frequency correction", e);
+ }
+ }
- /**
- * Returns contents of the 256-byte EEPROM. The contents are as follows:
- *
- * 256-byte EEPROM (in hex):
- * 00/01 - 2832 Signature
- * 03/02 - 0BDA Vendor ID
- * 05/04 - 2832 Product ID
- * 06 - A5 (has serial id?)
- * 07 - 16 (bit field - bit 0 = remote wakeup, bit 1 = IR enabled
- * 08 - 02 or 12
- * 10/09 0310 ETX(0x03) plus label length (includes length and ETX bytes)
- * 12/11 First UTF-16 character
- * 14/13 Second UTF-16 character ...
- *
- * Label 1: vendor
- * Label 2: product
- * Label 3: serial
- * Label 4,5 ... (user defined)
- */
- public byte[] readEEPROM( DeviceHandle handle, short offset, int length )
- throws IllegalArgumentException
- {
- if( offset + length > 256 )
- {
- throw new IllegalArgumentException( "cannot read more than 256 "
- + "bytes from EEPROM - requested to read to byte [" +
- ( offset + length ) + "]" );
- }
+ public int getSampleRateFrequencyCorrection() throws UsbException
+ {
+ int high = readDemodRegister(mDeviceHandle, Page.ONE, (short) 0x3E, 1);
+ int low = readDemodRegister(mDeviceHandle, Page.ONE, (short) 0x3F, 1);
- byte[] data = new byte[ length ];
- ByteBuffer buffer = ByteBuffer.allocateDirect( 1 );
-
- try
- {
+ return (Integer.rotateLeft(high, 8) | low);
+ }
+
+ /**
+ * Returns contents of the 256-byte EEPROM. The contents are as follows:
+ *
+ * 256-byte EEPROM (in hex):
+ * 00/01 - 2832 Signature
+ * 03/02 - 0BDA Vendor ID
+ * 05/04 - 2832 Product ID
+ * 06 - A5 (has serial id?)
+ * 07 - 16 (bit field - bit 0 = remote wakeup, bit 1 = IR enabled
+ * 08 - 02 or 12
+ * 10/09 0310 ETX(0x03) plus label length (includes length and ETX bytes)
+ * 12/11 First UTF-16 character
+ * 14/13 Second UTF-16 character ...
+ *
+ * Label 1: vendor
+ * Label 2: product
+ * Label 3: serial
+ * Label 4,5 ... (user defined)
+ */
+ public byte[] readEEPROM(DeviceHandle handle, short offset, int length)
+ throws IllegalArgumentException
+ {
+ if(offset + length > 256)
+ {
+ throw new IllegalArgumentException("cannot read more than 256 "
+ + "bytes from EEPROM - requested to read to byte [" +
+ (offset + length) + "]");
+ }
+
+ byte[] data = new byte[length];
+ ByteBuffer buffer = ByteBuffer.allocateDirect(1);
+
+ try
+ {
/* Tell the RTL-2832 to address the EEPROM */
- writeRegister( handle, Block.I2C, EEPROM_ADDRESS, (byte)offset, 1 );
- }
- catch( LibUsbException e )
- {
- mLog.error( "usb error while attempting to set read address to "
- + "EEPROM register, prior to reading the EEPROM device "
- + "descriptor", e );
- }
-
- for( int x = 0; x < length; x++ )
- {
- try
- {
- read( handle, EEPROM_ADDRESS, Block.I2C, buffer );
- data[ x ] = buffer.get();
- buffer.rewind();
- }
- catch( Exception e )
- {
- mLog.error( "error while reading eeprom byte [" + x + "/" +
- length + "] aborting eeprom read and returning partially "
- + "filled descriptor byte array", e );
- x = length;
- }
- }
-
- return data;
- }
-
- /**
- * Writes a single byte to the 256-byte EEPROM using the specified offset.
- *
- * Note: introduce a 5 millisecond delay between each successive write to
- * the EEPROM or subsequent writes may fail.
- */
- public void writeEEPROMByte( DeviceHandle handle, byte offset, byte value )
- throws IllegalArgumentException, UsbDisconnectedException, UsbException
- {
- if( offset < 0 || offset > 255 )
- {
- throw new IllegalArgumentException( "RTL2832 Tuner Controller - "
- + "EEPROM offset must be within range of 0 - 255" );
- }
-
- int offsetAndValue = Integer.rotateLeft( ( 0xFF & offset ), 8 ) |
- ( 0xFF & value );
-
- writeRegister( handle, Block.I2C, EEPROM_ADDRESS, offsetAndValue, 2 );
- }
-
- public enum Address
- {
- USB_SYSCTL( 0x2000 ),
- USB_CTRL( 0x2010 ),
- USB_STAT( 0x2014 ),
- USB_EPA_CFG( 0x2144 ),
- USB_EPA_CTL( 0x2148 ),
- USB_EPA_MAXPKT( 0x2158 ),
- USB_EPA_MAXPKT_2( 0x215A ),
- USB_EPA_FIFO_CFG( 0x2160 ),
- DEMOD_CTL( 0x3000 ),
- GPO( 0x3001 ),
- GPI( 0x3002 ),
- GPOE( 0x3003 ),
- GPD( 0x3004 ),
- SYSINTE( 0x3005 ),
- SYSINTS( 0x3006 ),
- GP_CFG0( 0x3007 ),
- GP_CFG1( 0x3008 ),
- SYSINTE_1( 0x3009 ),
- SYSINTS_1( 0x300A ),
- DEMOD_CTL_1( 0x300B ),
- IR_SUSPEND( 0x300C );
-
- private int mAddress;
-
- private Address( int address )
- {
- mAddress = address;
- }
-
- public short getAddress()
- {
- return (short)mAddress;
- }
- }
-
- public enum Page
- {
- ZERO( 0x0 ),
- ONE( 0x1 ),
- TEN( 0xA );
-
- private int mPage;
-
- private Page( int page )
- {
- mPage = page;
- }
-
- public byte getPage()
- {
- return (byte)( mPage & 0xFF );
- }
- }
-
- public enum SampleMode
- {
- QUADRATURE, DIRECT;
- }
-
- public enum Block
- {
- DEMOD( 0 ),
- USB( 1 ),
- SYS( 2 ),
- TUN( 3 ),
- ROM( 4 ),
- IR( 5 ),
- I2C( 6 ); //I2C controller
-
- private int mValue;
-
- private Block( int value )
- {
- mValue = value;
- }
-
- public int getValue()
- {
- return mValue;
- }
-
- /**
- * Returns the value left shifted 8 bits
- */
- public short getReadIndex()
- {
- return (short)Integer.rotateLeft( mValue, 8 );
- }
-
- public short getWriteIndex()
- {
- return (short)( getReadIndex() | 0x10 );
- }
- }
-
- /**
- * Sample rates supported by the RTL-2832.
- *
- * Formula to calculate the ratio value:
- *
- * ratio = ( ( crystal_frequency * 2^22 ) / sample_rate ) & ~3
- *
- * Default crystal_frequency is 28,800,000
- *
- * This produces a 32-bit value that has to be set in 2 x 16-bit registers.
- * Place the high 16-bit value in ratioMSB and the low 16-bit value in
- * ratioLSB. Use integer for these values to avoid sign-extension issues.
- *
- * Mask the value with 0xFFFF when setting the register.
- */
- public enum SampleRate
- {
- /* Note: sample rates below 1.0MHz are subject to aliasing */
- RATE_0_240MHZ( 0x1E00, 240000, "0.240 MHz" ),
- RATE_0_288MHZ( 0x1900, 288000, "0.288 MHz" ),
- RATE_0_960MHZ( 0x0780, 960000, "0.960 MHz" ),
- RATE_1_200MHZ( 0x0600, 1200000, "1.200 MHz" ),
- RATE_1_440MHZ( 0x0500, 1440000, "1.440 MHz" ),
- RATE_1_920MHZ( 0x03C0, 2016000, "2.016 MHz" ),
- RATE_2_304MHZ( 0x0320, 2208000, "2.208 MHz" ),
- RATE_2_400MHZ( 0x0300, 2400000, "2.400 MHz" ),
- RATE_2_880MHZ( 0x0280, 2880000, "2.880 MHz" );
-
- private int mRatioHigh;
- private int mRate;
- private String mLabel;
-
- private SampleRate( int ratioHigh,
- int rate,
- String label )
- {
- mRatioHigh = ratioHigh;
- mRate = rate;
- mLabel = label;
- }
-
- public int getRatioHighBits()
- {
- return mRatioHigh;
- }
-
- public int getRate()
- {
- return mRate;
- }
-
- public String getLabel()
- {
- return mLabel;
- }
-
- public String toString()
- {
- return mLabel;
- }
-
- /**
- * Returns the sample rate that is equal to the argument or the next
- * higher sample rate
- * @param sampleRate
- * @return
- */
- public static SampleRate getClosest( int sampleRate )
- {
- for( SampleRate rate: values () )
- {
- if( rate.getRate() >= sampleRate )
- {
- return rate;
- }
- }
-
- return DEFAULT_SAMPLE_RATE;
- }
- }
-
- /**
- * Adds a sample listener. If the buffer processing thread is
- * not currently running, starts it running in a new thread.
- */
- public void addListener( Listener listener )
- {
- synchronized( mComplexBufferBroadcaster )
- {
- mComplexBufferBroadcaster.addListener( listener );
-
- if( mBufferProcessor == null )
- {
- mBufferProcessor = new BufferProcessor( mThreadPoolManager );
- }
-
- if( !mBufferProcessor.isRunning() )
- {
- Thread thread = new Thread( mBufferProcessor );
- thread.setDaemon( true );
- thread.setName( "RTL2832 Sample Processor" );
-
- thread.start();
- }
- }
- }
-
- /**
- * Removes the sample listener. If this is the last registered listener,
- * shuts down the buffer processing thread.
- */
- public void removeListener( Listener listener )
- {
- synchronized( mComplexBufferBroadcaster )
- {
- mComplexBufferBroadcaster.removeListener( listener );
-
- if( !mComplexBufferBroadcaster.hasListeners() )
- {
- mBufferProcessor.stop();
- }
- }
- }
-
- /**
- * Buffer processing thread. Fetches samples from the RTL2832 Tuner and
- * dispatches them to all registered listeners
- */
- public class BufferProcessor implements Runnable, TransferCallback
- {
- private ScheduledFuture mSampleDispatcherTask;
- private LinkedTransferQueue mAvailableTransfers;
- private LinkedTransferQueue mTransfersInProgress = new LinkedTransferQueue<>();
- private AtomicBoolean mRunning = new AtomicBoolean();
- private ThreadPoolManager mThreadPoolManager;
- private ByteBuffer mLibUsbHandlerStatus;
- private boolean mCancel = false;
-
- public BufferProcessor( ThreadPoolManager manager )
- {
- mThreadPoolManager = manager;
- }
-
- @Override
- public void run()
+ writeRegister(handle, Block.I2C, EEPROM_ADDRESS, (byte) offset, 1);
+ }
+ catch(LibUsbException e)
{
- if( mRunning.compareAndSet( false, true ) )
- {
- try
- {
- setSampleRate( mSampleRate );
-
- resetUSBBuffer();
- }
- catch( SourceException e )
- {
- mLog.error( "couldn't start buffer processor", e );
-
- mRunning.set( false );
- }
-
- prepareTransfers();
-
- try
- {
- mSampleDispatcherTask = mThreadPoolManager.scheduleFixedRate(
- ThreadType.SOURCE_SAMPLE_PROCESSING, new BufferDispatcher(),
- 20, TimeUnit.MILLISECONDS );
- }
- catch( NullPointerException npe )
- {
- mLog.error( "NPE! = tpm null: " + ( mThreadPoolManager == null ), npe );
- }
-
- mLibUsbHandlerStatus = ByteBuffer.allocateDirect( 4 );
-
- List transfers = new ArrayList<>();
-
- mCancel = false;
-
- while( mRunning.get() )
- {
- mAvailableTransfers.drainTo( transfers );
-
- for( Transfer transfer: transfers )
- {
- int result = LibUsb.submitTransfer( transfer );
-
- if( result == LibUsb.SUCCESS )
- {
- mTransfersInProgress.add( transfer );
- }
- else
- {
- mLog.error( "Error submitting transfer [" +
- LibUsb.errorName( result ) + "]" );
- }
- }
-
- int result = LibUsb.handleEventsTimeoutCompleted(
- null, TIMEOUT_US, mLibUsbHandlerStatus.asIntBuffer() );
-
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "error handling events for libusb" );
- }
-
- transfers.clear();
-
- mLibUsbHandlerStatus.rewind();
- }
-
- if( mCancel )
- {
- for( Transfer transfer: mTransfersInProgress )
- {
- LibUsb.cancelTransfer( transfer );
- }
-
- int result = LibUsb.handleEventsTimeoutCompleted( null,
- TIMEOUT_US, mLibUsbHandlerStatus.asIntBuffer() );
-
- if( result != LibUsb.SUCCESS )
- {
- mLog.error( "error handling events for libusb during cancel" );
- }
-
- mLibUsbHandlerStatus.rewind();
- }
- }
+ mLog.error("usb error while attempting to set read address to "
+ + "EEPROM register, prior to reading the EEPROM device "
+ + "descriptor", e);
}
- /**
- * Stops the sample fetching thread
- */
- public void stop()
- {
- mCancel = true;
-
- if( mRunning.compareAndSet( true, false ) )
- {
- if( mSampleDispatcherTask != null )
- {
- mThreadPoolManager.cancel( mSampleDispatcherTask );
- mSampleDispatcherTask = null;
- mFilledBuffers.clear();
- }
- }
- }
+ for(int x = 0; x < length; x++)
+ {
+ try
+ {
+ read(handle, EEPROM_ADDRESS, Block.I2C, buffer);
+ data[x] = buffer.get();
+ buffer.rewind();
+ }
+ catch(Exception e)
+ {
+ mLog.error("error while reading eeprom byte [" + x + "/" +
+ length + "] aborting eeprom read and returning partially "
+ + "filled descriptor byte array", e);
+ x = length;
+ }
+ }
- /**
- * Indicates if this thread is running
- */
- public boolean isRunning()
- {
- return mRunning.get();
- }
-
- @Override
- public void processTransfer( Transfer transfer )
- {
- mTransfersInProgress.remove( transfer );
-
- switch( transfer.status() )
- {
- case LibUsb.TRANSFER_COMPLETED:
- case LibUsb.TRANSFER_STALL:
- if( transfer.actualLength() > 0 )
- {
- ByteBuffer buffer = transfer.buffer();
-
- byte[] data = new byte[ transfer.actualLength() ];
-
- buffer.get( data );
+ return data;
+ }
- buffer.rewind();
+ /**
+ * Writes a single byte to the 256-byte EEPROM using the specified offset.
+ *
+ * Note: introduce a 5 millisecond delay between each successive write to
+ * the EEPROM or subsequent writes may fail.
+ */
+ public void writeEEPROMByte(DeviceHandle handle, byte offset, byte value)
+ throws IllegalArgumentException, UsbDisconnectedException, UsbException
+ {
+ if(offset < 0 || offset > 255)
+ {
+ throw new IllegalArgumentException("RTL2832 Tuner Controller - "
+ + "EEPROM offset must be within range of 0 - 255");
+ }
- if( isRunning() )
- {
- mFilledBuffers.add( data );
- }
- }
- break;
- case LibUsb.TRANSFER_CANCELLED:
- break;
- default:
+ int offsetAndValue = Integer.rotateLeft((0xFF & offset), 8) |
+ (0xFF & value);
+
+ writeRegister(handle, Block.I2C, EEPROM_ADDRESS, offsetAndValue, 2);
+ }
+
+ public enum Address
+ {
+ USB_SYSCTL(0x2000),
+ USB_CTRL(0x2010),
+ USB_STAT(0x2014),
+ USB_EPA_CFG(0x2144),
+ USB_EPA_CTL(0x2148),
+ USB_EPA_MAXPKT(0x2158),
+ USB_EPA_MAXPKT_2(0x215A),
+ USB_EPA_FIFO_CFG(0x2160),
+ DEMOD_CTL(0x3000),
+ GPO(0x3001),
+ GPI(0x3002),
+ GPOE(0x3003),
+ GPD(0x3004),
+ SYSINTE(0x3005),
+ SYSINTS(0x3006),
+ GP_CFG0(0x3007),
+ GP_CFG1(0x3008),
+ SYSINTE_1(0x3009),
+ SYSINTS_1(0x300A),
+ DEMOD_CTL_1(0x300B),
+ IR_SUSPEND(0x300C);
+
+ private int mAddress;
+
+ private Address(int address)
+ {
+ mAddress = address;
+ }
+
+ public short getAddress()
+ {
+ return (short) mAddress;
+ }
+ }
+
+ public enum Page
+ {
+ ZERO(0x0),
+ ONE(0x1),
+ TEN(0xA);
+
+ private int mPage;
+
+ private Page(int page)
+ {
+ mPage = page;
+ }
+
+ public byte getPage()
+ {
+ return (byte) (mPage & 0xFF);
+ }
+ }
+
+ public enum SampleMode
+ {
+ QUADRATURE, DIRECT;
+ }
+
+ public enum Block
+ {
+ DEMOD(0),
+ USB(1),
+ SYS(2),
+ TUN(3),
+ ROM(4),
+ IR(5),
+ I2C(6); //I2C controller
+
+ private int mValue;
+
+ private Block(int value)
+ {
+ mValue = value;
+ }
+
+ public int getValue()
+ {
+ return mValue;
+ }
+
+ /**
+ * Returns the value left shifted 8 bits
+ */
+ public short getReadIndex()
+ {
+ return (short) Integer.rotateLeft(mValue, 8);
+ }
+
+ public short getWriteIndex()
+ {
+ return (short) (getReadIndex() | 0x10);
+ }
+ }
+
+ /**
+ * Sample rates supported by the RTL-2832.
+ *
+ * Formula to calculate the ratio value:
+ *
+ * ratio = ( ( crystal_frequency * 2^22 ) / sample_rate ) & ~3
+ *
+ * Default crystal_frequency is 28,800,000
+ *
+ * This produces a 32-bit value that has to be set in 2 x 16-bit registers.
+ * Place the high 16-bit value in ratioMSB and the low 16-bit value in
+ * ratioLSB. Use integer for these values to avoid sign-extension issues.
+ *
+ * Mask the value with 0xFFFF when setting the register.
+ */
+ public enum SampleRate
+ {
+ /* Note: sample rates below 1.0MHz are subject to aliasing */
+ RATE_0_240MHZ(0x1E00, 240000, "0.240 MHz"),
+ RATE_0_288MHZ(0x1900, 288000, "0.288 MHz"),
+ RATE_0_960MHZ(0x0780, 960000, "0.960 MHz"),
+ RATE_1_200MHZ(0x0600, 1200000, "1.200 MHz"),
+ RATE_1_440MHZ(0x0500, 1440000, "1.440 MHz"),
+ RATE_1_920MHZ(0x03C0, 2016000, "2.016 MHz"),
+ RATE_2_304MHZ(0x0320, 2208000, "2.208 MHz"),
+ RATE_2_400MHZ(0x0300, 2400000, "2.400 MHz"),
+ RATE_2_880MHZ(0x0280, 2880000, "2.880 MHz");
+
+ private int mRatioHigh;
+ private int mRate;
+ private String mLabel;
+
+ private SampleRate(int ratioHigh,
+ int rate,
+ String label)
+ {
+ mRatioHigh = ratioHigh;
+ mRate = rate;
+ mLabel = label;
+ }
+
+ public int getRatioHighBits()
+ {
+ return mRatioHigh;
+ }
+
+ public int getRate()
+ {
+ return mRate;
+ }
+
+ public String getLabel()
+ {
+ return mLabel;
+ }
+
+ public String toString()
+ {
+ return mLabel;
+ }
+
+ /**
+ * Returns the sample rate that is equal to the argument or the next
+ * higher sample rate
+ *
+ * @param sampleRate
+ * @return
+ */
+ public static SampleRate getClosest(int sampleRate)
+ {
+ for(SampleRate rate : values())
+ {
+ if(rate.getRate() >= sampleRate)
+ {
+ return rate;
+ }
+ }
+
+ return DEFAULT_SAMPLE_RATE;
+ }
+ }
+
+ /**
+ * Adds a sample listener. If the buffer processing thread is
+ * not currently running, starts it running in a new thread.
+ */
+ public void addListener(Listener listener)
+ {
+ synchronized(mComplexBufferBroadcaster)
+ {
+ mComplexBufferBroadcaster.addListener(listener);
+
+ if(mBufferProcessor == null)
+ {
+ mBufferProcessor = new BufferProcessor();
+ }
+
+ if(!mBufferProcessor.isRunning())
+ {
+ Thread thread = new Thread(mBufferProcessor);
+ thread.setDaemon(true);
+ thread.setName("RTL2832 Sample Processor");
+
+ thread.start();
+ }
+ }
+ }
+
+ /**
+ * Removes the sample listener. If this is the last registered listener,
+ * shuts down the buffer processing thread.
+ */
+ public void removeListener(Listener listener)
+ {
+ synchronized(mComplexBufferBroadcaster)
+ {
+ mComplexBufferBroadcaster.removeListener(listener);
+
+ if(!mComplexBufferBroadcaster.hasListeners())
+ {
+ mBufferProcessor.stop();
+ }
+ }
+ }
+
+ /**
+ * Buffer processing thread. Fetches samples from the RTL2832 Tuner and
+ * dispatches them to all registered listeners
+ */
+ public class BufferProcessor implements Runnable, TransferCallback
+ {
+ private ScheduledFuture mSampleDispatcherTask;
+ private LinkedTransferQueue mAvailableTransfers;
+ private LinkedTransferQueue mTransfersInProgress = new LinkedTransferQueue<>();
+ private AtomicBoolean mRunning = new AtomicBoolean();
+ private ByteBuffer mLibUsbHandlerStatus;
+ private boolean mCancel = false;
+
+ public BufferProcessor()
+ {
+ }
+
+ @Override
+ public void run()
+ {
+ if(mRunning.compareAndSet(false, true))
+ {
+ try
+ {
+ setSampleRate(mSampleRate);
+
+ resetUSBBuffer();
+ }
+ catch(SourceException e)
+ {
+ mLog.error("couldn't start buffer processor", e);
+
+ mRunning.set(false);
+ }
+
+ prepareTransfers();
+
+ mSampleDispatcherTask = ThreadPool.SCHEDULED.scheduleAtFixedRate(new BufferDispatcher(),
+ 20, 20, TimeUnit.MILLISECONDS);
+
+ mLibUsbHandlerStatus = ByteBuffer.allocateDirect(4);
+
+ List transfers = new ArrayList<>();
+
+ mCancel = false;
+
+ while(mRunning.get())
+ {
+ mAvailableTransfers.drainTo(transfers);
+
+ for(Transfer transfer : transfers)
+ {
+ int result = LibUsb.submitTransfer(transfer);
+
+ if(result == LibUsb.SUCCESS)
+ {
+ mTransfersInProgress.add(transfer);
+ }
+ else
+ {
+ mLog.error("Error submitting transfer [" +
+ LibUsb.errorName(result) + "]");
+ }
+ }
+
+ int result = LibUsb.handleEventsTimeoutCompleted(
+ null, TIMEOUT_US, mLibUsbHandlerStatus.asIntBuffer());
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("error handling events for libusb");
+ }
+
+ transfers.clear();
+
+ mLibUsbHandlerStatus.rewind();
+ }
+
+ if(mCancel)
+ {
+ for(Transfer transfer : mTransfersInProgress)
+ {
+ LibUsb.cancelTransfer(transfer);
+ }
+
+ int result = LibUsb.handleEventsTimeoutCompleted(null,
+ TIMEOUT_US, mLibUsbHandlerStatus.asIntBuffer());
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mLog.error("error handling events for libusb during cancel");
+ }
+
+ mLibUsbHandlerStatus.rewind();
+ }
+ }
+ }
+
+ /**
+ * Stops the sample fetching thread
+ */
+ public void stop()
+ {
+ mCancel = true;
+
+ if(mRunning.compareAndSet(true, false))
+ {
+ if(mSampleDispatcherTask != null)
+ {
+ mSampleDispatcherTask.cancel(true);
+ mSampleDispatcherTask = null;
+ mFilledBuffers.clear();
+ }
+ }
+ }
+
+ /**
+ * Indicates if this thread is running
+ */
+ public boolean isRunning()
+ {
+ return mRunning.get();
+ }
+
+ @Override
+ public void processTransfer(Transfer transfer)
+ {
+ mTransfersInProgress.remove(transfer);
+
+ switch(transfer.status())
+ {
+ case LibUsb.TRANSFER_COMPLETED:
+ case LibUsb.TRANSFER_STALL:
+ if(transfer.actualLength() > 0)
+ {
+ ByteBuffer buffer = transfer.buffer();
+
+ byte[] data = new byte[transfer.actualLength()];
+
+ buffer.get(data);
+
+ buffer.rewind();
+
+ if(isRunning())
+ {
+ mFilledBuffers.add(data);
+ }
+ }
+ break;
+ case LibUsb.TRANSFER_CANCELLED:
+ break;
+ default:
/* unexpected error */
- mLog.error( "transfer error [" +
- getTransferStatus( transfer.status() ) +
- "] transferred actual: " + transfer.actualLength() );
- }
-
- mAvailableTransfers.add( transfer );
- }
-
- /**
- * Prepares (allocates) a set of transfer buffers for use in
- * transferring data from the tuner via the bulk interface
- */
- private void prepareTransfers() throws LibUsbException
- {
- if( mAvailableTransfers == null )
- {
- mAvailableTransfers = new LinkedTransferQueue<>();
-
- for( int x = 0; x < TRANSFER_BUFFER_POOL_SIZE; x++ )
- {
- Transfer transfer = LibUsb.allocTransfer();
+ mLog.error("transfer error [" +
+ getTransferStatus(transfer.status()) +
+ "] transferred actual: " + transfer.actualLength());
+ }
- if( transfer == null )
- {
- throw new LibUsbException( "couldn't allocate transfer",
- LibUsb.ERROR_NO_MEM );
- }
-
- final ByteBuffer buffer =
- ByteBuffer.allocateDirect( mBufferSize );
-
- LibUsb.fillBulkTransfer( transfer, mDeviceHandle, USB_BULK_ENDPOINT,
- buffer, BufferProcessor.this, "Buffer", TIMEOUT_US );
-
- mAvailableTransfers.add( transfer );
- }
- }
- }
- }
-
- /**
- * Fetches byte[] chunks from the raw sample buffer. Converts each byte
- * array and broadcasts the array to all registered listeners
- */
- public class BufferDispatcher implements Runnable
- {
- @Override
- public void run()
- {
- try
- {
- ArrayList buffers = new ArrayList();
-
- mFilledBuffers.drainTo( buffers );
-
- for( byte[] buffer: buffers )
- {
- float[] samples = mSampleAdapter.convert( buffer );
-
- mComplexBufferBroadcaster.broadcast( new ComplexBuffer( samples ) );
- }
- }
- catch( Exception e )
- {
- mLog.error( "error during rtl2832 buffer dispatcher run", e );
- }
+ mAvailableTransfers.add(transfer);
}
- }
-
- public static String getTransferStatus( int status )
- {
- switch( status )
- {
- case 0:
- return "TRANSFER COMPLETED (0)";
- case 1:
- return "TRANSFER ERROR (1)";
- case 2:
- return "TRANSFER TIMED OUT (2)";
- case 3:
- return "TRANSFER CANCELLED (3)";
- case 4:
- return "TRANSFER STALL (4)";
- case 5:
- return "TRANSFER NO DEVICE (5)";
- case 6:
- return "TRANSFER OVERFLOW (6)";
- default:
- return "UNKNOWN TRANSFER STATUS (" + status + ")";
- }
- }
-
-
- public class USBEventHandlingThread implements Runnable
- {
- /** If thread should abort. */
- private volatile boolean mAbort;
+ /**
+ * Prepares (allocates) a set of transfer buffers for use in
+ * transferring data from the tuner via the bulk interface
+ */
+ private void prepareTransfers() throws LibUsbException
+ {
+ if(mAvailableTransfers == null)
+ {
+ mAvailableTransfers = new LinkedTransferQueue<>();
- /**
- * Aborts the event handling thread.
- */
- public void abort()
- {
- mAbort = true;
- }
+ for(int x = 0; x < TRANSFER_BUFFER_POOL_SIZE; x++)
+ {
+ Transfer transfer = LibUsb.allocTransfer();
- @Override
- public void run()
- {
- while ( !mAbort )
- {
- int result = LibUsb.handleEventsTimeout( null, 1000 );
-
- if ( result != LibUsb.SUCCESS )
- {
- mAbort = true;
+ if(transfer == null)
+ {
+ throw new LibUsbException("couldn't allocate transfer",
+ LibUsb.ERROR_NO_MEM);
+ }
- mLog.error( "error handling usb events [" +
- LibUsb.errorName( result ) + "]" );
-
- throw new LibUsbException("Unable to handle USB "
- + "events", result );
- }
- }
- }
- }
+ final ByteBuffer buffer =
+ ByteBuffer.allocateDirect(mBufferSize);
- public enum TunerTypeCheck
- {
- E4K( 0xC8, 0x02, 0x40 ),
- FC0012( 0xC6, 0x00, 0xA1 ),
- FC0013( 0xC6, 0x00, 0xA3 ),
- FC2580( 0xAC, 0x01, 0x56 ),
- R820T( 0x34, 0x00, 0x69 ),
- R828D( 0x74, 0x00, 0x69 );
-
- private int mI2CAddress;
- private int mCheckAddress;
- private int mCheckValue;
-
- private TunerTypeCheck( int i2c, int address, int value )
- {
- mI2CAddress = i2c;
- mCheckAddress = address;
- mCheckValue = value;
- }
+ LibUsb.fillBulkTransfer(transfer, mDeviceHandle, USB_BULK_ENDPOINT,
+ buffer, BufferProcessor.this, "Buffer", TIMEOUT_US);
- public byte getI2CAddress()
- {
- return (byte)mI2CAddress;
- }
-
- public byte getCheckAddress()
- {
- return (byte)mCheckAddress;
- }
-
- public byte getCheckValue()
- {
- return (byte)mCheckValue;
- }
- }
-
-
- /**
- * Averages the sample rate over a 10-second period. The count is for the
- * number of bytes received from the tuner. There are two bytes for each
- * sample. So, we divide by 20 to get the average sample rate.
- */
- public class SampleRateMonitor implements Runnable
- {
- private static final int BUFFER_SIZE = 5;
- private int mTargetSampleRate;
- private int mSampleRateMinimum;
- private int mSampleRateMaximum;
- private int mNewTargetSampleRate;
- private FloatAveragingBuffer mRateErrorBuffer =
- new FloatAveragingBuffer( BUFFER_SIZE );
- private AtomicBoolean mRateChanged = new AtomicBoolean();
-
- public SampleRateMonitor( int sampleRate )
- {
- setTargetRate( sampleRate );
- }
-
- public void setSampleRate( int sampleRate )
- {
- mNewTargetSampleRate = sampleRate;
- mRateChanged.set( true );
- }
-
- private void setTargetRate( int rate )
- {
- mTargetSampleRate = rate;
- mSampleRateMinimum = (int)( (float)mTargetSampleRate * 0.95f );
- mSampleRateMaximum = (int)( (float)mTargetSampleRate * 1.05f );
+ mAvailableTransfers.add(transfer);
+ }
+ }
+ }
+ }
- for( int x = 0; x < BUFFER_SIZE; x++ )
- {
- mRateErrorBuffer.get( 0 );
- }
- }
-
- @Override
+ /**
+ * Fetches byte[] chunks from the raw sample buffer. Converts each byte
+ * array and broadcasts the array to all registered listeners
+ */
+ public class BufferDispatcher implements Runnable
+ {
+ @Override
public void run()
{
- if( mRateChanged.compareAndSet( true, false ) )
- {
- setTargetRate( mNewTargetSampleRate );
+ try
+ {
+ ArrayList buffers = new ArrayList();
+
+ mFilledBuffers.drainTo(buffers);
+
+ for(byte[] buffer : buffers)
+ {
+ float[] samples = mSampleAdapter.convert(buffer);
+
+ mComplexBufferBroadcaster.broadcast(new ComplexBuffer(samples));
+ }
+ }
+ catch(Exception e)
+ {
+ mLog.error("error during rtl2832 buffer dispatcher run", e);
+ }
+ }
+ }
+
+ public static String getTransferStatus(int status)
+ {
+ switch(status)
+ {
+ case 0:
+ return "TRANSFER COMPLETED (0)";
+ case 1:
+ return "TRANSFER ERROR (1)";
+ case 2:
+ return "TRANSFER TIMED OUT (2)";
+ case 3:
+ return "TRANSFER CANCELLED (3)";
+ case 4:
+ return "TRANSFER STALL (4)";
+ case 5:
+ return "TRANSFER NO DEVICE (5)";
+ case 6:
+ return "TRANSFER OVERFLOW (6)";
+ default:
+ return "UNKNOWN TRANSFER STATUS (" + status + ")";
+ }
+ }
+
+
+ public class USBEventHandlingThread implements Runnable
+ {
+ /**
+ * If thread should abort.
+ */
+ private volatile boolean mAbort;
+
+ /**
+ * Aborts the event handling thread.
+ */
+ public void abort()
+ {
+ mAbort = true;
+ }
+
+ @Override
+ public void run()
+ {
+ while(!mAbort)
+ {
+ int result = LibUsb.handleEventsTimeout(null, 1000);
+
+ if(result != LibUsb.SUCCESS)
+ {
+ mAbort = true;
+
+ mLog.error("error handling usb events [" +
+ LibUsb.errorName(result) + "]");
+
+ throw new LibUsbException("Unable to handle USB "
+ + "events", result);
+ }
+ }
+ }
+ }
+
+ public enum TunerTypeCheck
+ {
+ E4K(0xC8, 0x02, 0x40),
+ FC0012(0xC6, 0x00, 0xA1),
+ FC0013(0xC6, 0x00, 0xA3),
+ FC2580(0xAC, 0x01, 0x56),
+ R820T(0x34, 0x00, 0x69),
+ R828D(0x74, 0x00, 0x69);
+
+ private int mI2CAddress;
+ private int mCheckAddress;
+ private int mCheckValue;
+
+ private TunerTypeCheck(int i2c, int address, int value)
+ {
+ mI2CAddress = i2c;
+ mCheckAddress = address;
+ mCheckValue = value;
+ }
+
+ public byte getI2CAddress()
+ {
+ return (byte) mI2CAddress;
+ }
+
+ public byte getCheckAddress()
+ {
+ return (byte) mCheckAddress;
+ }
+
+ public byte getCheckValue()
+ {
+ return (byte) mCheckValue;
+ }
+ }
+
+
+ /**
+ * Averages the sample rate over a 10-second period. The count is for the
+ * number of bytes received from the tuner. There are two bytes for each
+ * sample. So, we divide by 20 to get the average sample rate.
+ */
+ public class SampleRateMonitor implements Runnable
+ {
+ private static final int BUFFER_SIZE = 5;
+ private int mTargetSampleRate;
+ private int mSampleRateMinimum;
+ private int mSampleRateMaximum;
+ private int mNewTargetSampleRate;
+ private FloatAveragingBuffer mRateErrorBuffer =
+ new FloatAveragingBuffer(BUFFER_SIZE);
+ private AtomicBoolean mRateChanged = new AtomicBoolean();
+
+ public SampleRateMonitor(int sampleRate)
+ {
+ setTargetRate(sampleRate);
+ }
+
+ public void setSampleRate(int sampleRate)
+ {
+ mNewTargetSampleRate = sampleRate;
+ mRateChanged.set(true);
+ }
+
+ private void setTargetRate(int rate)
+ {
+ mTargetSampleRate = rate;
+ mSampleRateMinimum = (int) ((float) mTargetSampleRate * 0.95f);
+ mSampleRateMaximum = (int) ((float) mTargetSampleRate * 1.05f);
+
+ for(int x = 0; x < BUFFER_SIZE; x++)
+ {
+ mRateErrorBuffer.get(0);
+ }
+ }
+
+ @Override
+ public void run()
+ {
+ if(mRateChanged.compareAndSet(true, false))
+ {
+ setTargetRate(mNewTargetSampleRate);
/* Reset the sample counter */
- mSampleCounter.set( 0 );
-
- mLog.info( "monitor reset for new sample rate [" + mTargetSampleRate + "]" );
- }
- else
- {
- int count = mSampleCounter.getAndSet( 0 );
-
- float current = (float)count / 20.0f;
+ mSampleCounter.set(0);
- /**
- * Only accept values +/- 5% of target rate
- */
- float average;
-
- if( mSampleRateMinimum < current && current < mSampleRateMaximum )
- {
- average = mRateErrorBuffer.get( (float)mTargetSampleRate - current );
- }
- else
- {
- average = mTargetSampleRate;
- }
-
- StringBuilder sb = new StringBuilder();
- sb.append( "[" );
- if( mDescriptor != null )
- {
- sb.append( mDescriptor.getSerial() );
- }
- else
- {
- sb.append( "DESCRIPTOR IS NULL" );
- }
- sb.append( "] sample rate current [" );
- sb.append( mDecimalFormatter.format( current ) );
- sb.append( " Hz " );
- sb.append( mPercentFormatter.format( 100.0f * ( current / (float)mTargetSampleRate ) ) );
- sb.append( "% ] error [" );
- sb.append( average );
- sb.append( " Hz ] target " );
- sb.append( mDecimalFormatter.format( mTargetSampleRate ) );
-
- mLog.info( sb.toString() );
- }
+ mLog.info("monitor reset for new sample rate [" + mTargetSampleRate + "]");
+ }
+ else
+ {
+ int count = mSampleCounter.getAndSet(0);
+
+ float current = (float) count / 20.0f;
+
+ /**
+ * Only accept values +/- 5% of target rate
+ */
+ float average;
+
+ if(mSampleRateMinimum < current && current < mSampleRateMaximum)
+ {
+ average = mRateErrorBuffer.get((float) mTargetSampleRate - current);
+ }
+ else
+ {
+ average = mTargetSampleRate;
+ }
+
+ StringBuilder sb = new StringBuilder();
+ sb.append("[");
+ if(mDescriptor != null)
+ {
+ sb.append(mDescriptor.getSerial());
+ }
+ else
+ {
+ sb.append("DESCRIPTOR IS NULL");
+ }
+ sb.append("] sample rate current [");
+ sb.append(mDecimalFormatter.format(current));
+ sb.append(" Hz ");
+ sb.append(mPercentFormatter.format(100.0f * (current / (float) mTargetSampleRate)));
+ sb.append("% ] error [");
+ sb.append(average);
+ sb.append(" Hz ] target ");
+ sb.append(mDecimalFormatter.format(mTargetSampleRate));
+
+ mLog.info(sb.toString());
+ }
}
- }
- /**
- * RTL2832 EEPROM byte array descriptor parsing class
- */
- public class Descriptor
- {
- private byte[] mData;
- private ArrayList mLabels = new ArrayList();
-
- public Descriptor( byte[] data )
- {
- if( data != null )
- {
- mData = data;
- }
- else
- {
- data = new byte[ 256 ];
- }
-
- getLabels();
- }
-
- public boolean isValid()
- {
- return mData[ 0 ] == (byte)0x28 &&
- mData[ 1 ] == (byte)0x32;
- }
-
- public String getVendorID()
- {
- int id = Integer.rotateLeft( ( 0xFF & mData[ 3] ), 8 ) |
- ( 0xFF & mData[ 2 ] );
+ }
- return String.format("%04X", id );
- }
-
- public String getVendorLabel()
- {
- return mLabels.get( 0 );
- }
-
- public String getProductID()
- {
- int id = Integer.rotateLeft( ( 0xFF & mData[ 5] ), 8 ) |
- ( 0xFF & mData[ 4 ] );
+ /**
+ * RTL2832 EEPROM byte array descriptor parsing class
+ */
+ public class Descriptor
+ {
+ private byte[] mData;
+ private ArrayList mLabels = new ArrayList();
- return String.format("%04X", id );
- }
-
- public String getProductLabel()
- {
- return mLabels.get( 1 );
- }
-
- public boolean hasSerial()
- {
- return mData[ 6 ] == (byte)0xA5;
- }
+ public Descriptor(byte[] data)
+ {
+ if(data != null)
+ {
+ mData = data;
+ }
+ else
+ {
+ data = new byte[256];
+ }
- public String getSerial()
- {
- return mLabels.get( 2 );
- }
-
- public boolean remoteWakeupEnabled()
- {
- byte mask = (byte)0x01;
-
- return ( mData[ 7 ] & mask ) == mask;
- }
-
- public boolean irEnabled()
- {
- byte mask = (byte)0x02;
-
- return ( mData[ 7 ] & mask ) == mask;
- }
+ getLabels();
+ }
- private void getLabels()
- {
- mLabels.clear();
-
- int start = 0x09;
-
- while( start < 256 )
- {
- start = getLabel( start );
- }
- }
-
- private int getLabel( int start )
- {
+ public boolean isValid()
+ {
+ return mData[0] == (byte) 0x28 &&
+ mData[1] == (byte) 0x32;
+ }
+
+ public String getVendorID()
+ {
+ int id = Integer.rotateLeft((0xFF & mData[3]), 8) |
+ (0xFF & mData[2]);
+
+ return String.format("%04X", id);
+ }
+
+ public String getVendorLabel()
+ {
+ return mLabels.get(0);
+ }
+
+ public String getProductID()
+ {
+ int id = Integer.rotateLeft((0xFF & mData[5]), 8) |
+ (0xFF & mData[4]);
+
+ return String.format("%04X", id);
+ }
+
+ public String getProductLabel()
+ {
+ return mLabels.get(1);
+ }
+
+ public boolean hasSerial()
+ {
+ return mData[6] == (byte) 0xA5;
+ }
+
+ public String getSerial()
+ {
+ return mLabels.get(2);
+ }
+
+ public boolean remoteWakeupEnabled()
+ {
+ byte mask = (byte) 0x01;
+
+ return (mData[7] & mask) == mask;
+ }
+
+ public boolean irEnabled()
+ {
+ byte mask = (byte) 0x02;
+
+ return (mData[7] & mask) == mask;
+ }
+
+ private void getLabels()
+ {
+ mLabels.clear();
+
+ int start = 0x09;
+
+ while(start < 256)
+ {
+ start = getLabel(start);
+ }
+ }
+
+ private int getLabel(int start)
+ {
/* Validate length and check second byte for ETX (0x03) */
- if( start > 254 || mData[ start + 1 ] != (byte)0x03 )
- {
- return 256;
- }
+ if(start > 254 || mData[start + 1] != (byte) 0x03)
+ {
+ return 256;
+ }
/* Get label length, including the length and ETX bytes */
- int length = 0xFF & mData[ start ];
+ int length = 0xFF & mData[start];
- if( start + length > 255 )
- {
- return 256;
- }
+ if(start + length > 255)
+ {
+ return 256;
+ }
/* Get the label bytes */
- byte[] data = Arrays.copyOfRange( mData, start + 2, start + length );
+ byte[] data = Arrays.copyOfRange(mData, start + 2, start + length);
/* Translate the bytes as UTF-16 Little Endian and store the label */
- String label = new String( data, Charset.forName( "UTF-16LE" ) );
-
- mLabels.add( label );
+ String label = new String(data, Charset.forName("UTF-16LE"));
- return start + length;
- }
-
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
- sb.append( "RTL-2832 EEPROM Descriptor\n" );
+ mLabels.add(label);
- sb.append( "Vendor: " );
- sb.append( getVendorID() );
- sb.append( " [" );
- sb.append( getVendorLabel() );
- sb.append( "]\n" );
+ return start + length;
+ }
- sb.append( "Product: " );
- sb.append( getProductID() );
- sb.append( " [" );
- sb.append( getProductLabel() );
- sb.append( "]\n" );
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append("RTL-2832 EEPROM Descriptor\n");
- sb.append( "Serial: " );
- if( hasSerial() )
- {
- sb.append( "yes [" );
- sb.append( getSerial() );
- sb.append( "]\n" );
- }
- else
- {
- sb.append( "no\n" );
- }
+ sb.append("Vendor: ");
+ sb.append(getVendorID());
+ sb.append(" [");
+ sb.append(getVendorLabel());
+ sb.append("]\n");
- sb.append( "Remote Wakeup Enabled: " );
- sb.append( ( remoteWakeupEnabled() ? "yes" : "no" ) );
- sb.append( "\n" );
+ sb.append("Product: ");
+ sb.append(getProductID());
+ sb.append(" [");
+ sb.append(getProductLabel());
+ sb.append("]\n");
- sb.append( "IR Enabled: " );
- sb.append( ( irEnabled() ? "yes" : "no" ) );
- sb.append( "\n" );
+ sb.append("Serial: ");
+ if(hasSerial())
+ {
+ sb.append("yes [");
+ sb.append(getSerial());
+ sb.append("]\n");
+ }
+ else
+ {
+ sb.append("no\n");
+ }
+
+ sb.append("Remote Wakeup Enabled: ");
+ sb.append((remoteWakeupEnabled() ? "yes" : "no"));
+ sb.append("\n");
+
+ sb.append("IR Enabled: ");
+ sb.append((irEnabled() ? "yes" : "no"));
+ sb.append("\n");
+
+ if(mLabels.size() > 3)
+ {
+ sb.append("Additional Labels: ");
+
+ for(int x = 3; x < mLabels.size(); x++)
+ {
+ sb.append(" [");
+ sb.append(mLabels.get(x));
+ sb.append("\n");
+ }
+ }
+
+ return sb.toString();
+ }
+ }
- if( mLabels.size() > 3 )
- {
- sb.append( "Additional Labels: " );
-
- for( int x = 3; x < mLabels.size(); x++ )
- {
- sb.append( " [" );
- sb.append( mLabels.get( x ) );
- sb.append( "\n" );
- }
- }
-
- return sb.toString();
- }
- }
-
}
diff --git a/src/source/tuner/rtl/e4k/E4KTunerController.java b/src/source/tuner/rtl/e4k/E4KTunerController.java
index 2a84405c..a04e1a42 100644
--- a/src/source/tuner/rtl/e4k/E4KTunerController.java
+++ b/src/source/tuner/rtl/e4k/E4KTunerController.java
@@ -1,26 +1,22 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see
- *
+ *
* Copyright (C) 2013 Mauro Carvalho Chehab
* Copyright (C) 2013 Steve Markgraf
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see , IFrequencyChangePr
//so we set it at 12.
private BlockingQueue mQueue = new ArrayBlockingQueue<>(12);
- private ScheduledExecutorService mScheduler = Executors
- .newScheduledThreadPool(1, new NamingThreadFactory("spectrum dft processor"));
+ private ScheduledFuture mProcessorTaskHandle;
public static final String FRAME_RATE_PROPERTY = "spectral.display.frame.rate";
@@ -184,38 +182,20 @@ public class DFTProcessor implements Listener, IFrequencyChangePr
public void start()
{
- /**
- * Reset the scheduler
- */
- mScheduler = Executors.newScheduledThreadPool(1, new NamingThreadFactory("spectrum dft"));
-
- /**
- * Schedule the DFT to run calculations at a fixed rate
- */
+ //Schedule the DFT to run calculations at a fixed rate
int initialDelay = 0;
int period = (int) (1000 / mFrameRate);
- TimeUnit unit = TimeUnit.MILLISECONDS;
- mScheduler.scheduleAtFixedRate(new DFTCalculationTask(),
- initialDelay, period, unit);
+ mProcessorTaskHandle = ThreadPool.SCHEDULED.scheduleAtFixedRate(new DFTCalculationTask(), initialDelay, period,
+ TimeUnit.MILLISECONDS);
}
public void stop()
{
- /**
- * Shutdown the scheduler and clear out any remaining tasks
- */
- try
+ //Cancel running DFT calculation task
+ if(mProcessorTaskHandle != null)
{
- mScheduler.shutdown();
-
- mScheduler.awaitTermination(100, TimeUnit.MILLISECONDS);
- }
- catch(InterruptedException e)
- {
- /* Do nothing ... we're shutting down */
-// mLog.error( "DFTProcessor - exception while awaiting shutdown of "
-// + "calculation scheduler for reset", e );
+ mProcessorTaskHandle.cancel(true);
}
}
diff --git a/src/util/ThreadPool.java b/src/util/ThreadPool.java
new file mode 100644
index 00000000..5b8f4ebf
--- /dev/null
+++ b/src/util/ThreadPool.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see