[Commit-gnuradio] r9275 - gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy

[trondeau]

Author: trondeau
Date: 2008-08-13 21:24:26 -0600 (Wed, 13 Aug 2008)
New Revision: 9275

Modified:
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.cc
Log:
storing RX and TX daughterboards for both side A and B; makes pick_subdevice in 
Python utils code work.

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.cc    
    2008-08-14 03:22:27 UTC (rev 9274)
+++ 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.cc    
    2008-08-14 03:24:26 UTC (rev 9275)
@@ -249,7 +249,6 @@
   if(which > 3) {
     throw std::invalid_argument("usrp_standard_commond::db which must be 0, 1, 
2, or 3");
   }
-  // FIXME: return weak pointers
   return d_db[which];
 }
 
@@ -769,8 +768,8 @@
   set_dc_offset_cl_enable(0xf, 0xf);   // enable DC offset removal control 
loops
 
   probe_rx_slots (false);
-  d_db[SLOT_RX_A] = instantiate_dbs(d_dbid[SLOT_RX_A], this, which_board);
-  d_db[SLOT_RX_B] = instantiate_dbs(d_dbid[SLOT_RX_B], this, which_board);
+  d_db[SLOT_RX_A] = instantiate_dbs(d_dbid[SLOT_RX_A], this, 0);
+  d_db[SLOT_RX_B] = instantiate_dbs(d_dbid[SLOT_RX_B], this, 1);
 
   // check fusb buffering parameters
 
@@ -1163,9 +1162,9 @@
   set_fpga_tx_sample_rate_divisor (4); // we're using interp x4
 
   probe_tx_slots (false);
-  d_db[SLOT_TX_A] = instantiate_dbs(d_dbid[SLOT_TX_A], this, which_board);
-  d_db[SLOT_TX_B] = instantiate_dbs(d_dbid[SLOT_TX_B], this, which_board);
-
+  d_db[SLOT_TX_A] = instantiate_dbs(d_dbid[SLOT_TX_A], this, 0);
+  d_db[SLOT_TX_B] = instantiate_dbs(d_dbid[SLOT_TX_B], this, 1);
+  
   // check fusb buffering parameters
 
   if (fusb_block_size < 0 || fusb_block_size > FUSB_BLOCK_SIZE)