From 4965dfdb43111d002c262c4de3011359e41bd2c3 Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Sun, 18 Apr 2021 10:09:43 +0300
Subject: Handle refactoring WIP

---
 src/usb.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/usb.rs')

diff --git a/src/usb.rs b/src/usb.rs
index a83c853..463bb5d 100644
--- a/src/usb.rs
+++ b/src/usb.rs
@@ -4,6 +4,7 @@ extern crate rusb;
 
 use log::{error, info};
 use rusb::{DeviceHandle, Direction, GlobalContext, Recipient, RequestType};
+use std::convert::TryInto;
 use std::time::Duration;
 
 // const BLOCK_DEMODB: u16 = 0;
@@ -269,23 +270,22 @@ impl RtlSdrDeviceHandle {
         info!("Exact sample rate is: {} Hz", real_rate);
 
         self.set_i2c_repeater(true);
-        self.tuner.set_bw(self.handle);
+        // self.tuner.set_bw(self.handle);
         self.set_i2c_repeater(false);
 
-        let mut tmp: u16 = rsamp_ratio >> 16;
-        self.handle.demod_write_reg(1, 0x9f, tmp, 2);
-        tmp = rsamp_ratio & 0xffff;
-        self.handle.demod_write_reg(1, 0xa1, tmp, 2);
+        let mut tmp: u16 = (rsamp_ratio >> 16).try_into().unwrap();
+        self.demod_write_reg(1, 0x9f, tmp, 2);
+        tmp = (rsamp_ratio & 0xffff).try_into().unwrap();
+        self.demod_write_reg(1, 0xa1, tmp, 2);
         // self.set_sample_freq_corr();
 
         // reset demod (bit 3, soft_rst)
-        self.handle.demod_write_reg(1, 0x01, 0x14, 1);
-        self.handle.demod_write_reg(1, 0x01, 0x10, 1);
-        
+        self.demod_write_reg(1, 0x01, 0x14, 1);
+        self.demod_write_reg(1, 0x01, 0x10, 1);
+
         // self.set_offset_tuning();
     }
 
-
     pub fn reset_buffer(&self) {
         self.write_reg(BLOCK_USBB, ADDR_USB_EPA_CTL, 0x1002, 2);
         self.write_reg(BLOCK_USBB, ADDR_USB_EPA_CTL, 0x0000, 2);
-- 
cgit v1.3.1