[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9744 - gnuradio/branches/developers/eb/cppdb-wip/usrp
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r9744 - gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy |
|
Date: |
Tue, 7 Oct 2008 22:23:47 -0600 (MDT) |
Author: eb
Date: 2008-10-07 22:23:47 -0600 (Tue, 07 Oct 2008)
New Revision: 9744
Modified:
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.cc
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.h
Log:
more s/which/which_side/g and reformatting
Modified:
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.cc
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.cc
2008-10-08 04:11:42 UTC (rev 9743)
+++ gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.cc
2008-10-08 04:23:47 UTC (rev 9744)
@@ -33,84 +33,162 @@
#include <db_dtt768.h>
std::vector<db_base_sptr>
-instantiate_dbs(int dbid, usrp_basic * usrp, int which)
+instantiate_dbs(int dbid, usrp_basic *usrp, int which_side)
{
std::vector<db_base_sptr> db;
switch(dbid) {
case(USRP_DBID_BASIC_TX):
- db.push_back(db_base_sptr(new db_basic_tx(usrp, which)));
+ db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side)));
break;
case(USRP_DBID_BASIC_RX):
- db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 0)));
- db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 1)));
+ db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0)));
+ db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1)));
break;
case(USRP_DBID_LF_TX):
- db.push_back(db_base_sptr(new db_lf_tx(usrp, which)));
+ db.push_back(db_base_sptr(new db_lf_tx(usrp, which_side)));
break;
case(USRP_DBID_LF_RX):
- db.push_back(db_base_sptr(new db_lf_rx(usrp, which, 0)));
- db.push_back(db_base_sptr(new db_lf_rx(usrp, which, 1)));
+ db.push_back(db_base_sptr(new db_lf_rx(usrp, which_side, 0)));
+ db.push_back(db_base_sptr(new db_lf_rx(usrp, which_side, 1)));
break;
- case(USRP_DBID_DBS_RX): db.push_back(db_base_sptr(new db_dbs_rx(usrp,
which))); break;
+ case(USRP_DBID_DBS_RX):
+ db.push_back(db_base_sptr(new db_dbs_rx(usrp, which_side))); break;
- case(USRP_DBID_TV_RX): db.push_back(db_base_sptr(new db_tv_rx(usrp, which,
43.75e6, 5.75e6))); break;
- case(USRP_DBID_TV_RX_REV_2): db.push_back(db_base_sptr(new db_tv_rx(usrp,
which, 44e6, 20e6))); break;
- case(USRP_DBID_TV_RX_REV_3): db.push_back(db_base_sptr(new db_tv_rx(usrp,
which, 44e6, 20e6))); break;
+ case(USRP_DBID_TV_RX):
+ db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 43.75e6,
5.75e6)));
+ break;
+ case(USRP_DBID_TV_RX_REV_2):
+ db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 44e6, 20e6)));
+ break;
+ case(USRP_DBID_TV_RX_REV_3):
+ db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 44e6, 20e6)));
+ break;
- case(USRP_DBID_FLEX_2400_TX): db.push_back(db_base_sptr(new
db_flexrf_2400_tx(usrp, which))); break;
- case(USRP_DBID_FLEX_2400_RX): db.push_back(db_base_sptr(new
db_flexrf_2400_rx(usrp, which))); break;
- case(USRP_DBID_FLEX_1200_TX): db.push_back(db_base_sptr(new
db_flexrf_1200_tx(usrp, which))); break;
- case(USRP_DBID_FLEX_1200_RX): db.push_back(db_base_sptr(new
db_flexrf_1200_rx(usrp, which))); break;
- case(USRP_DBID_FLEX_1800_TX): db.push_back(db_base_sptr(new
db_flexrf_1800_tx(usrp, which))); break;
- case(USRP_DBID_FLEX_1800_RX): db.push_back(db_base_sptr(new
db_flexrf_1800_rx(usrp, which))); break;
- case(USRP_DBID_FLEX_900_TX): db.push_back(db_base_sptr(new
db_flexrf_900_tx(usrp, which))); break;
- case(USRP_DBID_FLEX_900_RX): db.push_back(db_base_sptr(new
db_flexrf_900_rx(usrp, which))); break;
- case(USRP_DBID_FLEX_400_TX): db.push_back(db_base_sptr(new
db_flexrf_400_tx(usrp, which))); break;
- case(USRP_DBID_FLEX_400_RX): db.push_back(db_base_sptr(new
db_flexrf_400_rx(usrp, which))); break;
+ case(USRP_DBID_FLEX_2400_TX):
+ db.push_back(db_base_sptr(new db_flexrf_2400_tx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_2400_RX):
+ db.push_back(db_base_sptr(new db_flexrf_2400_rx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1200_TX):
+ db.push_back(db_base_sptr(new db_flexrf_1200_tx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1200_RX):
+ db.push_back(db_base_sptr(new db_flexrf_1200_rx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1800_TX):
+ db.push_back(db_base_sptr(new db_flexrf_1800_tx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1800_RX):
+ db.push_back(db_base_sptr(new db_flexrf_1800_rx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_900_TX):
+ db.push_back(db_base_sptr(new db_flexrf_900_tx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_900_RX):
+ db.push_back(db_base_sptr(new db_flexrf_900_rx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_400_TX):
+ db.push_back(db_base_sptr(new db_flexrf_400_tx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_400_RX):
+ db.push_back(db_base_sptr(new db_flexrf_400_rx(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_2400_TX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_2400_tx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_2400_RX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_2400_rx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1800_TX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_1800_tx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1800_RX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_1800_rx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1200_TX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_1200_tx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1200_RX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_1200_rx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_900_TX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_900_tx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_900_RX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_900_rx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_400_TX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_400_tx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_400_RX_MIMO_A):
+ db.push_back(db_base_sptr(new db_flexrf_400_rx_mimo_a(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_2400_TX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_2400_tx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_2400_RX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_2400_rx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1800_TX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_1800_tx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1800_RX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_1800_rx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1200_TX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_1200_tx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_1200_RX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_1200_rx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_900_TX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_900_tx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_900_RX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_900_rx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_400_TX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_400_tx_mimo_b(usrp, which_side)));
+ break;
+ case(USRP_DBID_FLEX_400_RX_MIMO_B):
+ db.push_back(db_base_sptr(new db_flexrf_400_rx_mimo_b(usrp, which_side)));
+ break;
- case(USRP_DBID_FLEX_2400_TX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_2400_tx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_2400_RX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_2400_rx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_1800_TX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_1800_tx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_1800_RX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_1800_rx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_1200_TX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_1200_tx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_1200_RX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_1200_rx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_900_TX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_900_tx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_900_RX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_900_rx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_400_TX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_400_tx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_400_RX_MIMO_A): db.push_back(db_base_sptr(new
db_flexrf_400_rx_mimo_a(usrp, which))); break;
- case(USRP_DBID_FLEX_2400_TX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_2400_tx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_2400_RX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_2400_rx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_1800_TX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_1800_tx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_1800_RX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_1800_rx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_1200_TX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_1200_tx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_1200_RX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_1200_rx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_900_TX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_900_tx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_900_RX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_900_rx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_400_TX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_400_tx_mimo_b(usrp, which))); break;
- case(USRP_DBID_FLEX_400_RX_MIMO_B): db.push_back(db_base_sptr(new
db_flexrf_400_rx_mimo_b(usrp, which))); break;
-
- case(USRP_DBID_XCVR2450_TX): db.push_back(db_base_sptr(new
db_xcvr2450_tx(usrp, which))); break;
- case(USRP_DBID_XCVR2450_RX): db.push_back(db_base_sptr(new
db_xcvr2450_rx(usrp, which))); break;
+ case(USRP_DBID_XCVR2450_TX):
+ db.push_back(db_base_sptr(new db_xcvr2450_tx(usrp, which_side)));
+ break;
+ case(USRP_DBID_XCVR2450_RX):
+ db.push_back(db_base_sptr(new db_xcvr2450_rx(usrp, which_side)));
+ break;
- case(USRP_DBID_WBX_LO_TX): db.push_back(db_base_sptr(new db_wbx_lo_tx(usrp,
which))); break;
- case(USRP_DBID_WBX_LO_RX): db.push_back(db_base_sptr(new db_wbx_lo_rx(usrp,
which))); break;
+ case(USRP_DBID_WBX_LO_TX):
+ db.push_back(db_base_sptr(new db_wbx_lo_tx(usrp, which_side)));
+ break;
+ case(USRP_DBID_WBX_LO_RX):
+ db.push_back(db_base_sptr(new db_wbx_lo_rx(usrp, which_side)));
+ break;
- case(USRP_DBID_DTT754): db.push_back(db_base_sptr(new db_dtt754(usrp,
which))); break;
- case(USRP_DBID_DTT768): db.push_back(db_base_sptr(new db_dtt768(usrp,
which))); break;
+ case(USRP_DBID_DTT754):
+ db.push_back(db_base_sptr(new db_dtt754(usrp, which_side)));
+ break;
+ case(USRP_DBID_DTT768):
+ db.push_back(db_base_sptr(new db_dtt768(usrp, which_side)));
+ break;
case(-1):
if(usrp->istx()) {
- db.push_back(db_base_sptr(new db_basic_tx(usrp, which)));
+ db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side)));
}
else {
- db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 0)));
- db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 1)));
+ db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0)));
+ db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1)));
}
break;
@@ -119,13 +197,13 @@
if(usrp->istx()) {
fprintf(stderr, "\n\aWarning: Treating daughterboard with invalid EEPROM
contents as if it were a \"Basic Tx.\"\n");
fprintf(stderr, "Warning: This is almost certainly wrong... Use
appropriate burn-*-eeprom utility.\n\n");
- db.push_back(db_base_sptr(new db_basic_tx(usrp, which)));
+ db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side)));
}
else {
fprintf(stderr, "\n\aWarning: Treating daughterboard with invalid EEPROM
contents as if it were a \"Basic Rx.\"\n");
fprintf(stderr, "Warning: This is almost certainly wrong... Use
appropriate burn-*-eeprom utility.\n\n");
- db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 0)));
- db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 1)));
+ db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0)));
+ db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1)));
}
break;
}
Modified:
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.h
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.h
2008-10-08 04:11:42 UTC (rev 9743)
+++ gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.h
2008-10-08 04:23:47 UTC (rev 9744)
@@ -31,7 +31,7 @@
class db_base;
typedef boost::shared_ptr<db_base> db_base_sptr;
-std::vector<db_base_sptr> instantiate_dbs(int dbid, usrp_basic *usrp, int
which);
+std::vector<db_base_sptr> instantiate_dbs(int dbid, usrp_basic *usrp, int
which_side);
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9744 - gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy,
eb <=