From 3318308900dff9b1140a47b3e798ab5a14e9bae3 Mon Sep 17 00:00:00 2001
From: gnychis
Date: Sat, 17 Jan 2009 04:39:52 +0000
Subject: merging r10246:10247 from developer branch to fix manual frequency
 setting problem

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10248 221aa14e-8319-0410-a670-987f0aec2ac5
---
 usrp/host/lib/inband/Makefile.am           | 12 ++++++------
 usrp/host/lib/inband/usrp_usb_interface.cc |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'usrp/host/lib/inband')

diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am
index ca9009f54..b08ef01e3 100644
--- a/usrp/host/lib/inband/Makefile.am
+++ b/usrp/host/lib/inband/Makefile.am
@@ -73,12 +73,7 @@ include_HEADERS =			\
 	usrp_server.h			\
 	usrp_tx.h			\
 	usrp_tx_stub.h			\
-	usrp_usb_interface.h
-
-noinst_HEADERS =      			\
-	qa_inband.h			\
-	qa_inband_packet_prims.h	\
-	qa_inband_usrp_server.h		\
+	usrp_usb_interface.h \
 	symbols_usrp_channel.h		\
 	symbols_usrp_interface_cs.h	\
 	symbols_usrp_low_level_cs.h	\
@@ -88,6 +83,11 @@ noinst_HEADERS =      			\
 	symbols_usrp_tx.h		\
 	symbols_usrp_tx_cs.h
 
+noinst_HEADERS =      			\
+	qa_inband.h			\
+	qa_inband_packet_prims.h	\
+	qa_inband_usrp_server.h		
+
 # ------------------------------------------------------------------------
 # Build the qa code in its own library
 
diff --git a/usrp/host/lib/inband/usrp_usb_interface.cc b/usrp/host/lib/inband/usrp_usb_interface.cc
index cd77974c7..0d324789f 100644
--- a/usrp/host/lib/inband/usrp_usb_interface.cc
+++ b/usrp/host/lib/inband/usrp_usb_interface.cc
@@ -112,7 +112,7 @@ usrp_usb_interface::usrp_usb_interface(mb_runtime *rt, const std::string &instan
                                 pmt_intern("rf-freq"), 
                                 PMT_NIL)) {
       if(!pmt_eqv(rf_freq, PMT_NIL)) 
-        d_rf_freq = pmt_to_long(rf_freq);
+        d_rf_freq = pmt_to_double(rf_freq);
     }
   }
   
-- 
cgit