[Commit-gnuradio] r10248 - in gnuradio/trunk: gnuradio-core/src/lib/general mblock/src/lib usrp/host/lib/inband

[gnychis]

Author: gnychis
Date: 2009-01-16 21:39:52 -0700 (Fri, 16 Jan 2009)
New Revision: 10248

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
   gnuradio/trunk/mblock/src/lib/mb_message.cc
   gnuradio/trunk/usrp/host/lib/inband/Makefile.am
   gnuradio/trunk/usrp/host/lib/inband/usrp_usb_interface.cc
Log:
merging r10246:10247 from developer branch to fix manual frequency setting 
problem

Modified: 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc     
2009-01-17 04:36:28 UTC (rev 10247)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc     
2009-01-17 04:39:52 UTC (rev 10248)
@@ -130,7 +130,7 @@
     }
   }
 
-  consume_each (ii);
+//  consume_each (ii);
 
-  return noutput_items;
+  return ii; //noutput_items;
 }

Modified: gnuradio/trunk/mblock/src/lib/mb_message.cc
===================================================================
--- gnuradio/trunk/mblock/src/lib/mb_message.cc 2009-01-17 04:36:28 UTC (rev 
10247)
+++ gnuradio/trunk/mblock/src/lib/mb_message.cc 2009-01-17 04:39:52 UTC (rev 
10248)
@@ -27,7 +27,7 @@
 #include <pmt_pool.h>
 
 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
 

Modified: gnuradio/trunk/usrp/host/lib/inband/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/lib/inband/Makefile.am     2009-01-17 04:36:28 UTC 
(rev 10247)
+++ gnuradio/trunk/usrp/host/lib/inband/Makefile.am     2009-01-17 04:39:52 UTC 
(rev 10248)
@@ -73,12 +73,7 @@
        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 @@
        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
 

Modified: gnuradio/trunk/usrp/host/lib/inband/usrp_usb_interface.cc
===================================================================
--- gnuradio/trunk/usrp/host/lib/inband/usrp_usb_interface.cc   2009-01-17 
04:36:28 UTC (rev 10247)
+++ gnuradio/trunk/usrp/host/lib/inband/usrp_usb_interface.cc   2009-01-17 
04:39:52 UTC (rev 10248)
@@ -112,7 +112,7 @@
                                 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);
     }
   }