From 66a288ca16b3490557d3d0f0357c21e28d9f3203 Mon Sep 17 00:00:00 2001 From: Yuval Adam <_@yuv.al> Date: Fri, 3 Aug 2018 16:18:36 +0300 Subject: Disable multi dongle support for now --- src/devices/fc0013.rs | 6 +++++- src/lib.rs | 19 +++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/devices/fc0013.rs b/src/devices/fc0013.rs index 028c36b..d2f6062 100644 --- a/src/devices/fc0013.rs +++ b/src/devices/fc0013.rs @@ -1,9 +1,12 @@ use super::{DeviceInfo, Device}; +use usb::Usb; +#[allow(dead_code)] pub struct FC0013 { pub device: DeviceInfo } +#[allow(dead_code)] pub const DEVICE_INFO: DeviceInfo = DeviceInfo { id: "fc0013", name: "Fitipower FC0013", @@ -12,6 +15,7 @@ pub const DEVICE_INFO: DeviceInfo = DeviceInfo { check_val: 0xa3 }; +#[allow(dead_code)] impl FC0013 { pub fn new() -> FC0013 { FC0013 { @@ -21,7 +25,7 @@ impl FC0013 { } impl Device for FC0013 { - fn init(&self) { + fn init(&self, _usb: &Usb) { println!("Init {}", self.device.name); } } diff --git a/src/lib.rs b/src/lib.rs index 06cd8d9..a796c8b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -57,7 +57,7 @@ impl<'a> RtlSdr<'a> { usb.set_i2c_repeater( true); let d = r820t::R820T::new(); - let found = match usb.i2c_read_reg(d.device.i2c_addr, d.device.check_addr) { + let _found = match usb.i2c_read_reg(d.device.i2c_addr, d.device.check_addr) { Ok(reg) => { if reg == d.device.check_val { println!("Found {} tuner\n", d.device.name); @@ -69,21 +69,8 @@ impl<'a> RtlSdr<'a> { }, Err(_) => false }; - if !found { - let d = fc0013::FC0013::new(); - let _found = match usb.i2c_read_reg(d.device.i2c_addr, d.device.check_addr) { - Ok(reg) => { - if reg == d.device.check_val { - println!("Found {} tuner\n", d.device.name); - true - } - else { - false - } - }, - Err(_) => false - }; - } + + d.init(&usb); usb.deinit_baseband(); } -- cgit v1.3.1