From: gnychis <gnychis@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Sat, 17 Jan 2009 04:42:26 +0000 (+0000)
Subject: seriously, sorry... tried to ctrl+c that but didnt get in time
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=349bad9cfdb7eacfb53d2551874ee1f1c74d8524;p=debian%2Fgnuradio

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
---

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 dd46bbea..fdf82667 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 edb27b62..664e369f 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 b08ef01e..ca9009f5 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 0d324789..cd77974c 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);
     }
   }