diff options
| author | gnychis | 2009-01-17 04:42:26 +0000 |
|---|---|---|
| committer | gnychis | 2009-01-17 04:42:26 +0000 |
| commit | 349bad9cfdb7eacfb53d2551874ee1f1c74d8524 (patch) | |
| tree | beb90d92d091e3fbbfb62d3d0f9e66a3762bc5ee | |
| parent | 3318308900dff9b1140a47b3e798ab5a14e9bae3 (diff) | |
| download | gnuradio-349bad9cfdb7eacfb53d2551874ee1f1c74d8524.tar.gz gnuradio-349bad9cfdb7eacfb53d2551874ee1f1c74d8524.tar.bz2 gnuradio-349bad9cfdb7eacfb53d2551874ee1f1c74d8524.zip | |
seriously, sorry... tried to ctrl+c that but didnt get in time
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10249 221aa14e-8319-0410-a670-987f0aec2ac5
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc | 4 | ||||
| -rw-r--r-- | mblock/src/lib/mb_message.cc | 2 | ||||
| -rw-r--r-- | usrp/host/lib/inband/Makefile.am | 12 | ||||
| -rw-r--r-- | 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 dd46bbea4..fdf82667a 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 ii; //noutput_items; + return noutput_items; } diff --git a/mblock/src/lib/mb_message.cc b/mblock/src/lib/mb_message.cc index edb27b62c..664e369fa 100644 --- a/mblock/src/lib/mb_message.cc +++ b/mblock/src/lib/mb_message.cc @@ -27,7 +27,7 @@ #include <pmt_pool.h> static const int CACHE_LINE_SIZE = 64; // good guess -static const int MAX_MESSAGES = 0; // KLUDGE max number of messages in sys +static const int MAX_MESSAGES = 1024; // 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 b08ef01e3..ca9009f54 100644 --- a/usrp/host/lib/inband/Makefile.am +++ b/usrp/host/lib/inband/Makefile.am @@ -73,7 +73,12 @@ include_HEADERS = \ usrp_server.h \ usrp_tx.h \ usrp_tx_stub.h \ - usrp_usb_interface.h \ + usrp_usb_interface.h + +noinst_HEADERS = \ + qa_inband.h \ + qa_inband_packet_prims.h \ + qa_inband_usrp_server.h \ symbols_usrp_channel.h \ symbols_usrp_interface_cs.h \ symbols_usrp_low_level_cs.h \ @@ -83,11 +88,6 @@ include_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 0d324789f..cd77974c7 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_double(rf_freq); + d_rf_freq = pmt_to_long(rf_freq); } } |