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

[trondeau]

Author: trondeau
Date: 2008-08-18 22:37:07 -0600 (Mon, 18 Aug 2008)
New Revision: 9325

Modified:
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.i
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_boards.cc
   
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf_mimo.h
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.h
Log:
enabling basic rx, tx, lfrx, lftx, and rfx mimo boards.

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.i
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.i    
2008-08-19 04:09:47 UTC (rev 9324)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.i    
2008-08-19 04:37:07 UTC (rev 9325)
@@ -23,8 +23,6 @@
 
 %{
 #include "db_base.h"
-#include "db_flexrf.h"
-#include "db_tv_rx.h"
 %}
 
 %include <shared_ptr.i>

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_boards.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_boards.cc 
2008-08-19 04:09:47 UTC (rev 9324)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_boards.cc 
2008-08-19 04:37:07 UTC (rev 9325)
@@ -36,12 +36,26 @@
 
   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)));
     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)));
+    break;
+
+  case(USRP_DBID_LF_TX):
+    db.push_back(db_base_sptr(new db_lf_tx(usrp, which)));
+    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)));
+    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_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;
@@ -52,7 +66,7 @@
   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_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;
@@ -73,35 +87,29 @@
   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(-1):
-    try { 
-      // FIXME
-      //usrp->tx_freq(0);
+    if(usrp->istx()) {
       db.push_back(db_base_sptr(new db_basic_tx(usrp, which)));
     }
-    catch (int e) {
-      // FIXME: should return rx when it gets defined
-      //db.push_back(db_base_sptr(new db_basic_rx(usrp, which)));
-      db.push_back(db_base_sptr(new db_basic_tx(usrp, which)));
+    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)));
     }
     break;
   
   case(-2):
   default:
-    try {
-      /*
-      usrp->tx_freq(0);
+    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)));
     }
-    catch (int e) {
+    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_tx(usrp, which)));
+      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)));
     }
     break;
   }

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf_mimo.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf_mimo.h 
    2008-08-19 04:09:47 UTC (rev 9324)
+++ 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf_mimo.h 
    2008-08-19 04:37:07 UTC (rev 9325)
@@ -64,7 +64,7 @@
   int _refclk_divisor();
 };
 
-class db_flexrf_1800_tx_mimo_b : db_flexrf_1800_tx
+class db_flexrf_1800_tx_mimo_b : public db_flexrf_1800_tx
 {
  public:
   db_flexrf_1800_tx_mimo_b(usrp_basic *usrp, int which);

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.h 
2008-08-19 04:09:47 UTC (rev 9324)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.h 
2008-08-19 04:37:07 UTC (rev 9325)
@@ -113,7 +113,21 @@
 public:
   virtual ~usrp_basic ();
 
+  /*!
+   * \brief Returns a pointer to the daughterboard on the side specified
+   *        by 'which'. The basic daughterboards have two ports and so
+   *        return a vector of two objects while other boards return just 1.
+   * \param which side: 0=A, 1=B
+   *
+   * \return list of shared pointers to daughterboard objects
+   */
   virtual std::vector<db_base_sptr> db(int which);
+  
+  /*!
+   * \brief Returns true if this is a transmitter and false if it a receiver
+   * \return bool true=tx, false=rx
+   */
+  bool istx() { return d_tx; }
 
   /*!
    * \brief Return daughterboard ID for given daughterboard slot [0,1].