[Commit-gnuradio] r9812 - in gnuradio/branches/developers/eb/u2-wip2/usrp2: firmware/include host/include/usrp2

[eb]

Author: eb
Date: 2008-10-21 15:40:00 -0600 (Tue, 21 Oct 2008)
New Revision: 9812

Modified:
   
gnuradio/branches/developers/eb/u2-wip2/usrp2/firmware/include/usrp2_eth_packet.h
   gnuradio/branches/developers/eb/u2-wip2/usrp2/host/include/usrp2/usrp2.h
Log:
work-in-progress on usrp2

Modified: 
gnuradio/branches/developers/eb/u2-wip2/usrp2/firmware/include/usrp2_eth_packet.h
===================================================================
--- 
gnuradio/branches/developers/eb/u2-wip2/usrp2/firmware/include/usrp2_eth_packet.h
   2008-10-21 21:33:44 UTC (rev 9811)
+++ 
gnuradio/branches/developers/eb/u2-wip2/usrp2/firmware/include/usrp2_eth_packet.h
   2008-10-21 21:40:00 UTC (rev 9812)
@@ -181,6 +181,8 @@
 #define        OP_STOP_RX_REPLY             (OP_STOP_RX | OP_REPLY_BIT)
 #define        OP_CONFIG_MIMO               8
 #define OP_CONFIG_MIMO_REPLY        (OP_CONFIG_MIMO | OP_REPLY_BIT)
+#define        OP_DBOARD_INFO               9
+#define        OP_DBOARD_INFO_REPLY         (OP_DBOARD_INFO | OP_REPLY_BIT)
 
 
 //#define OP_WRITE_REG          xx     // not implemented
@@ -199,7 +201,7 @@
  *
  * Used by:
  *  OP_EOP, OP_BURN_MAC_ADDR_REPLY, OP_START_RX_STREAMING_REPLY,
- *  OP_STOP_RX_REPLY
+ *  OP_STOP_RX_REPLY, OP_DBOARD_INFO
  */
 typedef struct {
   uint8_t      opcode;
@@ -348,6 +350,36 @@
 } op_config_mimo_t;
 
 
+/*!
+ * \brief High-level information about daughterboards
+ */
+typedef struct {
+  int32_t      dbid;           //< d'board ID (-1 none, -2 invalid eeprom)
+  uint32_t     freq_min_hi;    //< high 32-bits of 64-bit fxpt_freq (Q44.20)
+  uint32_t     freq_min_lo;    //< low  32-bits of 64-bit fxpt_freq (Q44.20)
+  uint32_t     freq_max_hi;    //< high 32-bits of 64-bit fxpt_freq (Q44.20)
+  uint32_t     freq_max_lo;    //< low  32-bits of 64-bit fxpt_freq (Q44.20)
+  uint16_t     gain_min;       //< min gain that can be set. fxpt_db (Q9.7)
+  uint16_t     gain_max;       //< max gain that can be set. fxpt_db (Q9.7)
+  uint16_t     gain_step_size; //< fxpt_db (Q9.7)
+} u2_db_info_t;
+
+
+/*!
+ * \brief Reply to d'board info request
+ */
+typedef struct {
+  uint8_t      opcode;
+  uint8_t      len;
+  uint8_t      rid;
+  uint8_t      ok;             // request was successful (bool)
+
+  u2_db_info_t tx_db_info;
+  u2_db_info_t rx_db_info;
+} _AL4 op_dboard_info_reply_t;
+
+
+
 /*
  * ================================================================
  *             union of all of subpacket types

Modified: 
gnuradio/branches/developers/eb/u2-wip2/usrp2/host/include/usrp2/usrp2.h
===================================================================
--- gnuradio/branches/developers/eb/u2-wip2/usrp2/host/include/usrp2/usrp2.h    
2008-10-21 21:33:44 UTC (rev 9811)
+++ gnuradio/branches/developers/eb/u2-wip2/usrp2/host/include/usrp2/usrp2.h    
2008-10-21 21:40:00 UTC (rev 9812)
@@ -103,14 +103,30 @@
 
     /*!
      * Set receiver gain
+     * \param gain in dB (more or less)
      */
     bool set_rx_gain(double gain);
 
+    //! return minimum Rx gain 
+    double rx_gain_min();
+
+    //! return maximum Rx gain 
+    double rx_gain_max();
+
+    //! return Rx gain db_per_step
+    double rx_gain_db_per_step();
+
     /*!
      * Set receiver center frequency
      */
     bool set_rx_center_freq(double frequency, tune_result *result);
 
+    //! return minimum Rx center frequency
+    double rx_freq_min();
+
+    //! return maximum Rx center frequency
+    double rx_freq_max();
+
     /*!
      * Set receiver sample rate decimation
      */
@@ -173,11 +189,26 @@
      */
     bool set_tx_gain(double gain);
 
+    //! return minimum Tx gain 
+    double tx_gain_min();
+
+    //! return maximum Tx gain 
+    double tx_gain_max();
+
+    //! return Tx gain db_per_step
+    double tx_gain_db_per_step();
+
     /*!
      * Set transmitter center frequency
      */
     bool set_tx_center_freq(double frequency, tune_result *result);
 
+    //! return minimum Tx center frequency
+    double tx_freq_min();
+
+    //! return maximum Tx center frequency
+    double tx_freq_max();
+
     /*!
      * Set transmitter sample rate interpolation
      */