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

[trondeau]

Author: trondeau
Date: 2008-08-25 19:24:08 -0600 (Mon, 25 Aug 2008)
New Revision: 9415

Modified:
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.cc
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.h
Log:
reworking to allow redefinition in other cc files

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.cc 
2008-08-25 23:32:12 UTC (rev 9414)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.cc 
2008-08-26 01:24:08 UTC (rev 9415)
@@ -23,6 +23,18 @@
 #include <assert.h>
 #include <stdexcept>
 
+// d'board i/o pin defs
+// Tx and Rx have shared defs, but different i/o regs
+#define AUX_RXAGC (1 << 8)
+#define POWER_UP  (1 << 7)         // enables power supply
+#define RX_TXN    (1 << 6)         // Tx only: T/R antenna switch for TX/RX 
port
+#define RX2_RX1N  (1 << 6)         // Rx only: antenna switch between RX2 and 
TX/RX port
+#define ENABLE    (1 << 5)         // enables mixer
+#define AUX_SEN   (1 << 4)
+#define AUX_SCLK  (1 << 3)
+#define PLL_LOCK_DETECT (1 << 2)
+#define AUX_SDO   (1 << 1)
+#define CLOCK_OUT (1 << 0)
 
 flexrf_base::flexrf_base(usrp_basic *usrp, int which, int _power_on)
   : db_base(usrp, which), d_power_on(_power_on)

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.h  
2008-08-25 23:32:12 UTC (rev 9414)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.h  
2008-08-26 01:24:08 UTC (rev 9415)
@@ -28,19 +28,6 @@
 //debug_using_gui = true                // Must be set to True or False
 #define debug_using_gui false           // Must be set to True or False
 
-// d'board i/o pin defs
-// Tx and Rx have shared defs, but different i/o regs
-#define AUX_RXAGC (1 << 8)
-#define POWER_UP  (1 << 7)         // enables power supply
-#define RX_TXN    (1 << 6)         // Tx only: T/R antenna switch for TX/RX 
port
-#define RX2_RX1N  (1 << 6)         // Rx only: antenna switch between RX2 and 
TX/RX port
-#define ENABLE    (1 << 5)         // enables mixer
-#define AUX_SEN   (1 << 4)
-#define AUX_SCLK  (1 << 3)
-#define PLL_LOCK_DETECT (1 << 2)
-#define AUX_SDO   (1 << 1)
-#define CLOCK_OUT (1 << 0)
-
 class _AD4360_common;
 
 class flexrf_base : public db_base