Initial rusb version that actually compiles!

3 files changed, 64 insertions, 65 deletions

diff --git a/src/devices/fc0013.rs b/src/devices/fc0013.rs
index 8404b90..a8302b4 100644
--- a/src/devices/fc0013.rs
+++ b/src/devices/fc0013.rs
@@ -1,54 +1,54 @@
-use super::{DeviceInfo, Device};
+// use super::{Device, DeviceInfo};
 
-#[allow(dead_code)]
-pub struct FC0013 {
-    pub device: DeviceInfo
-}
+// #[allow(dead_code)]
+// pub struct FC0013 {
+//     pub device: DeviceInfo,
+// }
 
-#[allow(dead_code)]
-pub const DEVICE_INFO: DeviceInfo = DeviceInfo {
-    id: "fc0013",
-    name: "Fitipower FC0013",
-    i2c_addr: 0xc6,
-    check_addr: 0x00,
-    check_val: 0xa3
-};
+// #[allow(dead_code)]
+// pub const DEVICE_INFO: DeviceInfo = DeviceInfo {
+//     id: "fc0013",
+//     name: "Fitipower FC0013",
+//     i2c_addr: 0xc6,
+//     check_addr: 0x00,
+//     check_val: 0xa3,
+// };
 
-#[allow(dead_code)]
-impl FC0013 {
-    pub fn new() -> FC0013 {
-        FC0013 {
-            device: DEVICE_INFO
-        }
-    }
-}
+// #[allow(dead_code)]
+// impl FC0013 {
+//     pub fn new() -> FC0013 {
+//         FC0013 {
+//             device: DEVICE_INFO,
+//         }
+//     }
+// }
 
-impl Device for FC0013 {
-    fn init(&self) {
-        println!("Init {}", self.device.name);
-    }
+// impl Device for FC0013 {
+//     fn init(&self) {
+//         println!("Init {}", self.device.name);
+//     }
 
-    fn exit(&self){
-        unimplemented!()
-    }
+//     fn exit(&self) {
+//         unimplemented!()
+//     }
 
-    fn set_freq(&self, _freq: u32){
-        unimplemented!()
-    }
+//     fn set_freq(&self, _freq: u32) {
+//         unimplemented!()
+//     }
 
-    fn set_bw(&self, _bw: u32){
-        unimplemented!()
-    }
+//     fn set_bw(&self, _bw: u32) {
+//         unimplemented!()
+//     }
 
-    fn set_gain(&self, _gain: u32){
-        unimplemented!()
-    }
+//     fn set_gain(&self, _gain: u32) {
+//         unimplemented!()
+//     }
 
-    fn set_if_gain(&self, _if_gain: u32){
-        unimplemented!()
-    }
+//     fn set_if_gain(&self, _if_gain: u32) {
+//         unimplemented!()
+//     }
 
-    fn set_gain_mode(&self, _mode: bool){
-        unimplemented!()
-    }
-}
+//     fn set_gain_mode(&self, _mode: bool) {
+//         unimplemented!()
+//     }
+// }
diff --git a/src/devices/mod.rs b/src/devices/mod.rs
index 18f08e6..a48531d 100644
--- a/src/devices/mod.rs
+++ b/src/devices/mod.rs
@@ -6,7 +6,7 @@ pub struct DeviceInfo {
     pub name: &'static str,
     pub i2c_addr: u8,
     pub check_addr: u8,
-    pub check_val: u8
+    pub check_val: u8,
 }
 
 pub trait Device {
diff --git a/src/devices/r820t.rs b/src/devices/r820t.rs
index d08fc76..92ba509 100644
--- a/src/devices/r820t.rs
+++ b/src/devices/r820t.rs
@@ -1,11 +1,11 @@
-use super::{DeviceInfo, Device};
-use usb::Usb;
+use super::{Device, DeviceInfo};
+use usb::RtlSdrDeviceHandle;
 
 const R82XX_IF_FREQ: u32 = 3570000;
 
-pub struct R820T<'a> {
+pub struct R820T {
     pub device: DeviceInfo,
-    pub usb: &'a Usb<'a>
+    pub handle: RtlSdrDeviceHandle,
 }
 
 pub const DEVICE_INFO: DeviceInfo = DeviceInfo {
@@ -13,56 +13,55 @@ pub const DEVICE_INFO: DeviceInfo = DeviceInfo {
     name: "Rafael Micro R820T",
     i2c_addr: 0x34,
     check_addr: 0x00,
-    check_val: 0x69
+    check_val: 0x69,
 };
 
-impl<'a> R820T<'a> {
-    pub fn new(usb: &'a Usb) -> R820T<'a> {
+impl R820T {
+    pub fn new(handle: RtlSdrDeviceHandle) -> R820T {
         R820T {
             device: DEVICE_INFO,
-            usb
+            handle: handle,
         }
     }
 }
 
-impl<'a> Device for R820T<'a> {
+impl Device for R820T {
     fn init(&self) {
         // disable Zero-IF mode
-        self.usb.demod_write_reg(1, 0xb1, 0x1a, 1);
+        self.handle.demod_write_reg(1, 0xb1, 0x1a, 1);
 
         // only enable In-phase ADC input
-        self.usb.demod_write_reg(0, 0x08, 0x4d, 1);
+        self.handle.demod_write_reg(0, 0x08, 0x4d, 1);
 
         // the R82XX use 3.57 MHz IF for the DVB-T 6 MHz mode, and
         // 4.57 MHz for the 8 MHz mode
-        self.usb.set_if_freq(R82XX_IF_FREQ);
+        self.handle.set_if_freq(R82XX_IF_FREQ);
 
         // enable spectrum inversion
-        self.usb.demod_write_reg(1, 0x15, 0x01, 1);
+        self.handle.demod_write_reg(1, 0x15, 0x01, 1);
     }
 
-    fn exit(&self){
+    fn exit(&self) {
         unimplemented!()
     }
 
-    fn set_freq(&self, _freq: u32){
+    fn set_freq(&self, _freq: u32) {
         unimplemented!()
     }
 
-    fn set_bw(&self, _bw: u32){
+    fn set_bw(&self, _bw: u32) {
         unimplemented!()
     }
 
-    fn set_gain(&self, _gain: u32){
+    fn set_gain(&self, _gain: u32) {
         unimplemented!()
     }
 
-    fn set_if_gain(&self, _if_gain: u32){
+    fn set_if_gain(&self, _if_gain: u32) {
         unimplemented!()
     }
 
-    fn set_gain_mode(&self, _mode: bool){
+    fn set_gain_mode(&self, _mode: bool) {
         unimplemented!()
     }
-
 }