diff options
| author | Matt Ettus | 2010-02-20 09:59:15 -0800 |
|---|---|---|
| committer | Matt Ettus | 2010-02-20 09:59:15 -0800 |
| commit | b2117ee60e60a7e7cf27c6b88d45195e70185175 (patch) | |
| tree | 6e2e9242c84be6cb7c43f533f5a1a5525e4c028d /usrp2/firmware/apps/app_common_v2.c | |
| parent | ceeccd034f16f0e74cde8bad57f8975159b0d217 (diff) | |
| parent | 8daf6e19c11184fcc8e61b00a9f17fa2ad6718fa (diff) | |
| download | gnuradio-b2117ee60e60a7e7cf27c6b88d45195e70185175.tar.gz gnuradio-b2117ee60e60a7e7cf27c6b88d45195e70185175.tar.bz2 gnuradio-b2117ee60e60a7e7cf27c6b88d45195e70185175.zip | |
Merge branch 'db_default'
Diffstat (limited to 'usrp2/firmware/apps/app_common_v2.c')
| -rw-r--r-- | usrp2/firmware/apps/app_common_v2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c index 2d131bda7..036d0bace 100644 --- a/usrp2/firmware/apps/app_common_v2.c +++ b/usrp2/firmware/apps/app_common_v2.c @@ -31,6 +31,7 @@ #include "clocks.h" #include "u2_init.h" #include <string.h> +#include "usrp2_i2c_addr.h" volatile bool link_is_up = false; // eth handler sets this int cpu_tx_buf_dest_port = PORT_ETH; @@ -308,7 +309,7 @@ read_time_cmd(const op_generic_t *p, static void fill_db_info(u2_db_info_t *p, const struct db_base *db) { - p->dbid = db->dbid; + //p->dbid = db->dbid; p->freq_min_hi = u2_fxpt_freq_hi(db->freq_min); p->freq_min_lo = u2_fxpt_freq_lo(db->freq_min); p->freq_max_hi = u2_fxpt_freq_hi(db->freq_max); @@ -334,6 +335,9 @@ dboard_info_cmd(const op_generic_t *p, fill_db_info(&r->tx_db_info, tx_dboard); fill_db_info(&r->rx_db_info, rx_dboard); + r->tx_db_info.dbid = read_dboard_eeprom(I2C_ADDR_TX_A); + r->rx_db_info.dbid = read_dboard_eeprom(I2C_ADDR_RX_A); + return r->len; } |