[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9716 - gnuradio/branches/features/cppdb/usrp/host/lib
From: |
trondeau |
Subject: |
[Commit-gnuradio] r9716 - gnuradio/branches/features/cppdb/usrp/host/lib/legacy |
Date: |
Sat, 4 Oct 2008 13:27:15 -0600 (MDT) |
Author: trondeau
Date: 2008-10-04 13:27:15 -0600 (Sat, 04 Oct 2008)
New Revision: 9716
Modified:
gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.cc
gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.h
Log:
adding export functions for getting dboard objects.
Modified: gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.cc
===================================================================
--- gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.cc
2008-10-04 19:12:02 UTC (rev 9715)
+++ gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.cc
2008-10-04 19:27:15 UTC (rev 9716)
@@ -243,6 +243,12 @@
return (dboard << 1) | (tx^1);
}
+std::vector< std::vector<db_base_sptr> >
+usrp_basic::db()
+{
+ return d_db;
+}
+
std::vector<db_base_sptr>
usrp_basic::db(int which)
{
@@ -824,6 +830,16 @@
}
+std::vector< std::vector<db_base_sptr> >
+usrp_basic_rx::db()
+{
+ // When called from here, only return if the RX side
+ std::vector< std::vector<db_base_sptr> > ret;
+ ret.push_back(d_db[SLOT_RX_A]);
+ ret.push_back(d_db[SLOT_RX_B]);
+ return ret;
+}
+
std::vector<db_base_sptr>
usrp_basic_rx::db(int which)
{
@@ -1216,6 +1232,15 @@
return common_daughterboard_id(C_TX, which_dboard);
}
+std::vector< std::vector<db_base_sptr> >
+usrp_basic_tx::db()
+{
+ // When called from here, only return if the RX side
+ std::vector< std::vector<db_base_sptr> > ret;
+ ret.push_back(d_db[SLOT_TX_A]);
+ ret.push_back(d_db[SLOT_TX_B]);
+ return ret;
+}
std::vector<db_base_sptr>
usrp_basic_tx::db(int which)
Modified: gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.h
===================================================================
--- gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.h
2008-10-04 19:12:02 UTC (rev 9715)
+++ gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.h
2008-10-04 19:27:15 UTC (rev 9716)
@@ -121,6 +121,7 @@
*
* \return list of shared pointers to daughterboard objects
*/
+ virtual std::vector< std::vector<db_base_sptr> > db();
virtual std::vector<db_base_sptr> db(int which);
/*!
@@ -493,8 +494,9 @@
public:
~usrp_basic_rx ();
+ std::vector< std::vector<db_base_sptr> > db();
std::vector<db_base_sptr> db(int which);
-
+
int daughterboard_id (int which_dboard) const;
bool _write_oe (int which_dboard, int value, int mask);
bool write_io (int which_dboard, int value, int mask);
@@ -687,6 +689,7 @@
~usrp_basic_tx ();
+ std::vector< std::vector<db_base_sptr> > db();
std::vector<db_base_sptr> db(int which);
int daughterboard_id (int which_dboard) const;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9716 - gnuradio/branches/features/cppdb/usrp/host/lib/legacy,
trondeau <=