From 3318308900dff9b1140a47b3e798ab5a14e9bae3 Mon Sep 17 00:00:00 2001 From: gnychis Date: Sat, 17 Jan 2009 04:39:52 +0000 Subject: [PATCH] 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 --- .../src/lib/general/gr_clock_recovery_mm_ff.cc | 4 ++-- mblock/src/lib/mb_message.cc | 2 +- usrp/host/lib/inband/Makefile.am | 12 ++++++------ usrp/host/lib/inband/usrp_usb_interface.cc | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc index fdf82667..dd46bbea 100644 --- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc +++ b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc @@ -130,7 +130,7 @@ gr_clock_recovery_mm_ff::general_work (int noutput_items, } } - consume_each (ii); +// consume_each (ii); - return noutput_items; + return ii; //noutput_items; } diff --git a/mblock/src/lib/mb_message.cc b/mblock/src/lib/mb_message.cc index 664e369f..edb27b62 100644 --- a/mblock/src/lib/mb_message.cc +++ b/mblock/src/lib/mb_message.cc @@ -27,7 +27,7 @@ #include static const int CACHE_LINE_SIZE = 64; // good guess -static const int MAX_MESSAGES = 1024; // KLUDGE max number of messages in sys +static const int MAX_MESSAGES = 0; // KLUDGE max number of messages in sys // 0 -> no limit #if MB_MESSAGE_LOCAL_ALLOCATOR diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am index ca9009f5..b08ef01e 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 cd77974c..0d324789 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); } } -- 2.47.2