[Commit-gnuradio] r10208 - gnuradio/trunk/usrp/host/lib/inband

[jcorgan]

Author: jcorgan
Date: 2009-01-12 14:31:44 -0700 (Mon, 12 Jan 2009)
New Revision: 10208

Modified:
   gnuradio/trunk/usrp/host/lib/inband/usrp_rx.cc
   gnuradio/trunk/usrp/host/lib/inband/usrp_rx.h
   gnuradio/trunk/usrp/host/lib/inband/usrp_tx.cc
   gnuradio/trunk/usrp/host/lib/inband/usrp_tx.h
Log:
Fixes in-band code for new daughterboard API (Stefan Bruens)

Modified: gnuradio/trunk/usrp/host/lib/inband/usrp_rx.cc
===================================================================
--- gnuradio/trunk/usrp/host/lib/inband/usrp_rx.cc      2009-01-12 18:07:10 UTC 
(rev 10207)
+++ gnuradio/trunk/usrp/host/lib/inband/usrp_rx.cc      2009-01-12 21:31:44 UTC 
(rev 10208)
@@ -119,8 +119,9 @@
 
   // Need the handle to the RX port to send responses, this is passed
   // by the USRP interface m-block
+  pmt_t handle = pmt_nth(1, data);
   d_urx = 
-    boost::any_cast<usrp_standard_rx *>(pmt_any_ref(pmt_nth(1, data)));
+    boost::any_cast<usrp_standard_rx_sptr>(pmt_any_ref(handle));
 
   if(verbose)
     std::cout << "[usrp_rx] Waiting for packets..\n";

Modified: gnuradio/trunk/usrp/host/lib/inband/usrp_rx.h
===================================================================
--- gnuradio/trunk/usrp/host/lib/inband/usrp_rx.h       2009-01-12 18:07:10 UTC 
(rev 10207)
+++ gnuradio/trunk/usrp/host/lib/inband/usrp_rx.h       2009-01-12 21:31:44 UTC 
(rev 10208)
@@ -23,9 +23,8 @@
 
 #include <mblock/mblock.h>
 #include <fstream>
+#include "usrp_standard.h"
 
-class usrp_standard_rx;
-
 extern bool usrp_rx_stop;   // used to communicate a 'stop' to the RX stub
 
 /*!
@@ -34,7 +33,7 @@
 class usrp_rx : public mb_mblock
 {
   mb_port_sptr         d_cs;
-  usrp_standard_rx     *d_urx;
+  usrp_standard_rx_sptr     d_urx;
   
   bool d_disk_write;
   bool d_disk_write_pkt;

Modified: gnuradio/trunk/usrp/host/lib/inband/usrp_tx.cc
===================================================================
--- gnuradio/trunk/usrp/host/lib/inband/usrp_tx.cc      2009-01-12 18:07:10 UTC 
(rev 10207)
+++ gnuradio/trunk/usrp/host/lib/inband/usrp_tx.cc      2009-01-12 21:31:44 UTC 
(rev 10208)
@@ -100,7 +100,7 @@
   pmt_t invocation_handle = pmt_nth(0, data);
   pmt_t channel = pmt_nth(1, data);
   pmt_t v_packets = pmt_nth(2, data);
-  d_utx = boost::any_cast<usrp_standard_tx *>(pmt_any_ref(pmt_nth(3, data)));
+  d_utx = boost::any_cast<usrp_standard_tx_sptr>(pmt_any_ref(pmt_nth(3, 
data)));
 
   size_t n_bytes;
   bool underrun;  // this will need to go, as it is taken care of in the 
packet headers

Modified: gnuradio/trunk/usrp/host/lib/inband/usrp_tx.h
===================================================================
--- gnuradio/trunk/usrp/host/lib/inband/usrp_tx.h       2009-01-12 18:07:10 UTC 
(rev 10207)
+++ gnuradio/trunk/usrp/host/lib/inband/usrp_tx.h       2009-01-12 21:31:44 UTC 
(rev 10208)
@@ -23,16 +23,15 @@
 
 #include <mblock/mblock.h>
 #include <fstream>
+#include "usrp_standard.h"
 
-class usrp_standard_tx;
-
 /*!
  * \brief Implements the low level usb interface to the USRP
  */
 class usrp_tx : public mb_mblock
 {
   mb_port_sptr         d_cs;
-  usrp_standard_tx     *d_utx;
+  usrp_standard_tx_sptr     d_utx;
   
   bool d_disk_write;
   std::ofstream d_ofile;