Move mblock library include files into separate library. Updates to usrp in-band...

[debian/gnuradio] / usrp / host / apps-inband / test_usrp_inband_underrun.cc

diff --git a/usrp/host/apps-inband/test_usrp_inband_underrun.cc b/usrp/host/apps-inband/test_usrp_inband_underrun.cc
index 0404208b432c99032802dfe0dd92619e48db7182..11babb0481bb3a05f0f9d35ac41f1be39e08e283 100644 (file)
--- a/usrp/host/apps-inband/test_usrp_inband_underrun.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_underrun.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
@@ -127,7 +127,7 @@ test_usrp_inband_underrun::test_usrp_inband_underrun(mb_runtime *runtime, const
   d_rx_chan(PMT_NIL),
   d_which_usrp(pmt_from_long(0)),
   d_state(INIT),
-  d_nsamples_to_send((long) 20e6),
+  d_nsamples_to_send((long) 27e6),
   d_nsamples_xmitted(0),
   d_nframes_xmitted(0),
   d_samples_per_frame(d_nsamples_to_send),     // full packet
@@ -143,12 +143,12 @@ test_usrp_inband_underrun::test_usrp_inband_underrun(mb_runtime *runtime, const
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("nanocell9.rbf"));
+               pmt_intern("inband_1rxhb_1tx.rbf"));
 
   // Set TX and RX interpolations
   pmt_dict_set(usrp_dict,
                pmt_intern("interp-tx"),
-               pmt_from_long(8));
+               pmt_from_long(64));
 
   pmt_dict_set(usrp_dict,
                pmt_intern("decim-rx"),
@@ -571,7 +571,7 @@ test_usrp_inband_underrun::build_and_send_next_frame()
   size_t nshorts = 2 * nsamples_this_frame;    // 16-bit I & Q
   pmt_t uvec = pmt_make_s16vector(nshorts, 0);
   size_t ignore;
-  int16_t *samples = pmt_s16vector_writeable_elements(uvec, ignore);
+  int16_t *samples = pmt_s16vector_writable_elements(uvec, ignore);
 
   // fill in the complex sinusoid
 
@@ -668,8 +668,6 @@ test_usrp_inband_underrun::closing_usrp()
 {
   d_state = CLOSING_USRP;
 
-  sleep(2);
-
   d_cs->send(s_cmd_close, pmt_list1(PMT_NIL));
 }