[Commit-gnuradio] r9913 - gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src

[eb]

Author: eb
Date: 2008-11-02 18:22:57 -0700 (Sun, 02 Nov 2008)
New Revision: 9913

Modified:
   gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_base.cc
   gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_base.h
   gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_sink_base.cc
   gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_sink_base.h
   gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_source_base.cc
   gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_source_base.h
Log:
work-in-progress

Modified: gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_base.cc
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_base.cc  
2008-11-03 01:18:39 UTC (rev 9912)
+++ gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_base.cc  
2008-11-03 01:22:57 UTC (rev 9913)
@@ -25,11 +25,41 @@
 #include <usrp_base.h>
 #include <usrp_basic.h>
 
+class truth_table_element_t 
+{
+public:
+  truth_table_element_t(int side, unsigned int uses, bool swap_iq, unsigned 
int mux_val);
+  bool operator==(const truth_table_element_t &in);
+  bool operator!=(const truth_table_element_t &in);
+
+  unsigned int mux_val() { return d_mux_val; }
+
+private:
+  int          d_side;
+  unsigned int d_uses;
+  bool         d_swap_iq;
+  unsigned int d_mux_val;
+};
+
+
 usrp_base::~usrp_base()
 {
   // NOP
 }
 
+void
+usrp_base::set_usrp_basic(usrp_basic *u)
+{
+  d_usrp_basic = boost::shared_ptr<usrp_basic>(u);
+}
+
+
+std::vector<db_base_wptr> 
+usrp_base::db(int which_side)
+{
+  return d_usrp_basic->db(which_side);
+}
+
 long
 usrp_base::fpga_master_clock_freq() const
 {

Modified: gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_base.h
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_base.h   
2008-11-03 01:18:39 UTC (rev 9912)
+++ gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_base.h   
2008-11-03 01:22:57 UTC (rev 9913)
@@ -23,7 +23,6 @@
 
 #include <gr_sync_block.h>
 #include <stdexcept>
-#include <memory>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
@@ -33,6 +32,9 @@
 typedef boost::weak_ptr<db_base> db_base_wptr;
 typedef boost::shared_ptr<db_base> db_base_sptr;
 
+typedef std::vector<int> subdev_spec_t;
+
+
 /*!
  * \brief base class for GNU Radio interface to the USRP
  */
@@ -40,7 +42,6 @@
 private:
   boost::shared_ptr<usrp_basic>        d_usrp_basic;
 
-
 protected:
   usrp_base(const std::string &name,
            gr_io_signature_sptr input_signature,
@@ -48,10 +49,7 @@
     : gr_sync_block(name, input_signature, output_signature) {}
     
 
-  void set_usrp_basic(usrp_basic *u)
-  {
-    d_usrp_basic = boost::shared_ptr<usrp_basic>(u);
-  }
+  void set_usrp_basic(usrp_basic *u);
 
 public:
   virtual ~usrp_base();

Modified: 
gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_sink_base.cc
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_sink_base.cc     
2008-11-03 01:18:39 UTC (rev 9912)
+++ gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_sink_base.cc     
2008-11-03 01:22:57 UTC (rev 9913)
@@ -176,3 +176,27 @@
 {
   return d_usrp->tx_freq (channel);
 }
+
+bool
+usrp_sink_base::has_rx_halfband()
+{
+  return d_usrp->has_rx_halfband();
+}
+ 
+bool
+usrp_sink_base::has_tx_halfband()
+{
+  return d_usrp->has_tx_halfband();
+}
+
+int
+usrp_sink_base::nddcs()
+{
+  return d_usrp->nddcs();
+}
+
+int
+usrp_sink_base::nducs()
+{
+  return d_usrp->nducs();
+}

Modified: gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_sink_base.h
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_sink_base.h      
2008-11-03 01:18:39 UTC (rev 9912)
+++ gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_sink_base.h      
2008-11-03 01:22:57 UTC (rev 9913)
@@ -104,6 +104,10 @@
   double tx_freq (int channel) const;
   int nunderruns () const { return d_nunderruns; }
 
+  bool has_rx_halfband();
+  bool has_tx_halfband();
+  int nddcs();
+  int nducs();
 };
 
 #endif /* INCLUDED_USRP_SINK_BASE_H */

Modified: 
gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_source_base.cc
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_source_base.cc   
2008-11-03 01:18:39 UTC (rev 9912)
+++ gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_source_base.cc   
2008-11-03 01:22:57 UTC (rev 9913)
@@ -227,3 +227,28 @@
 {
   return usrp_standard_rx::format_bypass_halfband(format);
 }
+
+bool
+usrp_source_base::has_rx_halfband()
+{
+  return d_usrp->has_rx_halfband();
+}
+ 
+bool
+usrp_source_base::has_tx_halfband()
+{
+  return d_usrp->has_tx_halfband();
+}
+
+int
+usrp_source_base::nddcs()
+{
+  return d_usrp->nddcs();
+}
+
+int
+usrp_source_base::nducs()
+{
+  return d_usrp->nducs();
+}
+

Modified: 
gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_source_base.h
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_source_base.h    
2008-11-03 01:18:39 UTC (rev 9912)
+++ gnuradio/branches/developers/eb/cppdb-wip/gr-usrp/src/usrp_source_base.h    
2008-11-03 01:22:57 UTC (rev 9913)
@@ -130,6 +130,11 @@
   double rx_freq (int channel) const;
   int noverruns () const { return d_noverruns; }
 
+  bool has_rx_halfband();
+  bool has_tx_halfband();
+  int nddcs();
+  int nducs();
+
   /*!
    * \brief Specify Rx data format.
    *