#2600 LimeSDR support

build.gradle

@@ -124,16 +124,20 @@ dependencies {
     implementation 'com.mpatric:mp3agic:0.9.1'
     implementation 'commons-io:commons-io:2.22.0'
     implementation 'eu.hansolo:charts:1.0.5'
-    implementation 'io.github.dsheirer:jairspy:1.0.12.1' //Airspy tuners - GitHub release, see settings.gradle
-    implementation 'io.github.dsheirer:jairspyhf:1.8.1.1' //Airspy HF+ tuners - GitHub release, see settings.gradle
-    implementation 'io.github.dsheirer:jbladerf:2.6.0.1' //bladeRF tuners - GitHub release, see settings.gradle
-    implementation 'io.github.dsheirer:jhackrf:2026.01.3.1' //HackRF tuners - GitHub release, see settings.gradle
-    implementation 'io.github.dsheirer:jlibusb:1.0.30.1' //libusb and USB hotplug for the tuner libraries - GitHub release; not pulled in transitively
-    implementation 'io.github.dsheirer:jhydrasdr:1.1.4.1' //HydraSDR tuners - GitHub release, see settings.gradle
-    implementation 'io.github.dsheirer:jlimesdr:25.1.0.2' //LimeSDR tuners - GitHub release, see settings.gradle
-    implementation 'io.github.dsheirer:jrtl:1.4.0.2' //RTL-SDR tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jairspy:1.0.12' //Airspy tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jairspyhf:1.8.1' //Airspy HF+ tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jbladerf:2.6.0' //bladeRF tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jhackrf:2026.01.3' //HackRF tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jhydrasdr:1.1.4' //HydraSDR tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jlimesdr:25.1.0.1' //LimeSDR tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jrtl:1.4.0.1' //RTL-SDR tuners - GitHub release, see settings.gradle
     implementation 'io.github.dsheirer:jsdrplay:3.15.3' //SDRplay RSP tuners - GitHub release, see settings.gradle
     implementation 'io.github.dsheirer:radio-reference-api:18.0.0'
+    implementation 'io.github.dsheirer:usb4java-native-libraries:1.3.3' //OSX & Windows aarch64 native libs
+    implementation('io.github.dsheirer:usb4java:1.3.5') { //Fork with Loader support for OSX Multi-Version
+        //Excludes the javax.usb API and the duplicate original usb4java classes.  The native libraries are listed below.
+        exclude group: 'org.usb4java', module: 'usb4java-javax'
+    }
     implementation 'net.coderazzi:tablefilter-swing:5.5.4'
     implementation 'org.apache.commons:commons-compress:1.28.0'
     implementation 'org.apache.commons:commons-lang3:3.20.0'
@@ -144,6 +148,13 @@ dependencies {
     implementation 'org.controlsfx:controlsfx:11.2.3'
     implementation 'org.rauschig:jarchivelib:1.2.0'
     implementation 'org.slf4j:slf4j-api:2.0.17'
+    implementation 'org.usb4java:libusb4java:1.3.0:darwin-x86-64' //usb4java native library
+    implementation 'org.usb4java:libusb4java:1.3.0:linux-aarch64' //usb4java native library
+    implementation 'org.usb4java:libusb4java:1.3.0:linux-arm' //usb4java native library
+    implementation 'org.usb4java:libusb4java:1.3.0:linux-x86' //usb4java native library
+    implementation 'org.usb4java:libusb4java:1.3.0:linux-x86-64' //usb4java native library
+    implementation 'org.usb4java:libusb4java:1.3.0:win32-x86' //usb4java native library
+    implementation 'org.usb4java:libusb4java:1.3.0:win32-x86-64' //usb4java native library
     implementation 'pl.edu.icm:JLargeArrays:1.6'
 }
 

gradle.properties

@@ -28,4 +28,4 @@
 # tag name, specifically the dashes inserted before and after the alpha/beta labels.
 # See: https://github.com/DSheirer/sdrtrunk/issues/1651
 
-projectVersion=1.0.0-beta-1
+projectVersion=0.6.2-beta-1

settings.gradle

@@ -33,15 +33,6 @@ dependencyResolutionManagement {
             content { includeModule 'io.github.dsheirer', 'jrtl' }
         }
 
-        //jlibusb is published as a GitHub release, with libusb for all platforms in the jar.  Tuner libraries built on
-        //jlibusb (jAirspy, jAirspyHF, jBladeRF, jHackRF, jHydraSDR, jLimeSDR, jRTL) load their native library next to its libusb, so the process shares one copy.
-        ivy {
-            url = 'https://github.com/DSheirer/jlibusb/releases/download'
-            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
-            metadataSources { artifact() }
-            content { includeModule 'io.github.dsheirer', 'jlibusb' }
-        }
-
         //jHackRF is published as a GitHub release, with the native libraries for all platforms in the jar
         ivy {
             url = 'https://github.com/DSheirer/jHackRF/releases/download'

src/main/java/io/github/dsheirer/dsp/c4fm/C4FMSymbolProcessor.java

@@ -257,20 +257,6 @@ public abstract class C4FMSymbolProcessor
         return true;
     }
 
-    /**
-     * Maximum bit errors allowed in a detected sync pattern while acquiring (ie not synchronized), measured from the
-     * symbol decisions at the optimized symbol timing.  Sync detections with more bit errors are rejected.  Bit errors
-     * include symbol magnitude (ie +3 vs +1) errors, so this rejects noise where the symbol signs correlate with the
-     * sync pattern but the symbol magnitudes are inconsistent.  Once synchronized, the limit isn't applied since the
-     * sync detection timing is known and rejecting a valid sync detection costs the burst.  Default implementation
-     * imposes no limit.
-     * @return maximum sync pattern bit error count while acquiring.
-     */
-    public int getSyncAcquisitionMaxBitErrors()
-    {
-        return Integer.MAX_VALUE;
-    }
-
     /**
      * Number of consecutive sync periods (capped at 3) where a sync was detected within the max message length.
      */
@@ -959,14 +945,12 @@ public abstract class C4FMSymbolProcessor
         }
 
         /**
-         * Indicates if the optimization score is high quality and, while acquiring, the sync pattern bit errors don't
-         * exceed the max.
+         * Indicates if this correction has a valid NID or the optimization (or detection) score is high quality.
          * @return true if valid.
          */
         public boolean isValid()
         {
-            return mOptimizationScore > getSyncThresholdEqualized() &&
-                    (mSynchronized || mCorrectedBitCount <= getSyncAcquisitionMaxBitErrors());
+            return mOptimizationScore > getSyncThresholdEqualized();
         }
     }
 

src/main/java/io/github/dsheirer/gui/control/JFrequencyControl.java

@@ -45,7 +45,6 @@ import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
 /**
@@ -576,17 +575,7 @@ public class JFrequencyControl extends JPanel implements ISourceEventProcessor
             @Override
             public void mouseWheelMoved(MouseWheelEvent e)
             {
-                //Swing delivers mouse wheel events to disabled components, so check enabled state explicitly so that
-                //the wheel can't bypass the lock when the tuner is providing channels.
-                if(isEnabled())
-                {
-                    set(mValue - e.getWheelRotation());
-                }
-                else if(getParent() != null)
-                {
-                    //Pass the event up so that an enclosing scroll pane can still scroll while this control is locked
-                    getParent().dispatchEvent(SwingUtilities.convertMouseEvent(Digit.this, e, getParent()));
-                }
+                set(mValue - e.getWheelRotation());
             }
         }
     }

src/main/java/io/github/dsheirer/gui/playlist/streaming/AbstractBroadcastEditor.java

@@ -23,7 +23,6 @@ import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
 import io.github.dsheirer.audio.broadcast.BroadcastEvent;
 import io.github.dsheirer.audio.broadcast.BroadcastServerType;
 import io.github.dsheirer.gui.control.AccessibleToggleSwitch;
-import io.github.dsheirer.gui.control.IntegerTextField;
 import io.github.dsheirer.gui.playlist.Editor;
 import io.github.dsheirer.playlist.PlaylistManager;
 import javafx.application.Platform;
@@ -69,26 +68,6 @@ public abstract class AbstractBroadcastEditor<T extends BroadcastConfiguration>
         buttonBox.setSpacing(10);
         buttonBox.getChildren().addAll(getSaveButton(), getResetButton());
 
-        /**
-         * Allow column 1 (Primary input fields) to expand with editor width
-         */
-        for(Node node : getEditorPane().getChildren())
-        {
-            Integer column = GridPane.getColumnIndex(node);
-
-            if(column != null && column == 1)
-            {
-                if(node instanceof IntegerTextField)
-                {
-                    GridPane.setFillWidth(node, false);
-                }
-                else if(node instanceof TextField)
-                {
-                    GridPane.setHgrow(node, Priority.ALWAYS);
-                }
-            }
-        }
-
         HBox editorBox = new HBox();
         HBox.setHgrow(getEditorPane(), Priority.ALWAYS);
         editorBox.getChildren().addAll(getEditorPane(), buttonBox);

src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java

@@ -298,10 +298,7 @@ public class DMRDecoderState extends TimeslotDecoderState
         {
             if(message instanceof VoiceMessage voice)
             {
-                if(isValid(voice))
-                {
-                    processVoice(voice);
-                }
+                processVoice(voice);
             }
             else if(message instanceof DataMessage data)
             {

src/main/java/io/github/dsheirer/module/decode/dmr/DMRSymbolProcessor.java

@@ -66,12 +66,6 @@ public class DMRSymbolProcessor extends C4FMSymbolProcessor
     private static final float SYNC_THRESHOLD_EQUALIZED = 70;
     //Once synchronized, sync detections are only allowed within this many symbols of a burst boundary.
     private static final int SYNC_WINDOW_SYMBOLS = 2;
-    //Maximum bit errors (of 48) in a detected sync pattern while acquiring.  Testing: all false sync detections in
-    //600 seconds of noise occurred while acquiring, with 7+ (mostly 12+) bit errors, and a max of 8 eliminated them
-    //(245 bursts to 0) at a cost of < 0.6% valid data bursts on clean recordings and 0.3 - 5.5% on multipath
-    //recordings with injected noise, where valid link control improved.  A max of 10 leaks noise false syncs and 6
-    //costs more multipath data bursts.  Applying the max once synchronized cost 3 - 20% of valid bursts.
-    private static final int SYNC_ACQUISITION_MAX_BIT_ERRORS = 8;
     private final DMRSyncModeMonitor mSyncModeMonitor = new DMRSyncModeMonitor();
     private final DMRMessageFramer mMessageFramer;
 
@@ -148,12 +142,6 @@ public class DMRSymbolProcessor extends C4FMSymbolProcessor
         return Math.min(offset, BURST_DIBIT_LENGTH - offset) <= SYNC_WINDOW_SYMBOLS;
     }
 
-    @Override
-    public int getSyncAcquisitionMaxBitErrors()
-    {
-        return SYNC_ACQUISITION_MAX_BIT_ERRORS;
-    }
-
     @Override
     public boolean isDynamicBalanceTrackingRequired()
     {

src/main/java/io/github/dsheirer/module/decode/dmr/audio/DMRAudioModule.java

@@ -105,13 +105,6 @@ public class DMRAudioModule extends AmbeAudioModule implements IdentifierUpdateP
     {
         if(hasAudioCodec() && message.getTimeslot() == getTimeslot())
         {
-            //Ignore voice messages where none of the AMBE voice frames pass error detection, so that invalid voice
-            //messages (ie false sync detections) don't produce audio or establish the encryption state.
-            if(message instanceof VoiceMessage voiceMessage && !voiceMessage.isValid())
-            {
-                return;
-            }
-
             //Attempt to set the audio encryption state from certain types of messages
             if(!mEncryptedCallStateEstablished)
             {

src/main/java/io/github/dsheirer/module/decode/dmr/message/voice/AMBEFrameValidator.java

@@ -1,207 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 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 <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.module.decode.dmr.message.voice;
-
-import io.github.dsheirer.bits.BinaryMessage;
-
-/**
- * Error detection for the three AMBE+2 (3600 x 2450) voice frames carried in a DMR voice burst.
- *
- * Each 72-bit voice frame carries an extended Golay(24,12) protected C0 vector and a Golay(23,12) protected C1 vector
- * that is scrambled with a pseudo-random sequence seeded by the 12 data bits of C0.  The C2 and C3 vectors are not
- * protected.  Golay(23,12) is a perfect code where every 23-bit word decodes to a codeword within 3 bit errors, so a
- * frame is only considered valid when the combined C0 and C1 error count is low, which random (ie noise) bits rarely
- * achieve.
- *
- * Vector bit indices and the C1 scrambling sequence are from the JMBE AMBEFrame decoder.  Burst bit indices of each
- * voice frame match VoiceMessage.getAMBEFrames(): frames 1 and 3 are contiguous and frame 2 is split around the 48-bit
- * sync/embedded signalling field in the middle of the burst.
- */
-public class AMBEFrameValidator
-{
-    /**
-     * Maximum combined C0 and C1 bit errors for a valid voice frame.  Random 47-bit sequences have a combined error
-     * count of 2 or less with a probability of ~1.3e-4.
-     */
-    public static final int MAX_ERRORS = 2;
-
-    private static final int[] VECTOR_C0 = {0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 64, 68, 1, 5,
-            9, 13, 17, 21};
-    private static final int[] VECTOR_C1 = {25, 29, 33, 37, 41, 45, 49, 53, 57, 61, 65, 69, 2, 6, 10, 14, 18, 22, 26,
-            30, 34, 38, 42};
-    private static final int[] FRAME_OFFSETS = {24, 96, 216};
-    private static final int GOLAY_23_GENERATOR = 0xC75;
-    private static final int[][] C0_INDICES = new int[3][VECTOR_C0.length];
-    private static final int[][] C1_INDICES = new int[3][VECTOR_C1.length];
-    //Minimum weight error pattern for each Golay(23,12) syndrome (perfect code: all syndromes have weight <= 3)
-    private static final int[] ERROR_PATTERNS = new int[2048];
-    //C1 descrambling sequence for each 12-bit C0 data (u0) seed value, MSB first
-    private static final int[] SCRAMBLE_SEQUENCES = new int[4096];
-
-    static
-    {
-        for(int frame = 0; frame < 3; frame++)
-        {
-            for(int x = 0; x < VECTOR_C0.length; x++)
-            {
-                C0_INDICES[frame][x] = getBurstIndex(frame, VECTOR_C0[x]);
-            }
-
-            for(int x = 0; x < VECTOR_C1.length; x++)
-            {
-                C1_INDICES[frame][x] = getBurstIndex(frame, VECTOR_C1[x]);
-            }
-        }
-
-        //Golay(23,12) is perfect: the 2048 error patterns of weight 0 - 3 map one-to-one onto the 2048 syndromes.
-        for(int i = 0; i < 23; i++)
-        {
-            ERROR_PATTERNS[getSyndrome(1 << i)] = 1 << i;
-
-            for(int j = i + 1; j < 23; j++)
-            {
-                ERROR_PATTERNS[getSyndrome((1 << i) | (1 << j))] = (1 << i) | (1 << j);
-
-                for(int k = j + 1; k < 23; k++)
-                {
-                    int pattern = (1 << i) | (1 << j) | (1 << k);
-                    ERROR_PATTERNS[getSyndrome(pattern)] = pattern;
-                }
-            }
-        }
-
-        for(int seed = 0; seed < 4096; seed++)
-        {
-            int pr = 16 * seed;
-            int sequence = 0;
-
-            for(int x = 0; x < 23; x++)
-            {
-                pr = (173 * pr + 13849) % 65536;
-                sequence = (sequence << 1) | (pr >= 32768 ? 1 : 0);
-            }
-
-            SCRAMBLE_SEQUENCES[seed] = sequence;
-        }
-    }
-
-    private AMBEFrameValidator()
-    {
-    }
-
-    /**
-     * Burst bit index for the voice frame bit index.
-     * @param frame index 0-2
-     * @param bit index 0-71 within the (interleaved) voice frame
-     * @return bit index within the 288-bit burst
-     */
-    private static int getBurstIndex(int frame, int bit)
-    {
-        //Frame 2 is split around the 48-bit sync/embedded signalling field (burst bits 132 - 179)
-        if(frame == 1 && bit >= 36)
-        {
-            return FRAME_OFFSETS[frame] + bit + 48;
-        }
-
-        return FRAME_OFFSETS[frame] + bit;
-    }
-
-    /**
-     * Golay(23,12) syndrome for the 23-bit word where the MSB (bit 22) is the first codeword bit.
-     */
-    private static int getSyndrome(int word)
-    {
-        for(int bit = 22; bit >= 11; bit--)
-        {
-            if((word & (1 << bit)) != 0)
-            {
-                word ^= GOLAY_23_GENERATOR << (bit - 11);
-            }
-        }
-
-        return word;
-    }
-
-    /**
-     * Extracts the indexed bits from the message as an integer value, with the first index as the MSB.
-     */
-    private static int getValue(BinaryMessage message, int[] indices)
-    {
-        int value = 0;
-
-        for(int index : indices)
-        {
-            value = (value << 1) | (message.get(index) ? 1 : 0);
-        }
-
-        return value;
-    }
-
-    /**
-     * Combined C0 and C1 bit error count for the voice frame, where C0 is decoded first so that the corrected C0 data
-     * bits can seed the C1 descrambling sequence.  C0 errors include the extended Golay parity bit, so an even weight
-     * C0 error pattern (ie 4 errors) that Golay(23,12) mis-corrects is counted as 4 errors.
-     * @param message containing the 288-bit voice burst
-     * @param frame index 0-2
-     * @return combined C0 and C1 bit error count.
-     */
-    public static int getErrorCount(BinaryMessage message, int frame)
-    {
-        int c0 = getValue(message, C0_INDICES[frame]);
-        int golay = c0 >>> 1;
-        int pattern = ERROR_PATTERNS[getSyndrome(golay)];
-        int corrected = golay ^ pattern;
-        int errors = Integer.bitCount(pattern);
-
-        //Extended Golay(24,12) parity bit provides even parity across the 24-bit codeword
-        if(((Integer.bitCount(corrected) + (c0 & 1)) & 1) != 0)
-        {
-            errors++;
-        }
-
-        //Short circuit when C0 alone exceeds the max error count.
-        if(errors > MAX_ERRORS)
-        {
-            return errors;
-        }
-
-        int c1 = getValue(message, C1_INDICES[frame]) ^ SCRAMBLE_SEQUENCES[corrected >>> 11];
-        return errors + Integer.bitCount(ERROR_PATTERNS[getSyndrome(c1)]);
-    }
-
-    /**
-     * Indicates if at least one of the three voice frames in the burst is valid, checking each frame in turn until a
-     * valid frame is found.
-     * @param message containing the 288-bit voice burst
-     * @return true if at least one voice frame has a combined C0 and C1 error count within the max error count.
-     */
-    public static boolean isValid(BinaryMessage message)
-    {
-        for(int frame = 0; frame < 3; frame++)
-        {
-            if(getErrorCount(message, frame) <= MAX_ERRORS)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}

src/main/java/io/github/dsheirer/module/decode/dmr/message/voice/VoiceMessage.java

@@ -40,10 +40,9 @@ public abstract class VoiceMessage extends DMRBurst
     public static int[] FRAME_1_IV_FRAGMENT = new int[]{95, 91, 87, 83};
     public static int[] FRAME_2_IV_FRAGMENT = new int[]{215, 211, 207, 203};
     public static int[] FRAME_3_IV_FRAGMENT = new int[]{287, 283, 279, 275};
-    private Boolean mValid;
 
     /**
-     * DMR message frame.  This message comprises a 24-bit prefix and a 264-bit message frame.  Outbound base
+     * DMR message frame.  This message is comprised of a 24-bit prefix and a 264-bit message frame.  Outbound base
      * station frames transmit a Common Announcement Channel (CACH) in the 24-bit prefix, whereas Mobile inbound frames
      * do not use the 24-bit prefix.
      *
@@ -74,8 +73,8 @@ public abstract class VoiceMessage extends DMRBurst
         {
             frame_2[i] = getMessage().getByte(96 + i * 8);
         }
-        // 4 bits and 4 bits.  Note: mask the shifted (signed) byte to prevent sign extension into the upper 4 bits.
-        frame_2[4] = (byte)((getMessage().getByte(128) & 0xF0) | ((getMessage().getByte(180) >> 4) & 0x0F));
+        // 4 bits and 4 bits
+        frame_2[4] = (byte)((getMessage().getByte(128) & 0xF0) | (getMessage().getByte(180) >> 4));
         // copy last 4 byte
         for(int i = 0; i < 4; i++)
         {
@@ -110,20 +109,10 @@ public abstract class VoiceMessage extends DMRBurst
         return fragments;
     }
 
-    /**
-     * Indicates if the voice burst is valid, meaning that at least one of the three AMBE voice frames passes error
-     * detection (see AMBEFrameValidator).  Frames are checked in turn until a valid frame is found and the result is
-     * cached.
-     */
     @Override
     public boolean isValid()
     {
-        if(mValid == null)
-        {
-            mValid = AMBEFrameValidator.isValid(getMessage());
-        }
-
-        return mValid;
+        return true;
     }
 
     @Override

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java

@@ -101,6 +101,7 @@ import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCIn
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCMessageUpdate;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCMotorolaGroupRegroupChannelGrant;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCNetworkStatusBroadcast;
+import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCProtectionParameterBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCRFSSStatusBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCStatusUpdate;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCTelephoneInterconnectChannelGrant;
@@ -598,7 +599,6 @@ public class P25P1DecoderState extends DecoderState implements IChannelEventList
 
                 //Network configuration messages
                 case OSP_ADJACENT_STATUS_BROADCAST:
-                case OSP_ADJACENT_STATUS_BROADCAST_UNCOORDINATED_BAND_PLAN:
                     mNetworkConfigurationMonitor.process(ambtc);
                     break;
                 case OSP_NETWORK_STATUS_BROADCAST:
@@ -678,6 +678,14 @@ public class P25P1DecoderState extends DecoderState implements IChannelEventList
                                 mu.getShortDataMessage());
                     }
                     break;
+                case OSP_ADJACENT_STATUS_BROADCAST_UNCOORDINATED_BAND_PLAN:
+                    if(ambtc instanceof AMBTCProtectionParameterBroadcast ppb)
+                    {
+                        broadcastEvent(ambtc, DecodeEventType.RESPONSE, "USE ENCRYPTION " + ppb.getEncryptionKey() +
+                                " OUTBOUND MI:" + ppb.getOutboundMessageIndicator() +
+                                " INBOUND MI:" + ppb.getInboundMessageIndicator());
+                    }
+                    break;
                 case OSP_ROAMING_ADDRESS_UPDATE:
                     broadcastEvent(ambtc.getIdentifiers(), ambtc.getTimestamp(), DecodeEventType.RESPONSE,
                             "ROAMING ADDRESS UPDATE");

src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1NetworkConfigurationMonitor.java

@@ -35,7 +35,6 @@ import io.github.dsheirer.module.decode.p25.phase1.message.lc.standard.LCSeconda
 import io.github.dsheirer.module.decode.p25.phase1.message.lc.standard.LCSystemServiceBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCAdjacentStatusBroadcast;
-import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCAdjacentStatusBroadcastUncoordinated;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCNetworkStatusBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCRFSSStatusBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.TSBKMessage;
@@ -199,7 +198,6 @@ public class P25P1NetworkConfigurationMonitor
         switch(ambtc.getHeader().getOpcode())
         {
             case OSP_ADJACENT_STATUS_BROADCAST:
-            case OSP_ADJACENT_STATUS_BROADCAST_UNCOORDINATED_BAND_PLAN:
                 if(ambtc instanceof AMBTCAdjacentStatusBroadcast)
                 {
                     AMBTCAdjacentStatusBroadcast aasb = (AMBTCAdjacentStatusBroadcast)ambtc;
@@ -504,24 +502,14 @@ public class P25P1NetworkConfigurationMonitor
                         if(mAMBTCNeighborSites.containsKey(site))
                         {
                             AMBTCAdjacentStatusBroadcast ambtc = mAMBTCNeighborSites.get(site);
-                            sb.append("  ");
-                            if(ambtc instanceof AMBTCAdjacentStatusBroadcastUncoordinated unc)
-                            {
-                                sb.append("WACN:").append(unc.getWacn()).append(" ");
-                            }
-                            sb.append("SYSTEM:").append(format(ambtc.getSystem(), 3));
+                            sb.append("  SYSTEM:").append(format(ambtc.getSystem(), 3));
                             sb.append(" NAC:").append(format(ambtc.getNAC(), 3));
                             sb.append(" RFSS:").append(format(ambtc.getRfss(), 2));
                             sb.append(" SITE:").append(format(ambtc.getSite(), 2));
                             sb.append(" LRA:").append(format(ambtc.getLocationRegistrationArea(), 2));
                             sb.append(" CHANNEL:").append(ambtc.getChannel());
                             sb.append(" DOWNLINK:").append(ambtc.getChannel().getDownlinkFrequency());
-                            sb.append(" UPLINK:").append(ambtc.getChannel().getUplinkFrequency());
-                            if(ambtc instanceof AMBTCAdjacentStatusBroadcastUncoordinated unc)
-                            {
-                                sb.append(" SERVICES:").append(unc.getSystemServiceClass());
-                            }
-                            sb.append("\n");
+                            sb.append(" UPLINK:").append(ambtc.getChannel().getUplinkFrequency()).append("\n");
                         }
                         if(mLCNeighborSites.containsKey(site))
                         {

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/PDUMessageFactory.java

@@ -37,7 +37,6 @@ import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp.AMBTCUn
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp.AMBTCUnitToUnitAnswerResponse;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.isp.AMBTCUnitToUnitVoiceServiceRequest;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCAdjacentStatusBroadcast;
-import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCAdjacentStatusBroadcastUncoordinated;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCCallAlert;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCFrequencyBandUpdateTDMA;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCGroupAffiliationQuery;
@@ -48,6 +47,7 @@ import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCIn
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCMessageUpdate;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCMotorolaGroupRegroupChannelGrant;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCNetworkStatusBroadcast;
+import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCProtectionParameterBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCRFSSStatusBroadcast;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCRoamingAddressResponse;
 import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp.AMBTCRoamingAddressUpdate;
@@ -337,7 +337,7 @@ public class PDUMessageFactory
             case OSP_NETWORK_STATUS_BROADCAST:
                 return new AMBTCNetworkStatusBroadcast(pduSequence, nac, timestamp);
             case OSP_ADJACENT_STATUS_BROADCAST_UNCOORDINATED_BAND_PLAN:
-                return new AMBTCAdjacentStatusBroadcastUncoordinated(pduSequence, nac, timestamp);
+                return new AMBTCProtectionParameterBroadcast(pduSequence, nac, timestamp);
             case OSP_RFSS_STATUS_BROADCAST:
                 return new AMBTCRFSSStatusBroadcast(pduSequence, nac, timestamp);
             case OSP_ROAMING_ADDRESS_UPDATE:

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCAdjacentStatusBroadcastUncoordinated.java

@@ -1,146 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 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 <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp;
-
-import io.github.dsheirer.channel.IBandChannelDescriptor;
-import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.APCO25Wacn;
-import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
-import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25ExplicitChannel;
-import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence;
-import io.github.dsheirer.module.decode.p25.phase1.message.pdu.block.UnconfirmedDataBlock;
-import io.github.dsheirer.module.decode.p25.reference.SystemServiceClass;
-
-/**
- * Adjacent Status Broadcast - Uncoordinated Band Plan (opcode 0x3E), extended/multi-block (AMBTC) format.
- *
- * Announces a neighbor site that may belong to a different WACN/system (and band plan) than the current site.
- * Opcode 0x3E was previously defined as Protection Parameter Broadcast; current TIA-102.AABC revisions reassign it.
- *
- * Header: LRA (24-31), flags (32-35), SYSTEM (36-47), RFSS (64-71), SITE (72-79)  -- same as opcode 0x3C
- * Block 0: TRANSMIT CHANNEL (0-15), RECEIVE CHANNEL (16-31), SYSTEM SERVICE CLASS (32-39), WACN (40-59)
- *
- * A receive channel of 0xFFFF indicates that no separate receive channel is specified.
- */
-public class AMBTCAdjacentStatusBroadcastUncoordinated extends AMBTCAdjacentStatusBroadcast
-{
-    private static final int[] BLOCK_0_DOWNLINK_FREQUENCY_BAND = {0, 1, 2, 3};
-    private static final int[] BLOCK_0_DOWNLINK_CHANNEL_NUMBER = {4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    private static final int[] BLOCK_0_UPLINK_CHANNEL = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
-    private static final int[] BLOCK_0_UPLINK_FREQUENCY_BAND = {16, 17, 18, 19};
-    private static final int[] BLOCK_0_UPLINK_CHANNEL_NUMBER = {20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
-    private static final int[] BLOCK_0_SYSTEM_SERVICE_CLASS = {32, 33, 34, 35, 36, 37, 38, 39};
-    private static final int[] BLOCK_0_WACN = {40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
-        58, 59};
-    private static final int UNSPECIFIED_CHANNEL = 0xFFFF;
-
-    private IBandChannelDescriptor mChannel;
-    private Identifier mWacn;
-    private SystemServiceClass mSystemServiceClass;
-
-    public AMBTCAdjacentStatusBroadcastUncoordinated(PDUSequence PDUSequence, int nac, long timestamp)
-    {
-        super(PDUSequence, nac, timestamp);
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getMessageStub());
-        sb.append(" WACN:").append(getWacn());
-        sb.append(" SYSTEM:").append(getSystem());
-        sb.append(" LRA:").append(getLocationRegistrationArea());
-        sb.append(" RFSS:").append(getRfss());
-        sb.append(" SITE:").append(getSite());
-        sb.append(" CHANNEL:").append(getChannel());
-        sb.append(" SERVICES:").append(getSystemServiceClass());
-        return sb.toString();
-    }
-
-    /**
-     * WACN of the neighbor site
-     */
-    public Identifier getWacn()
-    {
-        if(mWacn == null && hasDataBlock(0))
-        {
-            mWacn = APCO25Wacn.create(getDataBlock(0).getMessage().getInt(BLOCK_0_WACN));
-        }
-
-        return mWacn;
-    }
-
-    /**
-     * Services offered by the neighbor site
-     */
-    public SystemServiceClass getSystemServiceClass()
-    {
-        if(mSystemServiceClass == null)
-        {
-            mSystemServiceClass = new SystemServiceClass(hasDataBlock(0) ?
-                getDataBlock(0).getMessage().getInt(BLOCK_0_SYSTEM_SERVICE_CLASS) : 0);
-        }
-
-        return mSystemServiceClass;
-    }
-
-    private boolean hasUplinkChannel()
-    {
-        return hasDataBlock(0) && getDataBlock(0).getMessage().getInt(BLOCK_0_UPLINK_CHANNEL) != UNSPECIFIED_CHANNEL;
-    }
-
-    @Override
-    public boolean isExtendedChannel()
-    {
-        return hasUplinkChannel() && super.isExtendedChannel();
-    }
-
-    @Override
-    public IBandChannelDescriptor getChannel()
-    {
-        if(mChannel == null)
-        {
-            if(hasDataBlock(0))
-            {
-                UnconfirmedDataBlock block = getDataBlock(0);
-
-                if(isExtendedChannel())
-                {
-                    mChannel = APCO25ExplicitChannel.create(block.getMessage().getInt(BLOCK_0_DOWNLINK_FREQUENCY_BAND),
-                        block.getMessage().getInt(BLOCK_0_DOWNLINK_CHANNEL_NUMBER),
-                        block.getMessage().getInt(BLOCK_0_UPLINK_FREQUENCY_BAND),
-                        block.getMessage().getInt(BLOCK_0_UPLINK_CHANNEL_NUMBER));
-                }
-                else
-                {
-                    mChannel = APCO25Channel.create(block.getMessage().getInt(BLOCK_0_DOWNLINK_FREQUENCY_BAND),
-                        block.getMessage().getInt(BLOCK_0_DOWNLINK_CHANNEL_NUMBER));
-                }
-            }
-            else
-            {
-                mChannel = APCO25Channel.create(-1, 0);
-            }
-        }
-
-        return mChannel;
-    }
-}

src/main/java/io/github/dsheirer/source/tuner/airspy/AirspyTunerConfiguration.java

@@ -32,7 +32,6 @@ public class AirspyTunerConfiguration extends TunerConfiguration
     private int mLNAGain = AirspyTunerController.LNA_GAIN_DEFAULT;
     private boolean mMixerAGC = false;
     private boolean mLNAAGC = false;
-    private boolean mBiasT = false;
 
     /**
      * Default constructor for JAXB
@@ -130,15 +129,4 @@ public class AirspyTunerConfiguration extends TunerConfiguration
     {
         mLNAAGC = enabled;
     }
-
-    @JacksonXmlProperty(isAttribute = true, localName = "bias_t")
-    public boolean isBiasT()
-    {
-        return mBiasT;
-    }
-
-    public void setBiasT(boolean enabled)
-    {
-        mBiasT = enabled;
-    }
 }

src/main/java/io/github/dsheirer/source/tuner/airspy/AirspyTunerController.java

@@ -32,13 +32,19 @@ import io.github.dsheirer.source.tuner.ITunerErrorListener;
 import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.TunerType;
 import io.github.dsheirer.source.tuner.configuration.TunerConfiguration;
-import io.github.dsheirer.source.tuner.manager.UsbDeviceLookup;
+import io.github.dsheirer.source.tuner.manager.TunerManager;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceDescriptor;
+import org.usb4java.DeviceHandle;
+import org.usb4java.DeviceList;
+import org.usb4java.LibUsb;
 
 /**
  * Airspy tuner controller, implemented with the jAirspy library (libairspy).
@@ -177,22 +183,13 @@ public class AirspyTunerController extends TunerController
     }
 
     /**
-     * Turns off the bias-T and closes the device, which also stops streaming.
+     * Closes the device, which also stops streaming.
      * @param device to close, or null
      */
     private static void closeDevice(AirspyDevice device)
     {
         if(device != null)
         {
-            try
-            {
-                device.setBiasTee(false);
-            }
-            catch(AirspyException | RuntimeException e)
-            {
-                mLog.warn("Error turning off Airspy bias-T before closing the device - " + e.getMessage());
-            }
-
             try
             {
                 device.close();
@@ -206,17 +203,98 @@ public class AirspyTunerController extends TunerController
 
     /**
      * Reads the serial number of the device at this controller's USB bus and port, since libairspy opens a specific
-     * device by serial number.  The USB serial string is formatted as: AIRSPY SN:0123456789ABCDEF
+     * device by serial number.  The device is closed again before returning so that libairspy can open it.
      * @return serial number
      * @throws SourceException if the device isn't found or can't be accessed.
      */
     private long readSerialNumber() throws SourceException
     {
-        String serial = UsbDeviceLookup.readSerialNumber(mBus, mPortAddress);
+        Context context = new Context();
+        int status = LibUsb.init(context);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(status));
+        }
 
         try
         {
-            return Long.parseUnsignedLong(serial.substring(serial.lastIndexOf(':') + 1).trim(), 16);
+            DeviceList deviceList = new DeviceList();
+            int count = LibUsb.getDeviceList(context, deviceList);
+
+            if(count < 0)
+            {
+                throw new SourceException("Can't get the USB device list - " + LibUsb.errorName(count));
+            }
+
+            try
+            {
+                for(Device device : deviceList)
+                {
+                    if(LibUsb.getBusNumber(device) == mBus && LibUsb.getPortNumber(device) > 0 &&
+                        mPortAddress != null && mPortAddress.equals(TunerManager.getPortAddress(device)))
+                    {
+                        return readSerialNumber(device);
+                    }
+                }
+            }
+            finally
+            {
+                LibUsb.freeDeviceList(deviceList, true);
+            }
+        }
+        finally
+        {
+            LibUsb.exit(context);
+        }
+
+        throw new SourceException("Couldn't find USB device at bus [" + mBus + "] port [" + mPortAddress + "]");
+    }
+
+    /**
+     * Reads the serial number from the device's USB serial string, formatted as: AIRSPY SN:0123456789ABCDEF
+     * @param device to read
+     * @return serial number
+     * @throws SourceException if the device can't be opened or the serial string isn't valid.
+     */
+    private static long readSerialNumber(Device device) throws SourceException
+    {
+        DeviceDescriptor descriptor = new DeviceDescriptor();
+        int status = LibUsb.getDeviceDescriptor(device, descriptor);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't obtain tuner's device descriptor - " + LibUsb.errorName(status));
+        }
+
+        DeviceHandle handle = new DeviceHandle();
+        status = LibUsb.open(device, handle);
+
+        if(status == LibUsb.ERROR_ACCESS)
+        {
+            mLog.error("Access to USB tuner denied - (windows) reinstall zadig driver or (linux) blacklist driver and/or check udev rules");
+            throw new SourceException("access denied - if using linux, blacklist the default driver and/or install udev rules");
+        }
+        else if(status != LibUsb.SUCCESS)
+        {
+            mLog.error("Can't open USB tuner - check driver or Linux udev rules");
+            throw new SourceException("Can't open USB tuner - reinstall driver? - " + LibUsb.errorName(status));
+        }
+
+        String serial;
+
+        try
+        {
+            serial = LibUsb.getStringDescriptor(handle, descriptor.iSerialNumber());
+        }
+        finally
+        {
+            LibUsb.close(handle);
+        }
+
+        try
+        {
+            return Long.parseUnsignedLong(serial.substring(serial.lastIndexOf(':') + 1), 16);
         }
         catch(NullPointerException | NumberFormatException e)
         {
@@ -384,7 +462,6 @@ public class AirspyTunerController extends TunerController
                 setLNAGain(config.getLNAGain());
                 setMixerAGC(config.isMixerAGC());
                 setLNAAGC(config.isLNAAGC());
-                setBiasT(config.isBiasT());
 
                 //Set the gain mode last, so custom values are already set, and linearity and sensitivity modes will
                 //automatically override the custom values.
@@ -543,17 +620,6 @@ public class AirspyTunerController extends TunerController
         execute(device -> device.setLnaAgc(enabled));
     }
 
-    /**
-     * Enables/disables the Bias-T (RF bias tee) power output for active antennas
-     *
-     * @param enabled true to enable Bias-T, false to disable
-     * @throws SourceException on error
-     */
-    public void setBiasT(boolean enabled) throws SourceException
-    {
-        execute(device -> device.setBiasTee(enabled));
-    }
-
     public void setGain(Gain gain) throws SourceException
     {
         if(gain != Gain.CUSTOM)

src/main/java/io/github/dsheirer/source/tuner/airspy/AirspyTunerEditor.java

@@ -66,7 +66,6 @@ public class AirspyTunerEditor extends TunerEditor<AirspyTuner, AirspyTunerConfi
     private JLabel mMixerGainValueLabel;
     private JCheckBox mLNAAGCCheckBox;
     private JCheckBox mMixerAGCCheckBox;
-    private JCheckBox mBiasTCheckBox;
 
     /**
      * Constructs an instance
@@ -117,8 +116,6 @@ public class AirspyTunerEditor extends TunerEditor<AirspyTuner, AirspyTunerConfi
         getFrequencyPanel().updateControls();
         getSampleRateCombo().setEnabled(hasTuner() && !getTuner().getTunerController().isLockedSampleRate());
         getTunerInfoButton().setEnabled(hasTuner());
-        getBiasTCheckBox().setEnabled(hasTuner());
-        getBiasTCheckBox().setSelected(hasTuner() && hasConfiguration() && getConfiguration().isBiasT());
         updateGainComponents((hasTuner() && hasConfiguration()) ? getConfiguration().getGain() : null);
 
         if(hasTuner())
@@ -162,9 +159,6 @@ public class AirspyTunerEditor extends TunerEditor<AirspyTuner, AirspyTunerConfi
         add(new JLabel("Sample Rate:"));
         add(getSampleRateCombo(), "wrap");
 
-        add(new JLabel(""));
-        add(getBiasTCheckBox(), "wrap");
-
         add(new JSeparator(), "span,growx,push");
         add(new JLabel("Gain Control"), "wrap");
 
@@ -188,37 +182,6 @@ public class AirspyTunerEditor extends TunerEditor<AirspyTuner, AirspyTunerConfi
         add(getLNAGainValueLabel());
     }
 
-    /**
-     * Checkbox to enable/disable Bias-T power for active antennas
-     */
-    private JCheckBox getBiasTCheckBox()
-    {
-        if(mBiasTCheckBox == null)
-        {
-            mBiasTCheckBox = new JCheckBox("Bias-T");
-            mBiasTCheckBox.setEnabled(false);
-            mBiasTCheckBox.setToolTipText("Enable Bias-T power output for active antennas");
-            mBiasTCheckBox.addActionListener(e ->
-            {
-                if(hasTuner() && !isLoading())
-                {
-                    try
-                    {
-                        getTuner().getController().setBiasT(mBiasTCheckBox.isSelected());
-                        save();
-                    }
-                    catch(Exception e1)
-                    {
-                        mLog.error("Error setting Bias-T", e1);
-                        JOptionPane.showMessageDialog(mBiasTCheckBox, "Couldn't set Bias-T: " + e1.getMessage());
-                    }
-                }
-            });
-        }
-
-        return mBiasTCheckBox;
-    }
-
     private JCheckBox getLNAAGCCheckBox()
     {
         if(mLNAAGCCheckBox == null)
@@ -644,7 +607,6 @@ public class AirspyTunerEditor extends TunerEditor<AirspyTuner, AirspyTunerConfi
             getConfiguration().setLNAGain(getLNAGainSlider().getValue());
             getConfiguration().setMixerAGC(getMixerAGCCheckBox().isSelected());
             getConfiguration().setLNAAGC(getLNAAGCCheckBox().isSelected());
-            getConfiguration().setBiasT(getBiasTCheckBox().isSelected());
             saveConfiguration();
         }
     }

src/main/java/io/github/dsheirer/source/tuner/airspy/hf/AirspyHfTunerConfiguration.java

@@ -32,7 +32,6 @@ public class AirspyHfTunerConfiguration extends TunerConfiguration
     private boolean mAgc;
     private boolean mLna;
     private int mAttenuation;
-    private boolean mBiasT;
 
     /**
      * Default constructor for JAXB
@@ -115,25 +114,6 @@ public class AirspyHfTunerConfiguration extends TunerConfiguration
         mLna = lna;
     }
 
-    /**
-     * Indicates if the Bias-T power output is enabled.  Only applies to devices whose firmware supports a bias-T.
-     * @return bias-T enabled state
-     */
-    @JacksonXmlProperty(isAttribute = true, localName = "bias_t")
-    public boolean isBiasT()
-    {
-        return mBiasT;
-    }
-
-    /**
-     * Sets the Bias-T power output enabled state
-     * @param enabled true to enable
-     */
-    public void setBiasT(boolean enabled)
-    {
-        mBiasT = enabled;
-    }
-
     /**
      * Attenuation setting.
      * @return attenuation setting index value.

src/main/java/io/github/dsheirer/source/tuner/airspy/hf/AirspyHfTunerController.java

@@ -32,12 +32,18 @@ import io.github.dsheirer.source.tuner.ITunerErrorListener;
 import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.TunerType;
 import io.github.dsheirer.source.tuner.configuration.TunerConfiguration;
-import io.github.dsheirer.source.tuner.manager.UsbDeviceLookup;
+import io.github.dsheirer.source.tuner.manager.TunerManager;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceDescriptor;
+import org.usb4java.DeviceHandle;
+import org.usb4java.DeviceList;
+import org.usb4java.LibUsb;
 
 /**
  * Airspy HF+ Dual Port, HF+ Discovery and Ranger tuner controller, implemented with the jAirspyHF library
@@ -67,8 +73,6 @@ public class AirspyHfTunerController extends TunerController
     private Attenuation mAttenuation = Attenuation.A0;
     private boolean mAgcEnabled;
     private boolean mLnaEnabled;
-    private boolean mBiasTSupported;
-    private boolean mBiasTEnabled;
     private volatile float mSamplesPerMillisecond = DEFAULT_SAMPLE_RATE.getSampleRate() / 1000.0f;
     private volatile int mBufferSampleCount = DEFAULT_BUFFER_SAMPLE_COUNT;
     private boolean mStreaming = false;
@@ -112,8 +116,6 @@ public class AirspyHfTunerController extends TunerController
 
         try
         {
-            mBiasTSupported = false;
-            mBiasTEnabled = false;
             mDevice = AirspyHf.open(serialNumber);
 
             BoardInfo boardInfo = mDevice.boardInfo();
@@ -137,8 +139,6 @@ public class AirspyHfTunerController extends TunerController
             }
 
             mAvailableSampleRates = Collections.unmodifiableList(sampleRates);
-            mBiasTSupported = detectBiasTSupport(mDevice);
-            mBiasTEnabled = false;
 
             //Force the sample rate to be applied, since the rate discovery leaves the device at the last rate.
             mCurrentSampleRate = null;
@@ -161,7 +161,6 @@ public class AirspyHfTunerController extends TunerController
     public void stop()
     {
         AirspyHfDevice device;
-        boolean biasTEnabled;
 
         getLock().lock();
 
@@ -170,8 +169,6 @@ public class AirspyHfTunerController extends TunerController
             device = mDevice;
             mDevice = null;
             mStreaming = false;
-            biasTEnabled = mBiasTEnabled;
-            mBiasTEnabled = false;
         }
         finally
         {
@@ -179,58 +176,9 @@ public class AirspyHfTunerController extends TunerController
         }
 
         mNativeBufferBroadcaster.clear();
-
-        if(device != null && biasTEnabled)
-        {
-            try
-            {
-                device.setBiasTee(0);
-            }
-            catch(AirspyHfException | RuntimeException e)
-            {
-                mLog.warn("Error turning off Airspy HF bias-T before closing the device - " + e.getMessage());
-            }
-        }
-
         closeDevice(device);
     }
 
-    /**
-     * Detects if the device firmware supports a bias-T.  Firmware without bias-T support rejects the bias-T commands.
-     * Some firmware (HF+ Discovery R5.0.1) rejects the bias-T count request, so this falls back to turning the bias-T
-     * off, which is a safe probe since the bias-T should be off at startup anyway.
-     * @param device to probe
-     * @return true if the device accepts bias-T commands
-     */
-    private static boolean detectBiasTSupport(AirspyHfDevice device)
-    {
-        try
-        {
-            if(device.biasTeeCount() > 0)
-            {
-                device.setBiasTee(0);
-                return true;
-            }
-
-            return false;
-        }
-        catch(AirspyHfException | RuntimeException e)
-        {
-            //Bias-T count not supported - fall through and probe with a bias-T off command.
-        }
-
-        try
-        {
-            device.setBiasTee(0);
-            return true;
-        }
-        catch(AirspyHfException | RuntimeException e)
-        {
-            mLog.debug("Airspy HF firmware doesn't support bias-T - " + e.getMessage());
-            return false;
-        }
-    }
-
     /**
      * Closes the device, which also stops streaming.
      * @param device to close, or null
@@ -252,13 +200,94 @@ public class AirspyHfTunerController extends TunerController
 
     /**
      * Reads the serial number of the device at this controller's USB bus and port, since libairspyhf opens a specific
-     * device by serial number.  The USB serial string is formatted as: AIRSPYHF SN:0123456789ABCDEF
+     * device by serial number.  The device is closed again before returning so that libairspyhf can open it.
      * @return serial number
      * @throws SourceException if the device isn't found or can't be accessed.
      */
     private long readSerialNumber() throws SourceException
     {
-        String serial = UsbDeviceLookup.readSerialNumber(mBus, mPortAddress);
+        Context context = new Context();
+        int status = LibUsb.init(context);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(status));
+        }
+
+        try
+        {
+            DeviceList deviceList = new DeviceList();
+            int count = LibUsb.getDeviceList(context, deviceList);
+
+            if(count < 0)
+            {
+                throw new SourceException("Can't get the USB device list - " + LibUsb.errorName(count));
+            }
+
+            try
+            {
+                for(Device device : deviceList)
+                {
+                    if(LibUsb.getBusNumber(device) == mBus && LibUsb.getPortNumber(device) > 0 &&
+                        mPortAddress != null && mPortAddress.equals(TunerManager.getPortAddress(device)))
+                    {
+                        return readSerialNumber(device);
+                    }
+                }
+            }
+            finally
+            {
+                LibUsb.freeDeviceList(deviceList, true);
+            }
+        }
+        finally
+        {
+            LibUsb.exit(context);
+        }
+
+        throw new SourceException("Couldn't find USB device at bus [" + mBus + "] port [" + mPortAddress + "]");
+    }
+
+    /**
+     * Reads the serial number from the device's USB serial string, formatted as: AIRSPYHF SN:0123456789ABCDEF
+     * @param device to read
+     * @return serial number
+     * @throws SourceException if the device can't be opened or the serial string isn't valid.
+     */
+    private static long readSerialNumber(Device device) throws SourceException
+    {
+        DeviceDescriptor descriptor = new DeviceDescriptor();
+        int status = LibUsb.getDeviceDescriptor(device, descriptor);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't obtain tuner's device descriptor - " + LibUsb.errorName(status));
+        }
+
+        DeviceHandle handle = new DeviceHandle();
+        status = LibUsb.open(device, handle);
+
+        if(status == LibUsb.ERROR_ACCESS)
+        {
+            mLog.error("Access to USB tuner denied - (windows) reinstall zadig driver or (linux) blacklist driver and/or check udev rules");
+            throw new SourceException("access denied - if using linux, blacklist the default driver and/or install udev rules");
+        }
+        else if(status != LibUsb.SUCCESS)
+        {
+            mLog.error("Can't open USB tuner - check driver or Linux udev rules");
+            throw new SourceException("Can't open USB tuner - reinstall driver? - " + LibUsb.errorName(status));
+        }
+
+        String serial;
+
+        try
+        {
+            serial = LibUsb.getStringDescriptor(handle, descriptor.iSerialNumber());
+        }
+        finally
+        {
+            LibUsb.close(handle);
+        }
 
         try
         {
@@ -419,11 +448,6 @@ public class AirspyHfTunerController extends TunerController
                 setLna(airspyConfig.isLna());
                 setAttenuation(airspyConfig.getAttenuation());
                 setAgc(airspyConfig.isAgc());
-
-                if(isBiasTSupported())
-                {
-                    setBiasT(airspyConfig.isBiasT());
-                }
             }
             catch(SourceException se)
             {
@@ -646,38 +670,4 @@ public class AirspyHfTunerController extends TunerController
         execute(device -> device.setAttenuationStep(attenuation.getValue()));
         mAttenuation = attenuation;
     }
-
-    /**
-     * Indicates if the device firmware supports a bias-T, available once the tuner is started.
-     * @return true if supported
-     */
-    public boolean isBiasTSupported()
-    {
-        return mBiasTSupported;
-    }
-
-    /**
-     * Indicates if the Bias-T power output is enabled.
-     * @return enabled state
-     */
-    public boolean getBiasT()
-    {
-        return mBiasTEnabled;
-    }
-
-    /**
-     * Enables/disables the Bias-T (RF bias tee) power output for active antennas
-     * @param enabled true to enable Bias-T, false to disable
-     * @throws SourceException if the device doesn't support a bias-T or there is an error
-     */
-    public void setBiasT(boolean enabled) throws SourceException
-    {
-        if(!mBiasTSupported)
-        {
-            throw new SourceException("Airspy HF firmware doesn't support bias-T");
-        }
-
-        execute(device -> device.setBiasTee(enabled ? 1 : 0));
-        mBiasTEnabled = enabled;
-    }
 }

src/main/java/io/github/dsheirer/source/tuner/airspy/hf/AirspyHfTunerEditor.java

@@ -46,7 +46,6 @@ public class AirspyHfTunerEditor extends TunerEditor<AirspyHfTuner,AirspyHfTuner
     private JComboBox<Attenuation> mAttenuationCombo;
     private JToggleButton mAgcToggleButton;
     private JToggleButton mLnaToggleButton;
-    private JToggleButton mBiasTToggleButton;
 
     /**
      * Constructs an instance
@@ -101,7 +100,6 @@ public class AirspyHfTunerEditor extends TunerEditor<AirspyHfTuner,AirspyHfTuner
         buttonPanel.setLayout(new MigLayout("insets 0", "[left]", ""));
         buttonPanel.add(getAgcToggleButton());
         buttonPanel.add(getLnaToggleButton());
-        buttonPanel.add(getBiasTToggleButton());
         add(new JLabel(" "));
         add(buttonPanel, "wrap");
 
@@ -127,12 +125,6 @@ public class AirspyHfTunerEditor extends TunerEditor<AirspyHfTuner,AirspyHfTuner
             getConfiguration().setAgc(getAgcToggleButton().isSelected());
             getConfiguration().setLna(getLnaToggleButton().isSelected());
 
-            //Only update bias-T when the device supports it, so the saved setting isn't lost on unsupported firmware.
-            if(getTuner().getController().isBiasTSupported())
-            {
-                getConfiguration().setBiasT(getBiasTToggleButton().isSelected());
-            }
-
             saveConfiguration();
         }
     }
@@ -166,11 +158,6 @@ public class AirspyHfTunerEditor extends TunerEditor<AirspyHfTuner,AirspyHfTuner
             getAgcToggleButton().setSelected(getTuner().getController().getAgc());
             getLnaToggleButton().setEnabled(true);
             getLnaToggleButton().setSelected(getTuner().getController().getLna());
-            boolean biasTSupported = getTuner().getController().isBiasTSupported();
-            getBiasTToggleButton().setEnabled(biasTSupported);
-            getBiasTToggleButton().setSelected(biasTSupported && getTuner().getController().getBiasT());
-            getBiasTToggleButton().setToolTipText(biasTSupported ? "Enable Bias-T power output for active antennas" :
-                    "Bias-T not supported by this device or firmware");
             getSampleRateCombo().setSelectedItem(getTuner().getController().getCurrentAirspySampleRate());
             getAttenuationCombo().setEnabled(!getTuner().getController().getAgc());
             getAttenuationCombo().setSelectedItem(getTuner().getController().getAttenuation());
@@ -182,9 +169,6 @@ public class AirspyHfTunerEditor extends TunerEditor<AirspyHfTuner,AirspyHfTuner
             getAgcToggleButton().setSelected(false);
             getLnaToggleButton().setEnabled(false);
             getLnaToggleButton().setSelected(false);
-            getBiasTToggleButton().setEnabled(false);
-            getBiasTToggleButton().setSelected(false);
-            getBiasTToggleButton().setToolTipText("No tuner available");
             getSampleRateCombo().setEnabled(false);
             getAttenuationCombo().setEnabled(false);
             getAttenuationCombo().setSelectedItem(Attenuation.A0);
@@ -360,36 +344,4 @@ public class AirspyHfTunerEditor extends TunerEditor<AirspyHfTuner,AirspyHfTuner
 
         return mLnaToggleButton;
     }
-
-    /**
-     * Bias-T toggle button, enabled only when the device firmware supports a bias-T.
-     */
-    private JToggleButton getBiasTToggleButton()
-    {
-        if(mBiasTToggleButton == null)
-        {
-            mBiasTToggleButton = new JToggleButton("Bias-T");
-            mBiasTToggleButton.setToolTipText("Enable Bias-T power output for active antennas");
-            mBiasTToggleButton.setEnabled(false);
-            mBiasTToggleButton.addActionListener(e -> {
-                if(hasTuner() && !isLoading())
-                {
-                    try
-                    {
-                        getTuner().getController().setBiasT(mBiasTToggleButton.isSelected());
-                        save();
-                    }
-                    catch(SourceException se)
-                    {
-                        mLog.error("Error setting Airspy HF Bias-T", se);
-                        mBiasTToggleButton.setSelected(getTuner().getController().getBiasT());
-                        JOptionPane.showMessageDialog(AirspyHfTunerEditor.this,
-                                "Airspy HF Tuner Controller - couldn't change Bias-T setting " + se.getLocalizedMessage());
-                    }
-                }
-            });
-        }
-
-        return mBiasTToggleButton;
-    }
 }

src/main/java/io/github/dsheirer/source/tuner/bladerf/BladeRfTunerController.java

@@ -45,13 +45,17 @@ import io.github.dsheirer.source.tuner.ITunerErrorListener;
 import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.TunerType;
 import io.github.dsheirer.source.tuner.configuration.TunerConfiguration;
-import io.github.dsheirer.source.tuner.manager.UsbDeviceLookup;
+import io.github.dsheirer.source.tuner.manager.TunerManager;
 import io.github.dsheirer.util.ThreadPool;
 import java.util.List;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceList;
+import org.usb4java.LibUsb;
 
 /**
  * bladeRF tuner controller, implemented with the jBladeRF library (libbladeRF).
@@ -372,7 +376,46 @@ public class BladeRfTunerController extends TunerController
      */
     private int readUsbAddress() throws SourceException
     {
-        return UsbDeviceLookup.find(mBus, mPortAddress).address();
+        Context context = new Context();
+        int status = LibUsb.init(context);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(status));
+        }
+
+        try
+        {
+            DeviceList deviceList = new DeviceList();
+            int count = LibUsb.getDeviceList(context, deviceList);
+
+            if(count < 0)
+            {
+                throw new SourceException("Can't get the USB device list - " + LibUsb.errorName(count));
+            }
+
+            try
+            {
+                for(Device device : deviceList)
+                {
+                    if(LibUsb.getBusNumber(device) == mBus && LibUsb.getPortNumber(device) > 0 &&
+                        mPortAddress != null && mPortAddress.equals(TunerManager.getPortAddress(device)))
+                    {
+                        return LibUsb.getDeviceAddress(device);
+                    }
+                }
+            }
+            finally
+            {
+                LibUsb.freeDeviceList(deviceList, true);
+            }
+        }
+        finally
+        {
+            LibUsb.exit(context);
+        }
+
+        throw new SourceException("Couldn't find USB device at bus [" + mBus + "] port [" + mPortAddress + "]");
     }
 
     @Override

src/main/java/io/github/dsheirer/source/tuner/fcd/FCDCommand.java

@@ -20,7 +20,7 @@ package io.github.dsheirer.source.tuner.fcd;
 public enum FCDCommand
 {
 	/**
-	 * Note: the libusb interrupt transfers used here (through jlibusb) are slightly different than
+	 * Note: the javaxUSB and usb4Java libraries are slightly different than
 	 * the signal9 HID libraries used in C, so you will see variations in the
 	 * byte array length and indexes, when comparing this setup to the qthid
 	 * source code.

src/main/java/io/github/dsheirer/source/tuner/fcd/FCDTunerController.java

@@ -19,11 +19,6 @@
 package io.github.dsheirer.source.tuner.fcd;
 
 import io.github.dsheirer.buffer.INativeBuffer;
-import io.github.dsheirer.libusb.LibUsb;
-import io.github.dsheirer.libusb.UsbContext;
-import io.github.dsheirer.libusb.UsbDeviceHandle;
-import io.github.dsheirer.libusb.UsbDeviceInfo;
-import io.github.dsheirer.libusb.UsbException;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.adapter.ComplexShortAdapter;
 import io.github.dsheirer.source.SourceException;
@@ -33,13 +28,21 @@ import io.github.dsheirer.source.tuner.MixerTunerType;
 import io.github.dsheirer.source.tuner.TunerClass;
 import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.TunerType;
-import io.github.dsheirer.source.tuner.manager.UsbDeviceLookup;
+import io.github.dsheirer.source.tuner.manager.TunerManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceDescriptor;
+import org.usb4java.DeviceHandle;
+import org.usb4java.DeviceList;
+import org.usb4java.LibUsb;
+import org.usb4java.LibUsbException;
 
 import javax.sound.sampled.TargetDataLine;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.IntBuffer;
 import java.util.concurrent.locks.ReentrantLock;
 
 public abstract class FCDTunerController extends TunerController
@@ -47,19 +50,16 @@ public abstract class FCDTunerController extends TunerController
     private final static Logger mLog = LoggerFactory.getLogger(FCDTunerController.class);
     private static final double USABLE_BANDWIDTH_PERCENT = 1.0;
     private static final int DC_SPIKE_AVOID_HALF_BANDWIDTH = 5000;
-    private final static int FCD_INTERFACE = 0x2;
-    private final static int FCD_ENDPOINT_IN = 0x82;
-    private final static int FCD_ENDPOINT_OUT = 0x2;
-    private final static int FCD_PACKET_SIZE = 64;
-    private final static int FCD_TRANSFER_TIMEOUT_MS = 500;
-    private final static int LIBUSB_ERROR_NO_DEVICE = -4;
+    private final static byte FCD_INTERFACE = (byte) 0x2;
+    private final static byte FCD_ENDPOINT_IN = (byte) 0x82;
+    private final static byte FCD_ENDPOINT_OUT = (byte) 0x2;
 
     private int mBus;
     private String mPortAddress;
-    private UsbContext mUsbContext;
-    private UsbDeviceInfo mDevice;
-    private volatile UsbDeviceHandle mDeviceHandle;
-    private boolean mShutdown = false;
+    private Context mDeviceContext = new Context();
+    private Device mDevice;
+    private DeviceDescriptor mDeviceDescriptor = new DeviceDescriptor();
+    private DeviceHandle mDeviceHandle = new DeviceHandle();
 
     private FCDConfiguration mConfiguration = new FCDConfiguration();
     protected ComplexMixer mComplexMixer;
@@ -168,6 +168,58 @@ public abstract class FCDTunerController extends TunerController
         }
     }
 
+    /**
+     * Finds the USB device for this tuner at the specified USB bus and port.
+     * @return discovered USB device
+     * @throws SourceException if there is an error or the device is not discovered.
+     */
+    private Device findDevice() throws SourceException
+    {
+        Device foundDevice = null;
+
+        DeviceList deviceList = new DeviceList();
+        int count = LibUsb.getDeviceList(mDeviceContext, deviceList);
+
+        if(count >= 0)
+        {
+            for(Device device: deviceList)
+            {
+                int bus = LibUsb.getBusNumber(device);
+                int port = LibUsb.getPortNumber(device);
+
+                if(port > 0)
+                {
+                    String portAddress = TunerManager.getPortAddress(device);
+
+                    if(mBus == bus && mPortAddress != null && mPortAddress.equals(portAddress))
+                    {
+                        foundDevice = device;
+                    }
+                    else
+                    {
+                        LibUsb.unrefDevice(device);
+                    }
+                }
+                else
+                {
+                    LibUsb.unrefDevice(device);
+                }
+            }
+        }
+        else
+        {
+            throw new SourceException("LibUsb couldn't discover USB device [" + mBus + ":" + mPortAddress +
+                    "] from device list" + (count < 0 ? " - error: " + LibUsb.errorName(count) : ""));
+        }
+
+        if(foundDevice == null)
+        {
+            throw new SourceException("LibUsb couldn't find the matching USB device");
+        }
+
+        return foundDevice;
+    }
+
     /**
      * Initializes the controller by opening the USB device and claiming the HID interface.
      * Invoke this method after constructing this class to setup the controller.
@@ -176,102 +228,80 @@ public abstract class FCDTunerController extends TunerController
      */
     public void start() throws SourceException
     {
-        if(mShutdown)
+        if(mDeviceContext == null)
         {
             throw new SourceException("Device cannot be reused once it has been shutdown");
         }
 
-        mUsbContext = UsbDeviceLookup.createContext();
+        int status = LibUsb.init(mDeviceContext);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(status));
+        }
+
+        mDevice = findDevice();
+        mDeviceDescriptor = new DeviceDescriptor();
+        status = LibUsb.getDeviceDescriptor(mDevice, mDeviceDescriptor);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            mDeviceDescriptor = null;
+            throw new SourceException("Can't obtain tuner's device descriptor - " + LibUsb.errorName(status));
+        }
+
+        mDeviceHandle = new DeviceHandle();
+        status = LibUsb.open(mDevice, mDeviceHandle);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            mDeviceHandle = null;
+            mDeviceDescriptor = null;
+
+            mLog.error("Can't open USB tuner [" + getTunerType() + "] - check driver or Linux udev rules");
+            throw new SourceException("Can't open USB tuner - check driver or Linux udev rules - " + LibUsb.errorName(status));
+        }
+
+        //Remove a kernel driver if active
+        status = LibUsb.kernelDriverActive(mDeviceHandle, FCD_INTERFACE);
+
+        if(status == 1)
+        {
+            status = LibUsb.detachKernelDriver(mDeviceHandle, FCD_INTERFACE);
+
+            if(status != LibUsb.SUCCESS)
+            {
+                mLog.error("Unable to detach kernel driver for USB tuner device - bus:" + mBus + " port:" + mPortAddress);
+                mDeviceHandle = null;
+                mDeviceDescriptor = null;
+                throw new SourceException("Can't detach kernel driver");
+            }
+        }
+
+        //Claim the interface
+        status = LibUsb.claimInterface(mDeviceHandle, FCD_INTERFACE);
+
+        if(status == LibUsb.ERROR_BUSY)
+        {
+            mDeviceHandle = null;
+            mDeviceDescriptor = null;
+            throw new SourceException("USB tuner is in-use by another application");
+        }
+        else if(status != LibUsb.SUCCESS)
+        {
+            mDeviceHandle = null;
+            mDeviceDescriptor = null;
+            throw new SourceException("Can't claim interface on USB tuner - " + LibUsb.errorName(status));
+        }
 
         try
         {
-            mDevice = UsbDeviceLookup.find(mUsbContext, mBus, mPortAddress);
-
-            try
-            {
-                mDeviceHandle = mUsbContext.open(mDevice);
-            }
-            catch(UsbException e)
-            {
-                mLog.error("Can't open USB tuner [" + getTunerType() + "] - check driver or Linux udev rules");
-                throw new SourceException("Can't open USB tuner - check driver or Linux udev rules - " +
-                        LibUsb.errorName(e.code()));
-            }
-
-            //Remove a kernel driver if active
-            boolean kernelDriverActive;
-
-            try
-            {
-                kernelDriverActive = mDeviceHandle.isKernelDriverActive(FCD_INTERFACE);
-            }
-            catch(UsbException e)
-            {
-                kernelDriverActive = false;
-            }
-
-            if(kernelDriverActive)
-            {
-                try
-                {
-                    mDeviceHandle.detachKernelDriver(FCD_INTERFACE);
-                }
-                catch(UsbException e)
-                {
-                    mLog.error("Unable to detach kernel driver for USB tuner device - bus:" + mBus + " port:" + mPortAddress);
-                    throw new SourceException("Can't detach kernel driver");
-                }
-            }
-
-            //Claim the interface
-            try
-            {
-                mDeviceHandle.claimInterface(FCD_INTERFACE);
-            }
-            catch(UsbException e)
-            {
-                if(e.code() == UsbDeviceLookup.ERROR_BUSY)
-                {
-                    throw new SourceException("USB tuner is in-use by another application");
-                }
-
-                throw new SourceException("Can't claim interface on USB tuner - " + LibUsb.errorName(e.code()));
-            }
+            deviceStart();
         }
         catch(SourceException se)
         {
-            closeUsb();
             throw se;
         }
-
-        deviceStart();
-    }
-
-    /**
-     * Closes the USB device handle and the libusb context.
-     */
-    private void closeUsb()
-    {
-        UsbDeviceHandle handle = mDeviceHandle;
-        mDeviceHandle = null;
-
-        if(handle != null)
-        {
-            try
-            {
-                handle.close();
-            }
-            catch(Exception e)
-            {
-                mLog.error("error while closing device handle", e);
-            }
-        }
-
-        if(mUsbContext != null)
-        {
-            mUsbContext.close();
-            mUsbContext = null;
-        }
     }
 
     /**
@@ -291,9 +321,23 @@ public abstract class FCDTunerController extends TunerController
             mComplexMixer = null;
         }
 
-        closeUsb();
+        if(mDeviceHandle != null)
+        {
+            try
+            {
+                LibUsb.close(mDeviceHandle);
+            }
+            catch(Exception e)
+            {
+                mLog.error("error while closing device handle", e);
+            }
+        }
+
+        mDeviceDescriptor = null;
+        mDeviceHandle = null;
         mDevice = null;
-        mShutdown = true;
+        LibUsb.exit(mDeviceContext);
+        mDeviceContext = null;
     }
 
     /**
@@ -316,14 +360,19 @@ public abstract class FCDTunerController extends TunerController
      */
     public String getUSBAddress()
     {
-        UsbDeviceInfo device = mDevice;
-
-        //This is the tuner's unique ID for saved tuner configurations, so the format must not change: the port is the
-        //last port number in the path from the root hub, as libusb_get_port_number() reports it.
-        if(device != null)
+        if(mDevice != null)
         {
-            int port = device.portNumbers().isEmpty() ? 0 : device.portNumbers().getLast();
-            return "Bus:" + device.busNumber() + " Port:" + port;
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("Bus:");
+            int bus = LibUsb.getBusNumber(mDevice);
+            sb.append(bus);
+
+            sb.append(" Port:");
+            int port = LibUsb.getPortNumber(mDevice);
+            sb.append(port);
+
+            return sb.toString();
         }
 
         return "UNKNOWN";
@@ -334,34 +383,38 @@ public abstract class FCDTunerController extends TunerController
      */
     public String getUSBID()
     {
-        UsbDeviceInfo device = mDevice;
-
-        if(device != null)
+        if(mDeviceDescriptor != null)
         {
-            return String.format("%04X:%04X", device.vendorId(), device.productId());
+            StringBuilder sb = new StringBuilder();
+
+            sb.append(String.format("%04X", (int) (mDeviceDescriptor.idVendor() & 0xFFFF)));
+            sb.append(":");
+            sb.append(String.format("%04X", (int) (mDeviceDescriptor.idProduct() & 0xFFFF)));
+
+            return sb.toString();
         }
 
         return "UNKNOWN";
     }
 
     /**
-     * USB Port Speed.  The FUNcube Dongle Pro is a full speed (USB 1.1) device.
+     * USB Port Speed.  Should be 2.0 for both types of funcube dongles
      */
     public String getUSBSpeed()
     {
-        UsbDeviceInfo device = mDevice;
-
-        if(device != null)
+        if(mDevice != null)
         {
-            switch(device.speed())
+            int speed = LibUsb.getDeviceSpeed(mDevice);
+
+            switch(speed)
             {
-                case LOW:
+                case 0:
                     return "1.1 LOW";
-                case FULL:
+                case 1:
                     return "1.1 FULL";
-                case HIGH:
+                case 2:
                     return "2.0 HIGH";
-                case SUPER:
+                case 3:
                     return "3.0 SUPER";
                 default:
             }
@@ -447,27 +500,26 @@ public abstract class FCDTunerController extends TunerController
     }
 
     /**
-     * Performs an interrupt write of one 64 byte packet to the OUT endpoint.
+     * Performs an interrupt write to the OUT endpoint.
      *
-     * @param packet to write.  Must be 64 bytes in length.
-     * @throws FCDUsbException on error
+     * @param buffer - direct allocated buffer.  Must be 64 bytes in length.
+     * @throws LibUsbException on error
      */
-    private void write(byte[] packet) throws FCDUsbException
+    private void write(ByteBuffer buffer) throws LibUsbException
     {
-        UsbDeviceHandle handle = mDeviceHandle;
+        if(mDeviceHandle != null)
+        {
+            IntBuffer transferred = IntBuffer.allocate(1);
+            int result = LibUsb.interruptTransfer(mDeviceHandle, FCD_ENDPOINT_OUT, buffer, transferred, 500l);
 
-        if(handle == null)
-        {
-            throw new FCDUsbException("device handle is null", LIBUSB_ERROR_NO_DEVICE);
+            if(result != LibUsb.SUCCESS)
+            {
+                throw new LibUsbException("error writing byte buffer", result);
+            }
         }
-
-        try
+        else
         {
-            handle.interruptTransfer(FCD_ENDPOINT_OUT, packet, packet.length, FCD_TRANSFER_TIMEOUT_MS);
-        }
-        catch(UsbException e)
-        {
-            throw new FCDUsbException("error writing byte buffer", e.code());
+            throw new LibUsbException("device handle is null", LibUsb.ERROR_NO_DEVICE);
         }
     }
 
@@ -475,14 +527,14 @@ public abstract class FCDTunerController extends TunerController
      * Performs an interrupt write to the OUT endpoint for the FCD command.
      *
      * @param command - no-argument command to write
-     * @throws FCDUsbException - on error
+     * @throws LibUsbException - on error
      */
-    private void write(FCDCommand command) throws FCDUsbException
+    private void write(FCDCommand command) throws LibUsbException
     {
-        byte[] packet = new byte[FCD_PACKET_SIZE];
-        packet[0] = command.getCommand();
-        packet[1] = (byte) 0x00;
-        write(packet);
+        ByteBuffer buffer = ByteBuffer.allocateDirect(64);
+        buffer.put(0, command.getCommand());
+        buffer.put(1, (byte) 0x00);
+        write(buffer);
     }
 
     /**
@@ -490,53 +542,46 @@ public abstract class FCDTunerController extends TunerController
      *
      * @param command - command to write
      * @param argument - value to write with the command
-     * @throws FCDUsbException - on error
+     * @throws LibUsbException - on error
      */
-    private void write(FCDCommand command, long argument) throws FCDUsbException
+    private void write(FCDCommand command, long argument) throws LibUsbException
     {
-        byte[] packet = new byte[FCD_PACKET_SIZE];
-        ByteBuffer buffer = ByteBuffer.wrap(packet);
+        ByteBuffer buffer = ByteBuffer.allocateDirect(64);
         /* The FCD expects little-endian formatted values */
         buffer.order(ByteOrder.LITTLE_ENDIAN);
         buffer.put(0, command.getCommand());
         buffer.putLong(1, argument);
-        write(packet);
+        write(buffer);
     }
 
     /**
-     * Performs an interrupt read of one 64 byte packet from the IN endpoint
+     * Performs an interrupt read against the endpoint
      *
      * @return buffer read from FCD
-     * @throws FCDUsbException on error
+     * @throws LibUsbException on error
      */
-    private ByteBuffer read() throws FCDUsbException
+    private ByteBuffer read() throws LibUsbException
     {
-        UsbDeviceHandle handle = mDeviceHandle;
-
-        if(handle == null)
+        if(mDeviceHandle != null)
         {
-            throw new FCDUsbException("device handle is null", LIBUSB_ERROR_NO_DEVICE);
+            ByteBuffer buffer = ByteBuffer.allocateDirect(64);
+            IntBuffer transferred = IntBuffer.allocate(1);
+            int result = LibUsb.interruptTransfer(mDeviceHandle, FCD_ENDPOINT_IN, buffer, transferred, 500l);
+
+            if(result != LibUsb.SUCCESS)
+            {
+                throw new LibUsbException("error reading byte buffer", result);
+            }
+            else if(transferred.get(0) != buffer.capacity())
+            {
+                throw new LibUsbException("received bytes [" + transferred.get(0) + "] didn't match expected length [" +
+                        buffer.capacity() + "]", result);
+            }
+
+            return buffer;
         }
 
-        byte[] packet = new byte[FCD_PACKET_SIZE];
-        int transferred;
-
-        try
-        {
-            transferred = handle.interruptTransfer(FCD_ENDPOINT_IN, packet, packet.length, FCD_TRANSFER_TIMEOUT_MS);
-        }
-        catch(UsbException e)
-        {
-            throw new FCDUsbException("error reading byte buffer", e.code());
-        }
-
-        if(transferred != packet.length)
-        {
-            throw new FCDUsbException("received bytes [" + transferred + "] didn't match expected length [" +
-                    packet.length + "]", 0);
-        }
-
-        return ByteBuffer.wrap(packet);
+        throw new LibUsbException("device handle is null", LibUsb.ERROR_NO_DEVICE);
     }
 
     /**
@@ -545,9 +590,9 @@ public abstract class FCDTunerController extends TunerController
      *
      * @param command - command to send
      * @param argument - command argument to send
-     * @throws FCDUsbException - on error
+     * @throws LibUsbException - on error
      */
-    protected synchronized void send(FCDCommand command, long argument) throws FCDUsbException
+    protected synchronized void send(FCDCommand command, long argument) throws LibUsbException
     {
         write(command, argument);
         read();
@@ -558,9 +603,9 @@ public abstract class FCDTunerController extends TunerController
      * command.
      *
      * @param command - command to send
-     * @throws FCDUsbException - on error
+     * @throws LibUsbException - on error
      */
-    protected ByteBuffer send(FCDCommand command) throws FCDUsbException
+    protected ByteBuffer send(FCDCommand command) throws LibUsbException
     {
         write(command);
         return read();

src/main/java/io/github/dsheirer/source/tuner/fcd/FCDUsbException.java

@@ -1,50 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 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 <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.source.tuner.fcd;
-
-import io.github.dsheirer.libusb.LibUsb;
-
-/**
- * USB transfer error while communicating with a FUNcube Dongle.  Unchecked, like the usb4java exception it replaces,
- * since the FCD command methods are called from many places that handle any exception.
- */
-public class FCDUsbException extends RuntimeException
-{
-    private final int mErrorCode;
-
-    /**
-     * Constructs an instance
-     * @param message describing the failed operation
-     * @param errorCode libusb error code, or 0 when the transfer succeeded but returned unexpected data
-     */
-    public FCDUsbException(String message, int errorCode)
-    {
-        super(errorCode < 0 ? message + " - " + LibUsb.errorName(errorCode) : message);
-        mErrorCode = errorCode;
-    }
-
-    /**
-     * libusb error code, such as -7 for LIBUSB_ERROR_TIMEOUT, or 0
-     */
-    public int getErrorCode()
-    {
-        return mErrorCode;
-    }
-}

src/main/java/io/github/dsheirer/source/tuner/fcd/proV1/FCD1TunerConfiguration.java

@@ -35,7 +35,6 @@ public class FCD1TunerConfiguration extends TunerConfiguration
     private LNAGain mLNAGain = LNAGain.LNA_GAIN_PLUS_20_0;
     private LNAEnhance mLNAEnhance = LNAEnhance.LNA_ENHANCE_OFF;
     private MixerGain mMixerGain = MixerGain.MIXER_GAIN_PLUS_12_0;
-    private boolean mBiasT = false;
 
     /**
      * Default constructor for JAXB
@@ -133,15 +132,4 @@ public class FCD1TunerConfiguration extends TunerConfiguration
     {
         mGainCorrection = value;
     }
-
-    @JacksonXmlProperty(isAttribute = true, localName = "bias_t")
-    public boolean isBiasT()
-    {
-        return mBiasT;
-    }
-
-    public void setBiasT(boolean enabled)
-    {
-        mBiasT = enabled;
-    }
 }

src/main/java/io/github/dsheirer/source/tuner/fcd/proV1/FCD1TunerController.java

@@ -49,7 +49,6 @@ public class FCD1TunerController extends FCDTunerController
     private LNAGain mLNAGain;
     private LNAEnhance mLNAEnhance;
     private MixerGain mMixerGain;
-    private boolean mBiasTEnabled = false;
 
     /**
      * Constructs an instance
@@ -124,61 +123,9 @@ public class FCD1TunerController extends FCDTunerController
                 //Re-cast any usb exceptions as source exceptions
                 throw new SourceException("FCD 1 Controller error applying tuner config - " + e.getLocalizedMessage());
             }
-
-            //Apply the bias-T separately so that a bias-T error doesn't prevent the tuner from starting.
-            try
-            {
-                setBiasT(fcd1.isBiasT());
-            }
-            catch(SourceException se)
-            {
-                mLog.warn("FCD 1 Controller couldn't apply bias-T setting - " + se.getMessage());
-            }
         }
    }
 
-    /**
-     * Enables/disables the Bias-T (RF bias tee) power output for active antennas
-     *
-     * @param enabled true to enable Bias-T, false to disable
-     * @throws SourceException on error
-     */
-    public void setBiasT(boolean enabled) throws SourceException
-    {
-        try
-        {
-            send(FCDCommand.APP_SET_BIAS_TEE, enabled ? 1 : 0);
-            mBiasTEnabled = enabled;
-        }
-        catch(Exception e)
-        {
-            throw new SourceException("Couldn't set FCD Pro bias-T", e);
-        }
-    }
-
-    /**
-     * Turns off the bias-T, when enabled, before closing the device.
-     */
-    @Override
-    public void stop()
-    {
-        if(mBiasTEnabled)
-        {
-            try
-            {
-                setBiasT(false);
-            }
-            catch(Exception e)
-            {
-                mLog.warn("Error turning off FCD Pro bias-T before closing the device - " + e.getMessage());
-            }
-
-            mBiasTEnabled = false;
-        }
-
-        super.stop();
-    }
-
     /**
      * Gets the current LNA Gain value from the controller and stores it
      */

src/main/java/io/github/dsheirer/source/tuner/fcd/proV1/FCD1TunerEditor.java

@@ -19,7 +19,6 @@
 package io.github.dsheirer.source.tuner.fcd.proV1;
 
 import io.github.dsheirer.preference.UserPreferences;
-import io.github.dsheirer.source.SourceException;
 import io.github.dsheirer.source.tuner.fcd.FCDTuner;
 import io.github.dsheirer.source.tuner.fcd.proV1.FCD1TunerController.LNAEnhance;
 import io.github.dsheirer.source.tuner.fcd.proV1.FCD1TunerController.LNAGain;
@@ -33,7 +32,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -54,7 +52,6 @@ public class FCD1TunerEditor extends TunerEditor<FCDTuner,FCD1TunerConfiguration
     private JComboBox<LNAGain> mLnaGainCombo;
     private JComboBox<LNAEnhance> mLnaEnhanceCombo;
     private JComboBox<MixerGain> mMixerGainCombo;
-    private JCheckBox mBiasTCheckBox;
     private CorrectionSpinner mCorrectionDCI;
     private CorrectionSpinner mCorrectionDCQ;
     private CorrectionSpinner mGainCorrectionSpinner;
@@ -124,7 +121,6 @@ public class FCD1TunerEditor extends TunerEditor<FCDTuner,FCD1TunerConfiguration
             getMixerGainCombo().setSelectedItem(getConfiguration().getMixerGain());
             getLnaEnhanceCombo().setSelectedItem(getConfiguration().getLNAEnhance());
             getLnaGainCombo().setSelectedItem(getConfiguration().getLNAGain());
-            getBiasTCheckBox().setSelected(getConfiguration().isBiasT());
             getDcCorrectionSpinnerI().setValue(getConfiguration().getInphaseDCCorrection());
             getDcCorrectionSpinnerQ().setValue(getConfiguration().getQuadratureDCCorrection());
             getPhaseCorrectionSpinner().setValue(getConfiguration().getGainCorrection());
@@ -134,7 +130,6 @@ public class FCD1TunerEditor extends TunerEditor<FCDTuner,FCD1TunerConfiguration
         getMixerGainCombo().setEnabled(hasTuner());
         getLnaEnhanceCombo().setEnabled(hasTuner());
         getLnaGainCombo().setEnabled(hasTuner());
-        getBiasTCheckBox().setEnabled(hasTuner());
         getDcCorrectionSpinnerI().setEnabled(hasTuner());
         getDcCorrectionSpinnerQ().setEnabled(hasTuner());
         getPhaseCorrectionSpinner().setEnabled(hasTuner());
@@ -169,8 +164,6 @@ public class FCD1TunerEditor extends TunerEditor<FCDTuner,FCD1TunerConfiguration
         add(getLnaEnhanceCombo(), "wrap");
         add(new JLabel("Mixer:"));
         add(getMixerGainCombo(), "wrap");
-        add(new JLabel(""));
-        add(getBiasTCheckBox(), "wrap");
 
         add(new JSeparator(), "span,growx,push");
         add(new JLabel("Correction"), "span,align center");
@@ -216,37 +209,6 @@ public class FCD1TunerEditor extends TunerEditor<FCDTuner,FCD1TunerConfiguration
         return mLnaGainCombo;
     }
 
-    /**
-     * Checkbox to enable/disable Bias-T power for active antennas
-     */
-    public JCheckBox getBiasTCheckBox()
-    {
-        if(mBiasTCheckBox == null)
-        {
-            mBiasTCheckBox = new JCheckBox("Bias-T");
-            mBiasTCheckBox.setEnabled(false);
-            mBiasTCheckBox.setToolTipText("Enable Bias-T power output for active antennas");
-            mBiasTCheckBox.addActionListener(event ->
-            {
-                if(hasTuner() && !isLoading())
-                {
-                    try
-                    {
-                        getController().setBiasT(mBiasTCheckBox.isSelected());
-                        save();
-                    }
-                    catch(SourceException e)
-                    {
-                        mLog.error("Couldn't set bias-T for FCD Pro", e);
-                        JOptionPane.showMessageDialog(FCD1TunerEditor.this, "Couldn't set Bias-T: " + e.getMessage());
-                    }
-                }
-            });
-        }
-
-        return mBiasTCheckBox;
-    }
-
     public JComboBox getLnaEnhanceCombo()
     {
         if(mLnaEnhanceCombo == null)
@@ -424,7 +386,6 @@ public class FCD1TunerEditor extends TunerEditor<FCDTuner,FCD1TunerConfiguration
             getConfiguration().setLNAEnhance((LNAEnhance) mLnaEnhanceCombo.getSelectedItem());
             getConfiguration().setLNAGain((LNAGain) mLnaGainCombo.getSelectedItem());
             getConfiguration().setMixerGain((MixerGain) mMixerGainCombo.getSelectedItem());
-            getConfiguration().setBiasT(getBiasTCheckBox().isSelected());
             double dci = ((SpinnerNumberModel)mCorrectionDCI.getModel()).getNumber().doubleValue();
             getConfiguration().setInphaseDCCorrection(dci);
             double dcq = ((SpinnerNumberModel)mCorrectionDCQ.getModel()).getNumber().doubleValue();

src/main/java/io/github/dsheirer/source/tuner/fcd/proplusV2/FCD2TunerConfiguration.java

@@ -27,7 +27,6 @@ public class FCD2TunerConfiguration extends TunerConfiguration
 {
     private boolean mGainLNA = true;
     private boolean mGainMixer = true;
-    private boolean mBiasT = false;
 
     /**
      * Default constructor for JAXB
@@ -70,15 +69,4 @@ public class FCD2TunerConfiguration extends TunerConfiguration
     {
         mGainMixer = gain;
     }
-
-    @JacksonXmlProperty(isAttribute = true, localName = "bias_t")
-    public boolean isBiasT()
-    {
-        return mBiasT;
-    }
-
-    public void setBiasT(boolean enabled)
-    {
-        mBiasT = enabled;
-    }
 }

src/main/java/io/github/dsheirer/source/tuner/fcd/proplusV2/FCD2TunerController.java

@@ -43,7 +43,6 @@ public class FCD2TunerController extends FCDTunerController
     public static final int MINIMUM_TUNABLE_FREQUENCY_HZ = 150000;
     public static final int MAXIMUM_TUNABLE_FREQUENCY_HZ = 2050000000;
     public static final int SAMPLE_RATE = 192000;
-    private boolean mBiasTEnabled = false;
 
     /**
      * Constructs an instance
@@ -99,48 +98,6 @@ public class FCD2TunerController extends FCDTunerController
         send(FCDCommand.APP_SET_MIXER_GAIN, enabled ? 1 : 0);
     }
 
-    /**
-     * Enables/disables the Bias-T (RF bias tee) power output for active antennas
-     *
-     * @param enabled true to enable Bias-T, false to disable
-     * @throws SourceException on error
-     */
-    public void setBiasT(boolean enabled) throws SourceException
-    {
-        try
-        {
-            send(FCDCommand.APP_SET_BIAS_TEE, enabled ? 1 : 0);
-            mBiasTEnabled = enabled;
-        }
-        catch(Exception e)
-        {
-            throw new SourceException("Couldn't set FCD Pro Plus bias-T", e);
-        }
-    }
-
-    /**
-     * Turns off the bias-T, when enabled, before closing the device.
-     */
-    @Override
-    public void stop()
-    {
-        if(mBiasTEnabled)
-        {
-            try
-            {
-                setBiasT(false);
-            }
-            catch(Exception e)
-            {
-                mLog.warn("Error turning off FCD Pro Plus bias-T before closing the device - " + e.getMessage());
-            }
-
-            mBiasTEnabled = false;
-        }
-
-        super.stop();
-    }
-
     @Override
     public void apply(TunerConfiguration config) throws SourceException
     {
@@ -151,7 +108,6 @@ public class FCD2TunerController extends FCDTunerController
         {
             setLNAGain(fcd2.getGainLNA());
             setMixerGain(fcd2.getGainMixer());
-            setBiasT(fcd2.isBiasT());
         }
     }
 

src/main/java/io/github/dsheirer/source/tuner/fcd/proplusV2/FCD2TunerEditor.java

@@ -32,7 +32,6 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.SpinnerNumberModel;
 
@@ -46,7 +45,6 @@ public class FCD2TunerEditor extends TunerEditor<FCDTuner, FCD2TunerConfiguratio
     private JButton mTunerInfoButton;
     private JCheckBox mLnaGainCheckBox;
     private JCheckBox mMixerGainCheckBox;
-    private JCheckBox mBiasTCheckBox;
 
     /**
      * Constructs an instance
@@ -108,13 +106,11 @@ public class FCD2TunerEditor extends TunerEditor<FCDTuner, FCD2TunerConfiguratio
         getTunerInfoButton().setEnabled(hasTuner());
         getLnaGainCheckBox().setEnabled(hasTuner());
         getMixerGainCheckBox().setEnabled(hasTuner());
-        getBiasTCheckBox().setEnabled(hasTuner());
 
         if(hasTuner() && hasConfiguration())
         {
             getLnaGainCheckBox().setSelected(getConfiguration().getGainLNA());
             getMixerGainCheckBox().setSelected(getConfiguration().getGainMixer());
-            getBiasTCheckBox().setSelected(getConfiguration().isBiasT());
         }
 
         setLoading(false);
@@ -139,12 +135,8 @@ public class FCD2TunerEditor extends TunerEditor<FCDTuner, FCD2TunerConfiguratio
         add(getFrequencyPanel(), "wrap");
 
         add(new JSeparator(), "span,growx,push");
-        JPanel checkBoxPanel = new JPanel();
-        checkBoxPanel.setLayout(new MigLayout("insets 0", "[left][left][left]", ""));
-        checkBoxPanel.add(getLnaGainCheckBox());
-        checkBoxPanel.add(getMixerGainCheckBox());
-        checkBoxPanel.add(getBiasTCheckBox());
-        add(checkBoxPanel, "span,align left");
+        add(getLnaGainCheckBox());
+        add(getMixerGainCheckBox());
     }
 
     public JButton getTunerInfoButton()
@@ -212,37 +204,6 @@ public class FCD2TunerEditor extends TunerEditor<FCDTuner, FCD2TunerConfiguratio
         return mMixerGainCheckBox;
     }
 
-    /**
-     * Checkbox to enable/disable Bias-T power for active antennas
-     */
-    public JCheckBox getBiasTCheckBox()
-    {
-        if(mBiasTCheckBox == null)
-        {
-            mBiasTCheckBox = new JCheckBox("Bias-T");
-            mBiasTCheckBox.setEnabled(false);
-            mBiasTCheckBox.setToolTipText("Enable Bias-T power output for active antennas");
-            mBiasTCheckBox.addActionListener(event ->
-            {
-                if(hasTuner() && !isLoading())
-                {
-                    try
-                    {
-                        getController().setBiasT(getBiasTCheckBox().isSelected());
-                        save();
-                    }
-                    catch(SourceException e)
-                    {
-                        mLog.error("Couldn't set bias-T for FCD2", e);
-                        JOptionPane.showMessageDialog(mBiasTCheckBox, "Couldn't set Bias-T: " + e.getMessage());
-                    }
-                }
-            });
-        }
-
-        return mBiasTCheckBox;
-    }
-
     @Override
     public void setTunerLockState(boolean locked)
     {
@@ -294,7 +255,6 @@ public class FCD2TunerEditor extends TunerEditor<FCDTuner, FCD2TunerConfiguratio
             getConfiguration().setAutoPPMCorrectionEnabled(getAutoPPMCheckBox().isSelected());
             getConfiguration().setGainLNA(getLnaGainCheckBox().isSelected());
             getConfiguration().setGainMixer(getMixerGainCheckBox().isSelected());
-            getConfiguration().setBiasT(getBiasTCheckBox().isSelected());
             saveConfiguration();
         }
     }

src/main/java/io/github/dsheirer/source/tuner/hackrf/HackRFTunerController.java

@@ -32,11 +32,17 @@ import io.github.dsheirer.source.tuner.ITunerErrorListener;
 import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.TunerType;
 import io.github.dsheirer.source.tuner.configuration.TunerConfiguration;
-import io.github.dsheirer.source.tuner.manager.UsbDeviceLookup;
+import io.github.dsheirer.source.tuner.manager.TunerManager;
 import java.util.EnumSet;
 import java.util.Locale;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceDescriptor;
+import org.usb4java.DeviceHandle;
+import org.usb4java.DeviceList;
+import org.usb4java.LibUsb;
 
 /**
  * HackRF One, HackRF Pro, Jawbreaker and rad1o tuner controller, implemented with the jHackRF library (libhackrf).
@@ -246,21 +252,110 @@ public class HackRFTunerController extends TunerController
 
     /**
      * Reads the USB serial number of the device at this controller's USB bus and port, since libhackrf opens a
-     * specific device by serial number.
+     * specific device by serial number.  The device is closed again before returning so that libhackrf can open it.
      * @return serial number or null if the device doesn't report a serial number.
      * @throws SourceException if the device isn't found or can't be accessed.
      */
     private String readSerialNumber() throws SourceException
     {
-        String serial = UsbDeviceLookup.readSerialNumber(mBus, mPortAddress);
+        Context context = new Context();
+        int status = LibUsb.init(context);
 
-        //libhackrf compares, at most, the last 32 characters of the serial string
-        if(serial != null && serial.length() > 32)
+        if(status != LibUsb.SUCCESS)
         {
-            serial = serial.substring(serial.length() - 32);
+            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(status));
         }
 
-        return serial == null || serial.isEmpty() ? null : serial;
+        try
+        {
+            DeviceList deviceList = new DeviceList();
+            int count = LibUsb.getDeviceList(context, deviceList);
+
+            if(count < 0)
+            {
+                throw new SourceException("Can't get the USB device list - " + LibUsb.errorName(count));
+            }
+
+            try
+            {
+                for(Device device : deviceList)
+                {
+                    if(LibUsb.getBusNumber(device) == mBus && LibUsb.getPortNumber(device) > 0 &&
+                        mPortAddress != null && mPortAddress.equals(TunerManager.getPortAddress(device)))
+                    {
+                        return readSerialNumber(device);
+                    }
+                }
+            }
+            finally
+            {
+                LibUsb.freeDeviceList(deviceList, true);
+            }
+        }
+        finally
+        {
+            LibUsb.exit(context);
+        }
+
+        throw new SourceException("Couldn't find USB device at bus [" + mBus + "] port [" + mPortAddress + "]");
+    }
+
+    /**
+     * Reads the serial number from the device's USB serial string descriptor.
+     * @param device to read
+     * @return serial number or null if the device doesn't have a serial string.
+     * @throws SourceException if the device can't be opened.
+     */
+    private static String readSerialNumber(Device device) throws SourceException
+    {
+        DeviceDescriptor descriptor = new DeviceDescriptor();
+        int status = LibUsb.getDeviceDescriptor(device, descriptor);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't obtain tuner's device descriptor - " + LibUsb.errorName(status));
+        }
+
+        if(descriptor.iSerialNumber() == 0)
+        {
+            return null;
+        }
+
+        DeviceHandle handle = new DeviceHandle();
+        status = LibUsb.open(device, handle);
+
+        if(status == LibUsb.ERROR_ACCESS)
+        {
+            mLog.error("Access to USB tuner denied - (windows) reinstall zadig driver or (linux) blacklist driver and/or check udev rules");
+            throw new SourceException("access denied - if using linux, blacklist the default driver and/or install udev rules");
+        }
+        else if(status != LibUsb.SUCCESS)
+        {
+            mLog.error("Can't open USB tuner - check driver or Linux udev rules");
+            throw new SourceException("Can't open USB tuner - reinstall driver? - " + LibUsb.errorName(status));
+        }
+
+        try
+        {
+            String serial = LibUsb.getStringDescriptor(handle, descriptor.iSerialNumber());
+
+            if(serial != null)
+            {
+                serial = serial.trim();
+
+                //libhackrf compares, at most, the last 32 characters of the serial string
+                if(serial.length() > 32)
+                {
+                    serial = serial.substring(serial.length() - 32);
+                }
+            }
+
+            return serial == null || serial.isEmpty() ? null : serial;
+        }
+        finally
+        {
+            LibUsb.close(handle);
+        }
     }
 
     /**

src/main/java/io/github/dsheirer/source/tuner/hydrasdr/HydraSdrTunerController.java

@@ -34,13 +34,19 @@ import io.github.dsheirer.source.tuner.ITunerErrorListener;
 import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.TunerType;
 import io.github.dsheirer.source.tuner.configuration.TunerConfiguration;
-import io.github.dsheirer.source.tuner.manager.UsbDeviceLookup;
+import io.github.dsheirer.source.tuner.manager.TunerManager;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceDescriptor;
+import org.usb4java.DeviceHandle;
+import org.usb4java.DeviceList;
+import org.usb4java.LibUsb;
 
 /**
  * HydraSDR tuner controller, implemented with the jHydraSDR library (libhydrasdr).
@@ -203,17 +209,98 @@ public class HydraSdrTunerController extends TunerController
 
     /**
      * Reads the serial number of the device at this controller's USB bus and port, since libhydrasdr opens a specific
-     * device by serial number.  The USB serial string is formatted as: HYDRASDR SN:0123456789ABCDEF
+     * device by serial number.  The device is closed again before returning so that libhydrasdr can open it.
      * @return serial number
      * @throws SourceException if the device isn't found or can't be accessed.
      */
     private long readSerialNumber() throws SourceException
     {
-        String serial = UsbDeviceLookup.readSerialNumber(mBus, mPortAddress);
+        Context context = new Context();
+        int status = LibUsb.init(context);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(status));
+        }
 
         try
         {
-            return Long.parseUnsignedLong(serial.substring(serial.lastIndexOf(':') + 1).trim(), 16);
+            DeviceList deviceList = new DeviceList();
+            int count = LibUsb.getDeviceList(context, deviceList);
+
+            if(count < 0)
+            {
+                throw new SourceException("Can't get the USB device list - " + LibUsb.errorName(count));
+            }
+
+            try
+            {
+                for(Device device : deviceList)
+                {
+                    if(LibUsb.getBusNumber(device) == mBus && LibUsb.getPortNumber(device) > 0 &&
+                        mPortAddress != null && mPortAddress.equals(TunerManager.getPortAddress(device)))
+                    {
+                        return readSerialNumber(device);
+                    }
+                }
+            }
+            finally
+            {
+                LibUsb.freeDeviceList(deviceList, true);
+            }
+        }
+        finally
+        {
+            LibUsb.exit(context);
+        }
+
+        throw new SourceException("Couldn't find USB device at bus [" + mBus + "] port [" + mPortAddress + "]");
+    }
+
+    /**
+     * Reads the serial number from the device's USB serial string, formatted as: HYDRASDR SN:0123456789ABCDEF
+     * @param device to read
+     * @return serial number
+     * @throws SourceException if the device can't be opened or the serial string isn't valid.
+     */
+    private static long readSerialNumber(Device device) throws SourceException
+    {
+        DeviceDescriptor descriptor = new DeviceDescriptor();
+        int status = LibUsb.getDeviceDescriptor(device, descriptor);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't obtain tuner's device descriptor - " + LibUsb.errorName(status));
+        }
+
+        DeviceHandle handle = new DeviceHandle();
+        status = LibUsb.open(device, handle);
+
+        if(status == LibUsb.ERROR_ACCESS)
+        {
+            mLog.error("Access to USB tuner denied - (windows) reinstall zadig driver or (linux) blacklist driver and/or check udev rules");
+            throw new SourceException("access denied - if using linux, blacklist the default driver and/or install udev rules");
+        }
+        else if(status != LibUsb.SUCCESS)
+        {
+            mLog.error("Can't open USB tuner - check driver or Linux udev rules");
+            throw new SourceException("Can't open USB tuner - reinstall driver? - " + LibUsb.errorName(status));
+        }
+
+        String serial;
+
+        try
+        {
+            serial = LibUsb.getStringDescriptor(handle, descriptor.iSerialNumber());
+        }
+        finally
+        {
+            LibUsb.close(handle);
+        }
+
+        try
+        {
+            return Long.parseUnsignedLong(serial.substring(serial.lastIndexOf(':') + 1), 16);
         }
         catch(NullPointerException | NumberFormatException e)
         {

src/main/java/io/github/dsheirer/source/tuner/limesdr/LimeSdrTunerController.java

@@ -19,11 +19,6 @@
 
 package io.github.dsheirer.source.tuner.limesdr;
 
-import io.github.dsheirer.libusb.LibUsb;
-import io.github.dsheirer.libusb.UsbContext;
-import io.github.dsheirer.libusb.UsbDeviceHandle;
-import io.github.dsheirer.libusb.UsbDeviceInfo;
-import io.github.dsheirer.libusb.UsbException;
 import io.github.dsheirer.buffer.FloatNativeBuffer;
 import io.github.dsheirer.buffer.INativeBuffer;
 import io.github.dsheirer.limesdr.DeviceEntry;
@@ -43,7 +38,7 @@ import io.github.dsheirer.source.tuner.ITunerErrorListener;
 import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.TunerType;
 import io.github.dsheirer.source.tuner.configuration.TunerConfiguration;
-import io.github.dsheirer.source.tuner.manager.UsbDeviceLookup;
+import io.github.dsheirer.source.tuner.manager.TunerManager;
 import io.github.dsheirer.util.ThreadPool;
 import java.util.ArrayList;
 import java.util.List;
@@ -54,6 +49,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceDescriptor;
+import org.usb4java.DeviceHandle;
+import org.usb4java.DeviceList;
+import org.usb4java.LibUsb;
 
 /**
  * LimeSDR tuner controller, implemented with the jLimeSDR library (LimeSuiteNG).
@@ -447,42 +448,103 @@ public class LimeSdrTunerController extends TunerController
      */
     private UsbIdentity readUsbIdentity() throws SourceException
     {
-        try(UsbContext usb = UsbDeviceLookup.createContext())
-        {
-            UsbDeviceInfo device = UsbDeviceLookup.find(usb, mBus, mPortAddress);
-            String serial = null;
+        Context context = new Context();
+        int status = LibUsb.init(context);
 
-            if(device.serialNumberIndex() != 0)
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(status));
+        }
+
+        try
+        {
+            DeviceList deviceList = new DeviceList();
+            int count = LibUsb.getDeviceList(context, deviceList);
+
+            if(count < 0)
             {
-                try(UsbDeviceHandle handle = usb.open(device))
+                throw new SourceException("Can't get the USB device list - " + LibUsb.errorName(count));
+            }
+
+            try
+            {
+                for(Device device : deviceList)
+                {
+                    if(LibUsb.getBusNumber(device) == mBus && LibUsb.getPortNumber(device) > 0 &&
+                        mPortAddress != null && mPortAddress.equals(TunerManager.getPortAddress(device)))
+                    {
+                        return readUsbIdentity(device);
+                    }
+                }
+            }
+            finally
+            {
+                LibUsb.freeDeviceList(deviceList, true);
+            }
+        }
+        finally
+        {
+            LibUsb.exit(context);
+        }
+
+        throw new SourceException("Couldn't find USB device at bus [" + mBus + "] port [" + mPortAddress + "]");
+    }
+
+    /**
+     * Reads the vendor ID, product ID and serial number of the USB device.
+     */
+    private static UsbIdentity readUsbIdentity(Device device) throws SourceException
+    {
+        DeviceDescriptor descriptor = new DeviceDescriptor();
+        int status = LibUsb.getDeviceDescriptor(device, descriptor);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            throw new SourceException("Can't obtain tuner's device descriptor - " + LibUsb.errorName(status));
+        }
+
+        int vendor = descriptor.idVendor() & 0xFFFF;
+        int product = descriptor.idProduct() & 0xFFFF;
+        String serial = null;
+
+        if(descriptor.iSerialNumber() != 0)
+        {
+            DeviceHandle handle = new DeviceHandle();
+            status = LibUsb.open(device, handle);
+
+            if(status == LibUsb.SUCCESS)
+            {
+                try
                 {
                     //LimeSuiteNG aborts the application when it opens a device that another application is using,
                     //since the open throws a C++ exception through its C API.  Check that the device is free first.
-                    try
+                    status = LibUsb.claimInterface(handle, 0);
+
+                    if(status == LibUsb.ERROR_BUSY)
                     {
-                        handle.claimInterface(0);
-                        handle.releaseInterface(0);
+                        throw new SourceException("LimeSDR is in use by another application");
                     }
-                    catch(UsbException e)
+                    else if(status == LibUsb.SUCCESS)
                     {
-                        if(e.code() == UsbDeviceLookup.ERROR_BUSY)
-                        {
-                            throw new SourceException("LimeSDR is in use by another application");
-                        }
+                        LibUsb.releaseInterface(handle, 0);
                     }
 
-                    serial = handle.readString(device.serialNumberIndex());
-                    serial = serial != null && !serial.isBlank() ? serial : null;
+                    serial = LibUsb.getStringDescriptor(handle, descriptor.iSerialNumber());
+                    serial = serial != null && !serial.isBlank() ? serial.trim() : null;
                 }
-                catch(UsbException e)
+                finally
                 {
-                    //Expected on Windows, where libusb can't open a device that uses the Cypress or FTDI driver
-                    mLog.debug("Can't open LimeSDR to read its USB serial number - " + LibUsb.errorName(e.code()));
+                    LibUsb.close(handle);
                 }
             }
-
-            return new UsbIdentity(device.vendorId(), device.productId(), serial);
+            else
+            {
+                //Expected on Windows, where libusb can't open a device that uses the Cypress or FTDI driver
+                mLog.debug("Can't open LimeSDR to read its USB serial number - " + LibUsb.errorName(status));
+            }
         }
+
+        return new UsbIdentity(vendor, product, serial);
     }
 
     @Override

src/main/java/io/github/dsheirer/source/tuner/manager/TunerManager.java

@@ -20,13 +20,6 @@
 package io.github.dsheirer.source.tuner.manager;
 
 import io.github.dsheirer.gui.preference.tuner.RspDuoSelectionMode;
-import io.github.dsheirer.libusb.LibUsb;
-import io.github.dsheirer.libusb.UsbContext;
-import io.github.dsheirer.libusb.UsbDeviceInfo;
-import io.github.dsheirer.libusb.UsbException;
-import io.github.dsheirer.libusb.UsbHotplug;
-import io.github.dsheirer.libusb.UsbHotplugListener;
-import io.github.dsheirer.libusb.UsbLogLevel;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.preference.source.ChannelizerType;
 import io.github.dsheirer.sdrplay.DeviceInfo;
@@ -52,13 +45,22 @@ import io.github.dsheirer.source.tuner.sdrplay.DiscoveredRspTuner;
 import io.github.dsheirer.source.tuner.sdrplay.rspDuo.DiscoveredRspDuoTuner1;
 import io.github.dsheirer.source.tuner.ui.DiscoveredTunerModel;
 import io.github.dsheirer.util.ThreadPool;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceDescriptor;
+import org.usb4java.DeviceList;
+import org.usb4java.HotplugCallback;
+import org.usb4java.HotplugCallbackHandle;
+import org.usb4java.LibUsb;
 
 /**
  * Tuner manager provides access to tuners using USB, recording, sound-card and system-daemon accessible devices. This
@@ -71,12 +73,9 @@ public class TunerManager implements IDiscoveredTunerStatusListener
     private final UserPreferences mUserPreferences;
     private final DiscoveredTunerModel mDiscoveredTunerModel;
     private final TunerConfigurationManager mTunerConfigurationManager;
-    /**
-     * libusb error code for an unspecified error (LIBUSB_ERROR_OTHER)
-     */
-    private static final int LIBUSB_ERROR_OTHER = -99;
     private final HotplugEventSupport mHotplugEventSupport = new HotplugEventSupport();
-    private boolean mLibUsbAvailable = false;
+    private final Context mLibUsbApplicationContext = new Context();
+    private boolean mLibUsbInitialized = false;
     private SDRplay mSDRplay;
 
     /**
@@ -113,26 +112,60 @@ public class TunerManager implements IDiscoveredTunerStatusListener
     {
         mLog.info("Discovering tuners ...");
 
+        boolean libUsbAvailable = false;
+
         try
         {
-            //Loads the libusb library that jlibusb bundles, which the USB tuner libraries share
-            mLog.info("LibUsb Version: " + LibUsb.version() + " - hotplug detection: " +
-                    (LibUsb.hasHotplug() ? "native" : "polling"));
-            mLibUsbAvailable = true;
+            int api = LibUsb.getApiVersion();
+            libUsbAvailable = true;
+            mLog.info("LibUsb API Version: " + ((api >> 24) & 0xFF) + "." + ((api >> 16) & 0xFF) + "." + (api & 0xFFFF));
+            mLog.info("LibUsb Version: " + LibUsb.getVersion());
         }
-        catch(LinkageError | RuntimeException e)
+        catch(Exception e)
         {
-            String os = System.getProperty("os.name");
-            String version = System.getProperty("os.version");
-            mLog.error("Unable to load the libusb library for communication with USB tuner(s) on os [" + os +
-                    "] version [" + version + "].  To use a different libusb build, start sdrtrunk with " +
-                    "-Djlibusb.library.path=<directory containing libusb>", e);
+            final String os = System.getProperty("os.name").toLowerCase();
+            final String version = System.getProperty("os.version");
+
+            //Special handling for MacOS Tahoe version 26 issue with LibUsb.
+            if(os != null && os.startsWith("macos") && version != null && version.startsWith("26"))
+            {
+                mLog.warn("Unable to load libusb library for communication with USB tuner(s)");
+                mLog.warn("Mac OS Tahoe [" + os + "] version [" + version + "] detected.  There is an issue");
+                mLog.warn("with libusb for this OS version.  You might consider manually installing the latest");
+                mLog.warn("version of the libusb library.  In a terminal window type:");
+                mLog.warn("");
+                mLog.warn("\t\tbrew install libusb --HEAD");
+                mLog.warn("");
+            }
+            else
+            {
+                mLog.error("Error while loading libusb for os [" + os + "] version [" + version + "]", e);
+            }
         }
 
-        if(mLibUsbAvailable)
+        if(libUsbAvailable)
         {
-            discoverUSBTuners();
-            mHotplugEventSupport.start();
+            try
+            {
+                int status = LibUsb.init(mLibUsbApplicationContext);
+
+                if(status == LibUsb.SUCCESS)
+                {
+                    mLibUsbInitialized = true;
+                    //            LibUsb.setOption(mLibUsbApplicationContext, LibUsb.OPTION_LOG_LEVEL, LibUsb.LOG_LEVEL_DEBUG);
+                    discoverUSBTuners();
+                }
+            }
+            catch(Exception e)
+            {
+                mLog.error("Error initializing LibUsb and usb4java library", e);
+            }
+
+            if(mLibUsbInitialized)
+            {
+                mHotplugEventSupport.start();
+            }
+
             discoverSdrPlayTuners();
         }
 
@@ -144,14 +177,19 @@ public class TunerManager implements IDiscoveredTunerStatusListener
      */
     public void stop()
     {
-        //Stop hotplug detection first so that no tuner is added or removed while the tuners are released
-        mHotplugEventSupport.stop();
-
         //Stop all tuners
         mDiscoveredTunerModel.releaseDiscoveredTuners();
 
         //Shutdown SDRplay API instance
         closeSDRplay();
+
+        //Shutdown LibUsb
+        if(mLibUsbInitialized)
+        {
+            mHotplugEventSupport.stop();
+            LibUsb.exit(mLibUsbApplicationContext);
+            mLibUsbInitialized = false;
+        }
     }
 
     /**
@@ -167,125 +205,103 @@ public class TunerManager implements IDiscoveredTunerStatusListener
      */
     private void discoverUSBTuners()
     {
-        List<DiscoveredUSBTuner> discoveredUSBTuners = new ArrayList<>();
+        if(mLibUsbInitialized)
+        {
+            List<DiscoveredUSBTuner> discoveredUSBTuners = new ArrayList<>();
 
-        try(UsbContext usb = UsbContext.create())
-        {
-            List<UsbDeviceInfo> devices = getDeviceList(usb);
-
-            if(devices != null)
-            {
-                mLog.info("LibUsb - discovered [" + devices.size() + "] potential usb devices");
-
-                for(UsbDeviceInfo device: devices)
-                {
-                    DiscoveredUSBTuner discoveredUSBTuner = createDiscoveredTuner(device);
-
-                    if(discoveredUSBTuner != null)
-                    {
-                        mLog.info("Discovered tuner at USB Bus [" + discoveredUSBTuner.getBus() + "] Port [" +
-                                discoveredUSBTuner.getPortAddress() + "] Tuner Class [" +
-                                discoveredUSBTuner.getTunerClass() + "]");
-                        discoveredUSBTuners.add(discoveredUSBTuner);
-                    }
-                }
-            }
-        }
-        catch(UsbException | RuntimeException e)
-        {
-            mLog.error("LibUsb - error during USB device discovery", e);
-        }
-
-        for(DiscoveredUSBTuner discoveredUSBTuner: discoveredUSBTuners)
-        {
-            addUsbTuner(discoveredUSBTuner);
-        }
-    }
-
-    /**
-     * Lists the USB devices.  If listing fails with error -99, retries once with libusb warning logging turned on so
-     * that the log shows what caused it.
-     * @param usb context to list devices from
-     * @return devices, or null if they couldn't be listed
-     */
-    private List<UsbDeviceInfo> getDeviceList(UsbContext usb)
-    {
-        try
-        {
-            return usb.devices();
-        }
-        catch(UsbException e)
-        {
-            if(e.code() != LIBUSB_ERROR_OTHER)
-            {
-                mLog.error("LibUsb - error during get device list - " + e.getMessage());
-                return null;
-            }
-        }
-
-        try
-        {
-            mLog.info("LibUsb reported error -99 during get device list - increasing logging level and retrying");
-            usb.setLogLevel(UsbLogLevel.WARNING);
-            List<UsbDeviceInfo> devices = usb.devices();
-            mLog.info("LibUsb - get device list count [" + devices.size() + "] during retry");
-            return devices;
-        }
-        catch(UsbException e)
-        {
-            mLog.info("LibUsb - get device list reported error during retry - " + e.getMessage());
-            return null;
-        }
-        finally
-        {
             try
             {
-                usb.setLogLevel(UsbLogLevel.NONE);
+                DeviceList deviceList = new DeviceList();
+                int deviceCount = LibUsb.getDeviceList(mLibUsbApplicationContext, deviceList);
+
+                if(deviceCount >= 0)
+                {
+                    mLog.info("LibUsb - discovered [" + deviceCount + "] potential usb devices");
+
+                    for(Device device: deviceList)
+                    {
+                        int bus = LibUsb.getBusNumber(device);
+                        int port = LibUsb.getPortNumber(device);
+
+                        if(port > 0)
+                        {
+                            DeviceDescriptor deviceDescriptor = new DeviceDescriptor();
+                            int status = LibUsb.getDeviceDescriptor(device, deviceDescriptor);
+
+                            if(status == LibUsb.SUCCESS)
+                            {
+                                TunerClass tunerClass = TunerClass.lookup(deviceDescriptor.idVendor(),
+                                        deviceDescriptor.idProduct());
+
+                                String portAddress = getPortAddress(device);
+
+                                if(tunerClass.isSupportedUsbTuner())
+                                {
+                                    mLog.info("Discovered tuner at USB Bus [" + bus + "] Port [" + portAddress +
+                                            "] Tuner Class [" + tunerClass + "]");
+                                    ChannelizerType channelizerType = mUserPreferences.getTunerPreference().getChannelizerType();
+                                    DiscoveredUSBTuner discoveredUSBTuner = new DiscoveredUSBTuner(tunerClass, bus,
+                                            portAddress, channelizerType);
+                                    discoveredUSBTuners.add(discoveredUSBTuner);
+                                }
+                            }
+                            else
+                            {
+                                mLog.error("LibUsb - unable to get device descriptor for device on bus [" + bus +
+                                        "] port [" + port + "] - status [" + status + "] - " + LibUsb.errorName(status));
+                            }
+                        }
+
+                        //Unref the device - it will be rediscovered under the device context when it is started
+                        LibUsb.unrefDevice(device);
+                    }
+
+                    LibUsb.freeDeviceList(deviceList, false);
+                }
+                //If the get device list operation generated error -99, turn on warning logging and try device list
+                // again to see what's causing it.
+                else if(deviceCount == LibUsb.ERROR_OTHER)
+                {
+                    try
+                    {
+                        mLog.info("LibUsb reported error -99 during get device list - increasing logging level and retrying");
+                        LibUsb.setOption(mLibUsbApplicationContext, LibUsb.OPTION_LOG_LEVEL, LibUsb.LOG_LEVEL_WARNING);
+                        deviceCount = LibUsb.getDeviceList(mLibUsbApplicationContext, deviceList);
+                        if(deviceCount >=0)
+                        {
+                            mLog.info("LibUsb - get device list count [" + deviceCount + "] during retry");
+                            LibUsb.freeDeviceList(deviceList, false);
+                        }
+                        else
+                        {
+                            mLog.info("LibUsb - get device list reported error [" + deviceCount + "/" +
+                                    LibUsb.errorName(deviceCount) + "] during retry");
+                        }
+                        LibUsb.setOption(mLibUsbApplicationContext, LibUsb.OPTION_LOG_LEVEL, LibUsb.LOG_LEVEL_NONE);
+                        mLog.info("LibUse - get device list reattempt complete - if additional logging was generated please notify developer");
+                    }
+                    catch(Exception e)
+                    {
+                        mLog.info("LibUsb error during get device list reattempt", e);
+                    }
+                }
+                else
+                {
+                    mLog.error("LibUsb - error [" + deviceCount + "/" + LibUsb.errorName(deviceCount) + "] during get device list");
+                }
             }
-            catch(UsbException e)
+            catch(Exception e)
             {
-                //Logging level only - nothing else to do
+                mLog.error("LibUsb - error during USB device discovery", e);
             }
 
-            mLog.info("LibUsb - get device list reattempt complete - if additional logging was generated please notify developer");
+            for(DiscoveredUSBTuner discoveredUSBTuner: discoveredUSBTuners)
+            {
+                addUsbTuner(discoveredUSBTuner);
+            }
         }
     }
 
-    /**
-     * Identifies the USB tuner class of a device.
-     * @param device to identify
-     * @return tuner class, or null for a root hub or a device that isn't a supported tuner
-     */
-    private static TunerClass getSupportedTunerClass(UsbDeviceInfo device)
-    {
-        //A root hub has no port numbers
-        if(device.portNumbers().isEmpty())
-        {
-            return null;
-        }
-
-        TunerClass tunerClass = TunerClass.lookup((short)device.vendorId(), (short)device.productId());
-        return tunerClass.isSupportedUsbTuner() ? tunerClass : null;
-    }
-
-    /**
-     * Creates a discovered tuner for a USB device.
-     * @param device to create a tuner for
-     * @return discovered tuner, or null if the device isn't a supported tuner
-     */
-    private DiscoveredUSBTuner createDiscoveredTuner(UsbDeviceInfo device)
-    {
-        TunerClass tunerClass = getSupportedTunerClass(device);
-
-        if(tunerClass == null)
-        {
-            return null;
-        }
-
-        ChannelizerType channelizerType = mUserPreferences.getTunerPreference().getChannelizerType();
-        return new DiscoveredUSBTuner(tunerClass, device.busNumber(), UsbPortAddress.of(device), channelizerType);
-    }
-
     /**
      * Determines if the USB device is a supported tuner and add if it has not already been added/discovered.
      * @param discoveredUSBTuner to add
@@ -664,104 +680,161 @@ public class TunerManager implements IDiscoveredTunerStatusListener
     }
 
     /**
-     * USB hotplug support to detect when USB tuners are added or removed.  jlibusb reports changes as they happen
-     * where libusb supports hotplug (Linux and macOS) and polls the USB device list elsewhere (Windows).
-     *
-     * Tuners already connected when detection starts are reported as arrivals too.  Those were added during discovery
-     * at startup and are ignored here because the tuner model already has a tuner at that bus and port.
+     * Creates a dotted-notation string representing the port numbers for the device from the root hub through any
+     * intermediate hubs.
+     * @param device to inspect
+     * @return formatted address
      */
-    public class HotplugEventSupport implements UsbHotplugListener
+    public static String getPortAddress(Device device)
     {
-        private UsbHotplug mUsbHotplug;
+        ByteBuffer portNumberArray = ByteBuffer.allocateDirect(7);  //7 ports maximum.
+        int portCount = LibUsb.getPortNumbers(device, portNumberArray);
+        portNumberArray.rewind();
+
+        StringBuilder sb = new StringBuilder();
+
+        for(int x = 0; x < portCount; x++)
+        {
+            if(x > 0)
+            {
+                sb.append(".");
+            }
+
+            sb.append(portNumberArray.get());
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * USB hotplug event listener to register, unregister and detect when USB devices are added or removed.
+     *
+     * Note: hotplug is not supported on all platforms.
+     */
+    public class HotplugEventSupport implements HotplugCallback
+    {
+        private static final int HOTPLUG_CONTINUE_EVENT_SUPPORT = 0;
+        private HotplugCallbackHandle mHotplugCallbackHandle;
+        private ScheduledFuture<?> mEventProcessorFuture;
 
         /**
-         * Starts hotplug detection of supported USB tuners.
+         * LibUsb hotplug event notification
+         * @param context used for hotplug event registration
+         * @param device that arrived or left
+         * @param event value, arrived event or left event
+         * @param userData not used
+         * @return
+         */
+        @Override
+        public int processEvent(Context context, Device device, int event, Object userData)
+        {
+            int bus = LibUsb.getBusNumber(device);
+            int port = LibUsb.getPortNumber(device);
+
+            if(port > 0)
+            {
+                String portAddress = getPortAddress(device);
+
+                switch(event)
+                {
+                    case LibUsb.HOTPLUG_EVENT_DEVICE_ARRIVED:
+                        DeviceDescriptor deviceDescriptor = new DeviceDescriptor();
+                        int status = LibUsb.getDeviceDescriptor(device, deviceDescriptor);
+
+                        if(status == LibUsb.SUCCESS)
+                        {
+                            TunerClass tunerClass = TunerClass.lookup(deviceDescriptor.idVendor(), deviceDescriptor.idProduct());
+
+                            if(tunerClass.isSupportedUsbTuner())
+                            {
+                                mLog.info("Tuner plug-in detected at USB Bus [" + bus + "] Port [" + port +
+                                        "] Tuner Class [" + tunerClass + "]");
+                                ChannelizerType channelizerType = mUserPreferences.getTunerPreference().getChannelizerType();
+                                DiscoveredUSBTuner discoveredUSBTuner = new DiscoveredUSBTuner(tunerClass, bus,
+                                        portAddress, channelizerType);
+
+                                if(tunerClass.isFuncubeTuner())
+                                {
+                                    //Funcube tuners take a few moments to init the sound card interface.  Delay adding
+                                    //the tuner so that it can be started correctly.
+                                    ThreadPool.SCHEDULED.schedule(() ->
+                                    {
+                                        addUsbTuner(discoveredUSBTuner);
+                                    }, 2, TimeUnit.SECONDS);
+                                }
+                                else
+                                {
+                                    addUsbTuner(discoveredUSBTuner);
+                                }
+                            }
+                        }
+                        break;
+                    case LibUsb.HOTPLUG_EVENT_DEVICE_LEFT:
+                        DiscoveredTuner removed = removeUsbTuner(bus, portAddress);
+
+                        if(removed != null)
+                        {
+                            mLog.info("Tuner Unplugged: " + removed.getId());
+                        }
+                        break;
+                }
+            }
+
+            return HOTPLUG_CONTINUE_EVENT_SUPPORT;
+        }
+
+        /**
+         * Registers for hotplug event notifications, if the capability is supported on this platform and starts an
+         * event processing timer to process hotplug events.
          */
         public void start()
         {
-            try
+            if(LibUsb.hasCapability(LibUsb.CAP_HAS_HOTPLUG))
             {
-                mUsbHotplug = UsbHotplug.start(device -> getSupportedTunerClass(device) != null, this);
-                mLog.info("LibUsb - started USB hotplug detection (" +
-                        (mUsbHotplug.mode() == UsbHotplug.Mode.NATIVE ? "native" : "polling") + ")");
-            }
-            catch(UsbException | RuntimeException e)
-            {
-                mLog.error("LibUsb - unable to start USB hotplug detection", e);
-                mUsbHotplug = null;
-            }
-        }
+                mHotplugCallbackHandle = new HotplugCallbackHandle();
+                int events = LibUsb.HOTPLUG_EVENT_DEVICE_ARRIVED | LibUsb.HOTPLUG_EVENT_DEVICE_LEFT;
+                int flags = LibUsb.HOTPLUG_ENUMERATE;
+                int vendorId = LibUsb.HOTPLUG_MATCH_ANY;
+                int productId = LibUsb.HOTPLUG_MATCH_ANY;
+                int deviceClass = LibUsb.HOTPLUG_MATCH_ANY;
 
-        /**
-         * Stops hotplug detection.  Waits for an arrival or removal that is being processed to finish.
-         */
-        public void stop()
-        {
-            if(mUsbHotplug != null)
-            {
-                mUsbHotplug.close();
-                mUsbHotplug = null;
-            }
-        }
+                mLog.info("LibUsb - starting HotPlug detection");
+                int status = LibUsb.hotplugRegisterCallback(mLibUsbApplicationContext, events, flags, vendorId,
+                        productId, deviceClass, this, "sdrtrunk hotplug support", mHotplugCallbackHandle);
 
-        /**
-         * A supported USB tuner was connected.  Called on the jlibusb hotplug dispatch thread.
-         * @param device that arrived
-         */
-        @Override
-        public void arrived(UsbDeviceInfo device)
-        {
-            try
-            {
-                DiscoveredUSBTuner discoveredUSBTuner = createDiscoveredTuner(device);
-
-                if(discoveredUSBTuner == null ||
-                   mDiscoveredTunerModel.hasUsbTuner(discoveredUSBTuner.getBus(), discoveredUSBTuner.getPortAddress()))
+                if(status == LibUsb.SUCCESS)
                 {
-                    return;
-                }
-
-                mLog.info("Tuner plug-in detected at USB Bus [" + discoveredUSBTuner.getBus() + "] Port [" +
-                        discoveredUSBTuner.getPortAddress() + "] Tuner Class [" + discoveredUSBTuner.getTunerClass() + "]");
-
-                if(discoveredUSBTuner.getTunerClass().isFuncubeTuner())
-                {
-                    //Funcube tuners take a few moments to init the sound card interface.  Delay adding
-                    //the tuner so that it can be started correctly.
-                    ThreadPool.SCHEDULED.schedule(() -> addUsbTuner(discoveredUSBTuner), 2, TimeUnit.SECONDS);
+                    Runnable eventHandler = () -> LibUsb.handleEvents(mLibUsbApplicationContext);
+                    mEventProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(eventHandler,
+                            0, 1, TimeUnit.SECONDS);
                 }
                 else
                 {
-                    addUsbTuner(discoveredUSBTuner);
+                    mHotplugCallbackHandle = null;
+                    mLog.info("LibUsb - unable to register device hotplug listener - " + LibUsb.errorName(status));
                 }
             }
-            catch(Exception e)
+            else
             {
-                mLog.error("Error adding USB tuner after plug-in at USB Bus [" + device.busNumber() + "] Port [" +
-                        UsbPortAddress.of(device) + "]", e);
+                mLog.info("LibUsb Hotplug event notification Is Not Supported on this platform.");
             }
         }
 
         /**
-         * A supported USB tuner was disconnected.  Called on the jlibusb hotplug dispatch thread.
-         * @param device that left
+         * Unregisters from hotplug event notifications and stops the event processing timer
          */
-        @Override
-        public void left(UsbDeviceInfo device)
+        public void stop()
         {
-            try
+            if(mHotplugCallbackHandle != null)
             {
-                DiscoveredTuner removed = removeUsbTuner(device.busNumber(), UsbPortAddress.of(device));
-
-                if(removed != null)
-                {
-                    mLog.info("Tuner Unplugged: " + removed.getId());
-                }
+                LibUsb.hotplugDeregisterCallback(mLibUsbApplicationContext, mHotplugCallbackHandle);
+                mHotplugCallbackHandle = null;
             }
-            catch(Exception e)
+
+            if(mEventProcessorFuture != null)
             {
-                mLog.error("Error removing USB tuner after unplug at USB Bus [" + device.busNumber() + "] Port [" +
-                        UsbPortAddress.of(device) + "]", e);
+                mEventProcessorFuture.cancel(true);
+                mEventProcessorFuture = null;
             }
         }
     }

src/main/java/io/github/dsheirer/source/tuner/manager/UsbDeviceLookup.java

@@ -1,195 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 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 <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.source.tuner.manager;
-
-import io.github.dsheirer.libusb.LibUsb;
-import io.github.dsheirer.libusb.UsbContext;
-import io.github.dsheirer.libusb.UsbDeviceHandle;
-import io.github.dsheirer.libusb.UsbDeviceInfo;
-import io.github.dsheirer.libusb.UsbException;
-import io.github.dsheirer.source.SourceException;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Finds the USB device at a tuner's bus and port address and reads its USB identity through jlibusb.
- *
- * The tuner libraries open a device by serial number or by index rather than by bus and port, so a tuner controller
- * uses this to identify the device that the tuner manager discovered at a bus and port before handing it to its
- * library.  Devices are closed again before returning so that the library can open them.
- */
-public final class UsbDeviceLookup
-{
-    private static final Logger mLog = LoggerFactory.getLogger(UsbDeviceLookup.class);
-
-    /**
-     * libusb error code when the user doesn't have permission to open the device (LIBUSB_ERROR_ACCESS)
-     */
-    public static final int ERROR_ACCESS = -3;
-
-    /**
-     * libusb error code when another program or driver has claimed the interface (LIBUSB_ERROR_BUSY)
-     */
-    public static final int ERROR_BUSY = -6;
-
-    private UsbDeviceLookup()
-    {
-    }
-
-    /**
-     * Creates a libusb context.  Close it when done.
-     * @throws SourceException if libusb can't be initialized
-     */
-    public static UsbContext createContext() throws SourceException
-    {
-        try
-        {
-            return UsbContext.create();
-        }
-        catch(UsbException e)
-        {
-            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(e.code()));
-        }
-    }
-
-    /**
-     * Lists the USB devices, in libusb device list order.
-     * @param usb context
-     * @throws SourceException if the device list isn't available
-     */
-    public static List<UsbDeviceInfo> devices(UsbContext usb) throws SourceException
-    {
-        try
-        {
-            return usb.devices();
-        }
-        catch(UsbException e)
-        {
-            throw new SourceException("Can't get the USB device list - " + LibUsb.errorName(e.code()));
-        }
-    }
-
-    /**
-     * Indicates if the device is at the bus and port address.
-     * @param device to test
-     * @param bus number
-     * @param portAddress in dotted notation, such as 2.3
-     */
-    public static boolean isAt(UsbDeviceInfo device, int bus, String portAddress)
-    {
-        return device.busNumber() == bus && !device.portNumbers().isEmpty() && portAddress != null &&
-                portAddress.equals(UsbPortAddress.of(device));
-    }
-
-    /**
-     * Finds the device at the bus and port address.
-     * @param usb context
-     * @param bus number
-     * @param portAddress in dotted notation, such as 2.3
-     * @throws SourceException if no device is at that bus and port
-     */
-    public static UsbDeviceInfo find(UsbContext usb, int bus, String portAddress) throws SourceException
-    {
-        for(UsbDeviceInfo device: devices(usb))
-        {
-            if(isAt(device, bus, portAddress))
-            {
-                return device;
-            }
-        }
-
-        throw new SourceException("Couldn't find USB device at bus [" + bus + "] port [" + portAddress + "]");
-    }
-
-    /**
-     * Finds the device at the bus and port address.
-     * @param bus number
-     * @param portAddress in dotted notation, such as 2.3
-     * @throws SourceException if no device is at that bus and port
-     */
-    public static UsbDeviceInfo find(int bus, String portAddress) throws SourceException
-    {
-        try(UsbContext usb = createContext())
-        {
-            return find(usb, bus, portAddress);
-        }
-    }
-
-    /**
-     * Opens the device.  Close the handle before the context.
-     * @param usb context
-     * @param device to open
-     * @throws SourceException if the device can't be opened, logging the likely cause
-     */
-    public static UsbDeviceHandle open(UsbContext usb, UsbDeviceInfo device) throws SourceException
-    {
-        try
-        {
-            return usb.open(device);
-        }
-        catch(UsbException e)
-        {
-            if(e.code() == ERROR_ACCESS)
-            {
-                mLog.error("Access to USB tuner denied - (windows) reinstall zadig driver or (linux) blacklist driver and/or check udev rules");
-                throw new SourceException("access denied - if using linux, blacklist the default driver and/or install udev rules");
-            }
-
-            mLog.error("Can't open USB tuner - check driver or Linux udev rules");
-            throw new SourceException("Can't open USB tuner - reinstall driver? - " + LibUsb.errorName(e.code()));
-        }
-    }
-
-    /**
-     * Reads the device's USB serial string.
-     * @param usb context
-     * @param device to read
-     * @return serial, or null if the device doesn't have a serial string or it can't be read
-     * @throws SourceException if the device has a serial string but can't be opened
-     */
-    public static String readSerialNumber(UsbContext usb, UsbDeviceInfo device) throws SourceException
-    {
-        if(device.serialNumberIndex() == 0)
-        {
-            return null;
-        }
-
-        try(UsbDeviceHandle handle = open(usb, device))
-        {
-            return handle.readString(device.serialNumberIndex());
-        }
-    }
-
-    /**
-     * Reads the USB serial string of the device at the bus and port address.
-     * @param bus number
-     * @param portAddress in dotted notation, such as 2.3
-     * @return serial, or null if the device doesn't have a serial string or it can't be read
-     * @throws SourceException if no device is at that bus and port, or it can't be opened
-     */
-    public static String readSerialNumber(int bus, String portAddress) throws SourceException
-    {
-        try(UsbContext usb = createContext())
-        {
-            return readSerialNumber(usb, find(usb, bus, portAddress));
-        }
-    }
-}

src/main/java/io/github/dsheirer/source/tuner/manager/UsbPortAddress.java

@@ -1,53 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 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 <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.source.tuner.manager;
-
-import io.github.dsheirer.libusb.UsbDeviceInfo;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Formats the USB port address of a device: the port numbers from the root hub through any intermediate hubs, in
- * dotted notation such as 2.3.  Together with the bus number it identifies the physical USB socket of a tuner.
- *
- * The tuner manager discovers tuners at this address and the tuner controllers find their device again by it, so it
- * is formatted in one place.
- */
-public final class UsbPortAddress
-{
-    private UsbPortAddress()
-    {
-    }
-
-    /**
-     * Port address of a device.
-     * @param device to inspect
-     * @return formatted address, or an empty string for a root hub
-     */
-    public static String of(UsbDeviceInfo device)
-    {
-        return format(device.portNumbers());
-    }
-
-    private static String format(List<Integer> ports)
-    {
-        return ports.stream().map(String::valueOf).collect(Collectors.joining("."));
-    }
-}

src/main/java/io/github/dsheirer/source/tuner/rtl/RTL2832TunerController.java

@@ -18,10 +18,6 @@
  */
 package io.github.dsheirer.source.tuner.rtl;
 
-import io.github.dsheirer.libusb.UsbContext;
-import io.github.dsheirer.libusb.UsbDeviceHandle;
-import io.github.dsheirer.libusb.UsbDeviceInfo;
-import io.github.dsheirer.libusb.UsbException;
 import io.github.dsheirer.buffer.ByteNativeBufferFactory;
 import io.github.dsheirer.buffer.INativeBuffer;
 import io.github.dsheirer.rtlsdr.DeviceInfo;
@@ -36,7 +32,7 @@ import io.github.dsheirer.source.tuner.TunerClass;
 import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.TunerType;
 import io.github.dsheirer.source.tuner.configuration.TunerConfiguration;
-import io.github.dsheirer.source.tuner.manager.UsbDeviceLookup;
+import io.github.dsheirer.source.tuner.manager.TunerManager;
 import io.github.dsheirer.source.tuner.rtl.e4k.E4KTunerConfiguration;
 import io.github.dsheirer.source.tuner.rtl.fc0012.FC0012TunerConfiguration;
 import io.github.dsheirer.source.tuner.rtl.fc0013.FC0013TunerConfiguration;
@@ -48,6 +44,12 @@ import java.util.Arrays;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usb4java.Context;
+import org.usb4java.Device;
+import org.usb4java.DeviceDescriptor;
+import org.usb4java.DeviceHandle;
+import org.usb4java.DeviceList;
+import org.usb4java.LibUsb;
 
 /**
  * RTL-2832 tuner controller, implemented with the jRTL library (librtlsdr from rtl-sdr-blog).
@@ -326,40 +328,73 @@ public class RTL2832TunerController extends TunerController
      */
     private UsbIdentity readUsbIdentity() throws SourceException
     {
-        try(UsbContext usb = UsbDeviceLookup.createContext())
+        Context context = new Context();
+        int status = LibUsb.init(context);
+
+        if(status != LibUsb.SUCCESS)
         {
-            //RTL-2832 devices that precede this controller's device in the device list
-            List<UsbDeviceInfo> earlierDevices = new ArrayList<>();
+            throw new SourceException("Can't initialize libusb library - " + LibUsb.errorName(status));
+        }
 
-            for(UsbDeviceInfo device : UsbDeviceLookup.devices(usb))
+        try
+        {
+            DeviceList deviceList = new DeviceList();
+            int count = LibUsb.getDeviceList(context, deviceList);
+
+            if(count < 0)
             {
-                if(TunerClass.lookup((short)device.vendorId(), (short)device.productId()) != TunerClass.RTL2832)
-                {
-                    continue;
-                }
+                throw new SourceException("Can't get the USB device list - " + LibUsb.errorName(count));
+            }
 
-                if(UsbDeviceLookup.isAt(device, mBus, mPortAddress))
-                {
-                    mUsbSerialNumberIndex = device.serialNumberIndex();
-                    String serial = readSerial(usb, device, true);
-                    int serialPosition = 0;
+            try
+            {
+                //RTL-2832 devices that precede this controller's device in the device list
+                List<Device> earlierDevices = new ArrayList<>();
+                List<DeviceDescriptor> earlierDescriptors = new ArrayList<>();
 
-                    if(serial != null)
+                for(Device device : deviceList)
+                {
+                    DeviceDescriptor descriptor = new DeviceDescriptor();
+
+                    if(LibUsb.getDeviceDescriptor(device, descriptor) != LibUsb.SUCCESS ||
+                       TunerClass.lookup(descriptor.idVendor(), descriptor.idProduct()) != TunerClass.RTL2832)
                     {
-                        for(UsbDeviceInfo earlierDevice : earlierDevices)
-                        {
-                            if(serial.equals(readSerial(usb, earlierDevice, false)))
-                            {
-                                serialPosition++;
-                            }
-                        }
+                        continue;
                     }
 
-                    return new UsbIdentity(serial, serialPosition, earlierDevices.size());
-                }
+                    if(LibUsb.getBusNumber(device) == mBus && LibUsb.getPortNumber(device) > 0 &&
+                       mPortAddress != null && mPortAddress.equals(TunerManager.getPortAddress(device)))
+                    {
+                        mUsbSerialNumberIndex = 0xFF & descriptor.iSerialNumber();
+                        String serial = readSerial(device, descriptor, true);
+                        int serialPosition = 0;
 
-                earlierDevices.add(device);
+                        if(serial != null)
+                        {
+                            for(int x = 0; x < earlierDevices.size(); x++)
+                            {
+                                if(serial.equals(readSerial(earlierDevices.get(x), earlierDescriptors.get(x), false)))
+                                {
+                                    serialPosition++;
+                                }
+                            }
+                        }
+
+                        return new UsbIdentity(serial, serialPosition, earlierDevices.size());
+                    }
+
+                    earlierDevices.add(device);
+                    earlierDescriptors.add(descriptor);
+                }
             }
+            finally
+            {
+                LibUsb.freeDeviceList(deviceList, true);
+            }
+        }
+        finally
+        {
+            LibUsb.exit(context);
         }
 
         throw new SourceException("Couldn't find USB device at bus [" + mBus + "] port [" + mPortAddress + "]");
@@ -367,32 +402,51 @@ public class RTL2832TunerController extends TunerController
 
     /**
      * Reads the device's USB serial string.
-     * @param usb context
      * @param device to read
+     * @param descriptor for the device
      * @param required true to throw an exception when the device can't be opened, false to return null
      * @return serial or null if the device doesn't have a serial string
      * @throws SourceException if the device is required and it can't be opened.
      */
-    private static String readSerial(UsbContext usb, UsbDeviceInfo device, boolean required) throws SourceException
+    private static String readSerial(Device device, DeviceDescriptor descriptor, boolean required) throws SourceException
     {
-        if(!required)
+        if(descriptor.iSerialNumber() == 0)
         {
-            if(device.serialNumberIndex() == 0)
-            {
-                return null;
-            }
-
-            try(UsbDeviceHandle handle = usb.open(device))
-            {
-                return handle.readString(device.serialNumberIndex());
-            }
-            catch(UsbException e)
-            {
-                return null;
-            }
+            return null;
         }
 
-        return UsbDeviceLookup.readSerialNumber(usb, device);
+        DeviceHandle handle = new DeviceHandle();
+        int status = LibUsb.open(device, handle);
+
+        if(status != LibUsb.SUCCESS)
+        {
+            if(!required)
+            {
+                return null;
+            }
+
+            if(status == LibUsb.ERROR_ACCESS)
+            {
+                mLog.error("Access to USB tuner denied - (windows) reinstall zadig driver or (linux) check udev rules");
+                throw new SourceException("access denied - if using linux, install udev rules");
+            }
+
+            mLog.error("Can't open USB tuner - check driver or Linux udev rules");
+            throw new SourceException("Can't open USB tuner - reinstall driver? - " + LibUsb.errorName(status));
+        }
+
+        try
+        {
+            return LibUsb.getStringDescriptor(handle, descriptor.iSerialNumber());
+        }
+        catch(RuntimeException e)
+        {
+            return null;
+        }
+        finally
+        {
+            LibUsb.close(handle);
+        }
     }
 
     /**

src/main/java/io/github/dsheirer/source/tuner/ui/DiscoveredTunerModel.java

@@ -320,7 +320,7 @@ public class DiscoveredTunerModel extends AbstractTableModel implements Listener
         {
             DiscoveredTuner discoveredTuner = mDiscoveredTuners.stream()
                     .filter(tuner -> tuner instanceof DiscoveredUSBTuner usbTuner &&
-                            usbTuner.isAt(bus, portAddress)).findFirst().orElse(null);
+                            usbTuner.isAt(bus, portAddress)).findFirst().get();
 
             if(discoveredTuner != null)
             {

src/test/java/io/github/dsheirer/module/decode/dmr/message/voice/AMBEFrameValidatorTest.java

@@ -1,178 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 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 <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.module.decode.dmr.message.voice;
-
-import io.github.dsheirer.bits.CorrectedBinaryMessage;
-import io.github.dsheirer.module.decode.dmr.sync.DMRSyncPattern;
-import java.util.List;
-import java.util.Random;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Tests for AMBE voice frame error detection.
- */
-public class AMBEFrameValidatorTest
-{
-    //Base station voice frame A burst from a recording where JMBE decodes all three voice frames with zero errors.
-    private static final String VOICE_BURST = "5A3AC4B9E881526173002A6BB9E881526755FD7DF75F7173002A6BB9E881526173002A6B";
-    //Burst bit indices of the first C0 bits (voice frame bits 0, 4, 8) and first C1 bit (voice frame bit 25) of
-    //frame 1, which starts at burst bit 24.
-    private static final int FRAME_1_C0_BIT_0 = 24;
-    private static final int FRAME_1_C0_BIT_1 = 28;
-    private static final int FRAME_1_C0_BIT_2 = 32;
-    private static final int FRAME_1_C1_BIT_0 = 49;
-
-    private static CorrectedBinaryMessage getBurst()
-    {
-        return CorrectedBinaryMessage.loadHex(VOICE_BURST);
-    }
-
-    @Test
-    void errorFreeBurst()
-    {
-        CorrectedBinaryMessage burst = getBurst();
-
-        for(int frame = 0; frame < 3; frame++)
-        {
-            assertEquals(0, AMBEFrameValidator.getErrorCount(burst, frame), "Frame " + frame);
-        }
-
-        assertTrue(AMBEFrameValidator.isValid(burst));
-    }
-
-    @Test
-    void errorsAreCounted()
-    {
-        CorrectedBinaryMessage burst = getBurst();
-        burst.flip(FRAME_1_C0_BIT_0);
-        assertEquals(1, AMBEFrameValidator.getErrorCount(burst, 0));
-        burst.flip(FRAME_1_C1_BIT_0);
-        assertEquals(2, AMBEFrameValidator.getErrorCount(burst, 0));
-        burst.flip(FRAME_1_C0_BIT_1);
-        assertEquals(3, AMBEFrameValidator.getErrorCount(burst, 0));
-    }
-
-    @Test
-    void fourC0ErrorsAreDetected()
-    {
-        CorrectedBinaryMessage burst = getBurst();
-        burst.flip(FRAME_1_C0_BIT_0);
-        burst.flip(FRAME_1_C0_BIT_1);
-        burst.flip(FRAME_1_C0_BIT_2);
-        burst.flip(FRAME_1_C0_BIT_2 + 4);
-        assertTrue(AMBEFrameValidator.getErrorCount(burst, 0) > AMBEFrameValidator.MAX_ERRORS);
-    }
-
-    @Test
-    void validWhenAnyFrameIsValid()
-    {
-        CorrectedBinaryMessage burst = getBurst();
-
-        //Corrupt the C0 vector of each frame in turn (4 bit errors), verifying a single valid frame is sufficient.
-        int[] frameOffsets = {24, 96, 216};
-
-        for(int frame = 0; frame < 3; frame++)
-        {
-            for(int bit = 0; bit < 16; bit += 4)
-            {
-                burst.flip(frameOffsets[frame] + bit);
-            }
-
-            assertTrue(AMBEFrameValidator.getErrorCount(burst, frame) > AMBEFrameValidator.MAX_ERRORS);
-            assertEquals(frame < 2, AMBEFrameValidator.isValid(burst), "Corrupted frames: " + (frame + 1));
-        }
-    }
-
-    @Test
-    void randomBurstsAreRarelyValid()
-    {
-        Random random = new Random(1234);
-        int valid = 0;
-        int trials = 20000;
-
-        for(int trial = 0; trial < trials; trial++)
-        {
-            CorrectedBinaryMessage burst = new CorrectedBinaryMessage(288);
-
-            for(int bit = 0; bit < 288; bit++)
-            {
-                if(random.nextBoolean())
-                {
-                    burst.set(bit);
-                }
-            }
-
-            if(AMBEFrameValidator.isValid(burst))
-            {
-                valid++;
-            }
-        }
-
-        //Expected false valid rate is ~3 x 1.3e-4 (ie ~8 of 20,000)
-        assertTrue(valid < 30, "Random bursts detected as valid: " + valid);
-    }
-
-    @Test
-    void voiceMessageValidity()
-    {
-        assertTrue(new VoiceAMessage(DMRSyncPattern.BASE_STATION_VOICE, getBurst(), null, 0, 1).isValid());
-
-        CorrectedBinaryMessage corrupted = getBurst();
-        int[] frameOffsets = {24, 96, 216};
-
-        for(int offset : frameOffsets)
-        {
-            for(int bit = 0; bit < 16; bit += 4)
-            {
-                corrupted.flip(offset + bit);
-            }
-        }
-
-        assertFalse(new VoiceAMessage(DMRSyncPattern.BASE_STATION_VOICE, corrupted, null, 0, 1).isValid());
-    }
-
-    /**
-     * Verifies the AMBE frames match the burst bits, specifically for frame 2 where bits 32-35 are sourced from burst
-     * bits 128-131 and bits 36-39 from burst bits 180-183, with burst bit 180 set (ie a negative signed byte).
-     */
-    @Test
-    void ambeFramesMatchBurstBits()
-    {
-        CorrectedBinaryMessage burst = getBurst();
-        burst.set(180);
-        burst.clear(128, 132);
-        List<byte[]> frames = new VoiceAMessage(DMRSyncPattern.BASE_STATION_VOICE, burst, null, 0, 1).getAMBEFrames();
-        int[] frameOffsets = {24, 96, 216};
-
-        for(int frame = 0; frame < 3; frame++)
-        {
-            for(int bit = 0; bit < 72; bit++)
-            {
-                int burstIndex = frameOffsets[frame] + bit + ((frame == 1 && bit >= 36) ? 48 : 0);
-                boolean frameBit = (frames.get(frame)[bit / 8] & (0x80 >> (bit % 8))) != 0;
-                assertEquals(burst.get(burstIndex), frameBit, "Frame " + frame + " bit " + bit);
-            }
-        }
-    }
-}