summaryrefslogtreecommitdiff
path: root/usrp2/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'usrp2/firmware')
-rw-r--r--usrp2/firmware/apps/.gitignore1
-rw-r--r--usrp2/firmware/apps/Makefile.am4
-rw-r--r--usrp2/firmware/apps/app_common_v2.c8
-rw-r--r--usrp2/firmware/include/usrp2_eth_packet.h6
-rw-r--r--usrp2/firmware/lib/Makefile.am41
-rw-r--r--usrp2/firmware/lib/db.h5
-rw-r--r--usrp2/firmware/lib/db_base.h1
-rw-r--r--usrp2/firmware/lib/db_basic.c4
-rw-r--r--usrp2/firmware/lib/db_dbsrx.c1
-rw-r--r--usrp2/firmware/lib/db_init.c12
-rw-r--r--usrp2/firmware/lib/db_init_wbx.c7
-rw-r--r--usrp2/firmware/lib/db_init_xcvr.c404
-rw-r--r--usrp2/firmware/lib/db_rfx.c10
-rw-r--r--usrp2/firmware/lib/db_tvrx.c3
-rw-r--r--usrp2/firmware/lib/db_wbxng.c2
-rw-r--r--usrp2/firmware/lib/db_xcvr2450.c25
16 files changed, 525 insertions, 9 deletions
diff --git a/usrp2/firmware/apps/.gitignore b/usrp2/firmware/apps/.gitignore
index 855a28a47..33469a796 100644
--- a/usrp2/firmware/apps/.gitignore
+++ b/usrp2/firmware/apps/.gitignore
@@ -64,6 +64,7 @@
/rx_only_v2
/txrx
/txrx_wbx
+/txrx_xcvr
/eth_serdes
/serdes_txrx
/set_hw_rev
diff --git a/usrp2/firmware/apps/Makefile.am b/usrp2/firmware/apps/Makefile.am
index 045a05ab4..00f682fc7 100644
--- a/usrp2/firmware/apps/Makefile.am
+++ b/usrp2/firmware/apps/Makefile.am
@@ -46,6 +46,7 @@ noinst_PROGRAMS = \
tx_standalone \
txrx \
txrx_wbx \
+ txrx_xcvr \
factory_test \
burnrev30 \
burnrev31 \
@@ -63,6 +64,7 @@ noinst_PROGRAMS = \
# tx_drop2_SOURCES = tx_drop2.c app_common.c
txrx_SOURCES = txrx.c app_common_v2.c
txrx_wbx_SOURCES = txrx.c app_common_v2.c
+txrx_xcvr_SOURCES = txrx.c app_common_v2.c
factory_test_SOURCES = factory_test.c app_common_v2.c
eth_serdes_SOURCES = eth_serdes.c app_passthru_v2.c
serdes_txrx_SOURCES = serdes_txrx.c app_common_v2.c
@@ -71,6 +73,8 @@ mimo_tx_slave_SOURCES = mimo_tx_slave.c app_common_v2.c
txrx_wbx_LDADD = ../lib/libu2fw_wbx.a
+txrx_xcvr_LDADD = ../lib/libu2fw_xcvr.a
+
noinst_HEADERS = \
app_common_v2.h \
app_passthru_v2.h \
diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c
index 036d0bace..7716ed992 100644
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -494,6 +494,14 @@ handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len)
ok = true;
goto generic_reply;
+ case OP_RX_ANTENNA:
+ ok = db_set_antenna(rx_dboard, ((op_config_mimo_t *)payload)->flags);
+ goto generic_reply;
+
+ case OP_TX_ANTENNA:
+ ok = db_set_antenna(tx_dboard, ((op_config_mimo_t *)payload)->flags);
+ goto generic_reply;
+
case OP_BURN_MAC_ADDR:
ok = ethernet_set_mac_addr(&((op_burn_mac_addr_t *)payload)->addr);
goto generic_reply;
diff --git a/usrp2/firmware/include/usrp2_eth_packet.h b/usrp2/firmware/include/usrp2_eth_packet.h
index 63d4b3af4..2f24556f0 100644
--- a/usrp2/firmware/include/usrp2_eth_packet.h
+++ b/usrp2/firmware/include/usrp2_eth_packet.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009,2010 Free Software Foundation, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -209,6 +209,10 @@ typedef struct {
#define OP_GPIO_WRITE_REPLY (OP_GPIO_WRITE | OP_REPLY_BIT)
#define OP_GPIO_STREAM 21
#define OP_GPIO_STREAM_REPLY (OP_GPIO_STREAM | OP_REPLY_BIT)
+#define OP_RX_ANTENNA 22
+#define OP_RX_ANTENNA_REPLY (OP_RX_ANTENNA | OP_REPLY_BIT)
+#define OP_TX_ANTENNA 23
+#define OP_TX_ANTENNA_REPLY (OP_RX_ANTENNA | OP_REPLY_BIT)
/*
* All subpackets are a multiple of 4 bytes long.
diff --git a/usrp2/firmware/lib/Makefile.am b/usrp2/firmware/lib/Makefile.am
index 8b7762d40..0a7d5c39b 100644
--- a/usrp2/firmware/lib/Makefile.am
+++ b/usrp2/firmware/lib/Makefile.am
@@ -19,7 +19,8 @@ include $(top_srcdir)/Makefile.common
noinst_LIBRARIES = \
libu2fw.a \
- libu2fw_wbx.a
+ libu2fw_wbx.a \
+ libu2fw_xcvr.a
libu2fw_a_SOURCES = \
@@ -35,7 +36,6 @@ libu2fw_a_SOURCES = \
db_dbsrx.c \
db_rfx.c \
db_tvrx.c \
- db_xcvr2450.c \
db_init.c \
dbsm.c \
eeprom.c \
@@ -99,6 +99,43 @@ libu2fw_wbx_a_SOURCES = \
spi.c \
u2_init.c
+libu2fw_xcvr_a_SOURCES = \
+ abort.c \
+ ad9510.c \
+ adf4350.c \
+ adf4350_regs.c \
+ ad9777.c \
+ bsm12.c \
+ buffer_pool.c \
+ clocks.c \
+ db_basic.c \
+ db_xcvr2450.c \
+ db_init_xcvr.c \
+ dbsm.c \
+ eeprom.c \
+ ethernet.c \
+ eth_mac.c \
+ _exit.c \
+ exit.c \
+ hal_io.c \
+ hal_uart.c \
+ i2c.c \
+ lsadc.c \
+ lsdac.c \
+ mdelay.c \
+ memcpy_wa.c \
+ memset_wa.c \
+ nonstdio.c \
+ pic.c \
+ print_mac_addr.c \
+ print_rmon_regs.c \
+ print_fxpt.c \
+ print_buffer.c \
+ printf.c \
+ sd.c \
+ spi.c \
+ u2_init.c
+
noinst_HEADERS = \
ad9510.h \
adf4350.h \
diff --git a/usrp2/firmware/lib/db.h b/usrp2/firmware/lib/db.h
index 7feb1c889..9c0f41da5 100644
--- a/usrp2/firmware/lib/db.h
+++ b/usrp2/firmware/lib/db.h
@@ -99,7 +99,10 @@ db_set_duc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq);
*/
bool
db_set_gain(struct db_base *db, u2_fxpt_gain_t gain);
-
+
+bool
+db_set_antenna(struct db_base *db, int ant);
+
/*!
* \brief Read the eeprom value from the db, without defaulting to BasicRX/TX
*/
diff --git a/usrp2/firmware/lib/db_base.h b/usrp2/firmware/lib/db_base.h
index 2ccfbf509..1945efe0b 100644
--- a/usrp2/firmware/lib/db_base.h
+++ b/usrp2/firmware/lib/db_base.h
@@ -63,6 +63,7 @@ struct db_base {
bool (*set_freq)(struct db_base *, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
bool (*set_gain)(struct db_base *, u2_fxpt_gain_t gain);
bool (*set_tx_enable)(struct db_base *, bool on);
+ bool (*set_antenna)(struct db_base *, int ant);
};
diff --git a/usrp2/firmware/lib/db_basic.c b/usrp2/firmware/lib/db_basic.c
index 2bd4ebfbe..8f86f060b 100644
--- a/usrp2/firmware/lib/db_basic.c
+++ b/usrp2/firmware/lib/db_basic.c
@@ -53,6 +53,7 @@ struct db_basic db_basic_tx = {
.base.set_freq = db_basic_set_freq,
.base.set_gain = db_basic_set_gain,
.base.set_tx_enable = db_basic_set_tx_enable,
+ .base.set_antenna = 0,
};
struct db_basic db_basic_rx = {
@@ -79,6 +80,7 @@ struct db_basic db_basic_rx = {
.base.set_freq = db_basic_set_freq,
.base.set_gain = db_basic_set_gain,
.base.set_tx_enable = db_basic_set_tx_enable,
+ .base.set_antenna = 0,
};
struct db_basic db_lf_tx = {
@@ -105,6 +107,7 @@ struct db_basic db_lf_tx = {
.base.set_freq = db_basic_set_freq,
.base.set_gain = db_basic_set_gain,
.base.set_tx_enable = db_basic_set_tx_enable,
+ .base.set_antenna = 0,
};
struct db_basic db_lf_rx = {
@@ -131,6 +134,7 @@ struct db_basic db_lf_rx = {
.base.set_freq = db_basic_set_freq,
.base.set_gain = db_basic_set_gain,
.base.set_tx_enable = db_basic_set_tx_enable,
+ .base.set_antenna = 0,
};
diff --git a/usrp2/firmware/lib/db_dbsrx.c b/usrp2/firmware/lib/db_dbsrx.c
index 2174a6cd8..ce1300bf2 100644
--- a/usrp2/firmware/lib/db_dbsrx.c
+++ b/usrp2/firmware/lib/db_dbsrx.c
@@ -103,6 +103,7 @@ struct db_dbsrx db_dbsrx = {
.common.d_adl = 0,
.common.d_gc2 = 31,
.common.d_diag = 0,
+ .base.set_antenna = 0,
};
bool
diff --git a/usrp2/firmware/lib/db_init.c b/usrp2/firmware/lib/db_init.c
index 5104f3ce0..bc82946fc 100644
--- a/usrp2/firmware/lib/db_init.c
+++ b/usrp2/firmware/lib/db_init.c
@@ -52,9 +52,6 @@ extern struct db_base db_tvrx2;
extern struct db_base db_tvrx3;
extern struct db_base db_dbsrx;
-extern struct db_base db_xcvr2450_tx;
-extern struct db_base db_xcvr2450_rx;
-
struct db_base *all_dboards[] = {
&db_basic_tx,
&db_basic_rx,
@@ -76,8 +73,6 @@ struct db_base *all_dboards[] = {
#endif
&db_tvrx3,
&db_dbsrx,
- &db_xcvr2450_tx,
- &db_xcvr2450_rx,
0
};
@@ -428,3 +423,10 @@ db_set_gain(struct db_base *db, u2_fxpt_gain_t gain)
{
return db->set_gain(db, gain);
}
+
+bool
+db_set_antenna(struct db_base *db, int ant)
+{
+ if (db->set_antenna == 0) return false;
+ return db->set_antenna(db, ant);
+}
diff --git a/usrp2/firmware/lib/db_init_wbx.c b/usrp2/firmware/lib/db_init_wbx.c
index d7fa20cf9..8810e0d4d 100644
--- a/usrp2/firmware/lib/db_init_wbx.c
+++ b/usrp2/firmware/lib/db_init_wbx.c
@@ -395,3 +395,10 @@ db_set_gain(struct db_base *db, u2_fxpt_gain_t gain)
{
return db->set_gain(db, gain);
}
+
+bool
+db_set_antenna(struct db_base *db, int ant)
+{
+ if (db->set_antenna == 0) return false;
+ return db->set_antenna(db, ant);
+}
diff --git a/usrp2/firmware/lib/db_init_xcvr.c b/usrp2/firmware/lib/db_init_xcvr.c
new file mode 100644
index 000000000..3e3d3eb86
--- /dev/null
+++ b/usrp2/firmware/lib/db_init_xcvr.c
@@ -0,0 +1,404 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2009 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <memory_map.h>
+#include <i2c.h>
+#include <usrp2_i2c_addr.h>
+#include <string.h>
+#include <stdio.h>
+#include <db.h>
+#include <db_base.h>
+#include <hal_io.h>
+#include <nonstdio.h>
+
+
+struct db_base *tx_dboard; // the tx daughterboard that's installed
+struct db_base *rx_dboard; // the rx daughterboard that's installed
+
+extern struct db_base db_basic_tx;
+extern struct db_base db_basic_rx;
+extern struct db_base db_lf_tx;
+extern struct db_base db_lf_rx;
+extern struct db_base db_xcvr2450_tx;
+extern struct db_base db_xcvr2450_rx;
+
+struct db_base *all_dboards[] = {
+ &db_basic_tx,
+ &db_basic_rx,
+ &db_lf_tx,
+ &db_lf_rx,
+ &db_xcvr2450_rx,
+ &db_xcvr2450_tx,
+ 0
+};
+
+
+typedef enum { UDBE_OK, UDBE_NO_EEPROM, UDBE_INVALID_EEPROM } usrp_dbeeprom_status_t;
+
+static usrp_dbeeprom_status_t
+read_raw_dboard_eeprom (unsigned char *buf, int i2c_addr)
+{
+ if (!eeprom_read (i2c_addr, 0, buf, DB_EEPROM_CLEN))
+ return UDBE_NO_EEPROM;
+
+ if (buf[DB_EEPROM_MAGIC] != DB_EEPROM_MAGIC_VALUE)
+ return UDBE_INVALID_EEPROM;
+
+ int sum = 0;
+ unsigned int i;
+ for (i = 0; i < DB_EEPROM_CLEN; i++)
+ sum += buf[i];
+
+ if ((sum & 0xff) != 0)
+ return UDBE_INVALID_EEPROM;
+
+ return UDBE_OK;
+}
+
+
+/*
+ * Return DBID, -1 <none> or -2 <invalid eeprom contents>
+ */
+int
+read_dboard_eeprom(int i2c_addr)
+{
+ unsigned char buf[DB_EEPROM_CLEN];
+
+ usrp_dbeeprom_status_t s = read_raw_dboard_eeprom (buf, i2c_addr);
+
+ //printf("\nread_raw_dboard_eeprom: %d\n", s);
+
+ switch (s){
+ case UDBE_OK:
+ return (buf[DB_EEPROM_ID_MSB] << 8) | buf[DB_EEPROM_ID_LSB];
+
+ case UDBE_NO_EEPROM:
+ default:
+ return -1;
+
+ case UDBE_INVALID_EEPROM:
+ return -2;
+ }
+}
+
+
+static struct db_base *
+lookup_dbid(int dbid)
+{
+ if (dbid < 0)
+ return 0;
+
+ int i;
+ for (i = 0; all_dboards[i]; i++)
+ if (all_dboards[i]->dbid == dbid)
+ return all_dboards[i];
+
+ return 0;
+}
+
+static struct db_base *
+lookup_dboard(int i2c_addr, struct db_base *default_db, char *msg)
+{
+ struct db_base *db;
+ int dbid = read_dboard_eeprom(i2c_addr);
+
+ // FIXME removing this printf has the system hang if there are two d'boards
+ // installed. (I think the problem is in i2c_read/write or the way
+ // I kludge the zero-byte write to set the read address in eeprom_read.)
+ printf("%s dbid: 0x%x\n", msg, dbid);
+
+ if (dbid < 0){ // there was some kind of problem. Treat as Basic Tx
+ return default_db;
+ }
+ else if ((db = lookup_dbid(dbid)) == 0){
+ printf("No daugherboard code for dbid = 0x%x\n", dbid);
+ return default_db;
+ }
+ return db;
+}
+
+void
+set_atr_regs(int bank, struct db_base *db)
+{
+ uint32_t val[4];
+ int shift;
+ int mask;
+ int i;
+
+ val[ATR_IDLE] = db->atr_rxval;
+ val[ATR_RX] = db->atr_rxval;
+ val[ATR_TX] = db->atr_txval;
+ val[ATR_FULL] = db->atr_txval;
+
+ if (bank == GPIO_TX_BANK){
+ mask = 0xffff0000;
+ shift = 16;
+ }
+ else {
+ mask = 0x0000ffff;
+ shift = 0;
+ }
+
+ for (i = 0; i < 4; i++){
+ int t = (atr_regs->v[i] & ~mask) | ((val[i] << shift) & mask);
+ //printf("atr_regs[%d] = 0x%x\n", i, t);
+ atr_regs->v[i] = t;
+ }
+}
+
+static void
+set_gpio_mode(int bank, struct db_base *db)
+{
+ int i;
+
+ hal_gpio_set_ddr(bank, db->output_enables, 0xffff);
+ set_atr_regs(bank, db);
+
+ for (i = 0; i < 16; i++){
+ if (db->used_pins & (1 << i)){
+ // set to either GPIO_SEL_SW or GPIO_SEL_ATR
+ hal_gpio_set_sel(bank, i, (db->atr_mask & (1 << i)) ? 'a' : 's');
+ }
+ }
+}
+
+static int __attribute__((unused))
+determine_tx_mux_value(struct db_base *db)
+{
+ if (db->i_and_q_swapped)
+ return 0x01;
+ else
+ return 0x10;
+}
+
+static int
+determine_rx_mux_value(struct db_base *db)
+{
+#define ADC0 0x0
+#define ADC1 0x1
+#define ZERO 0x2
+
+ static int truth_table[8] = {
+ /* swap_iq, uses */
+ /* 0, 0x0 */ (ZERO << 2) | ZERO, // N/A
+ /* 0, 0x1 */ (ZERO << 2) | ADC0,
+ /* 0, 0x2 */ (ZERO << 2) | ADC1,
+ /* 0, 0x3 */ (ADC1 << 2) | ADC0,
+ /* 1, 0x0 */ (ZERO << 2) | ZERO, // N/A
+ /* 1, 0x1 */ (ZERO << 2) | ADC0,
+ /* 1, 0x2 */ (ZERO << 2) | ADC1,
+ /* 1, 0x3 */ (ADC0 << 2) | ADC1,
+ };
+
+ int subdev0_uses;
+ int subdev1_uses;
+ int uses;
+
+ if (db->is_quadrature)
+ subdev0_uses = 0x3; // uses A/D 0 and 1
+ else
+ subdev0_uses = 0x1; // uses A/D 0 only
+
+ // FIXME second subdev on Basic Rx, LF RX
+ // if subdev2 exists
+ // subdev1_uses = 0x2;
+ subdev1_uses = 0;
+
+ uses = subdev0_uses;
+
+ int swap_iq = db->i_and_q_swapped & 0x1;
+ int index = (swap_iq << 2) | uses;
+
+ return truth_table[index];
+}
+
+
+void
+db_init(void)
+{
+ int m;
+
+ tx_dboard = lookup_dboard(I2C_ADDR_TX_A, &db_basic_tx, "Tx");
+ //printf("db_init: tx dbid = 0x%x\n", tx_dboard->dbid);
+ set_gpio_mode(GPIO_TX_BANK, tx_dboard);
+ tx_dboard->init(tx_dboard);
+ m = determine_tx_mux_value(tx_dboard);
+ dsp_tx_regs->tx_mux = m;
+ //printf("tx_mux = 0x%x\n", m);
+ tx_dboard->current_lo_offset = tx_dboard->default_lo_offset;
+
+ rx_dboard = lookup_dboard(I2C_ADDR_RX_A, &db_basic_rx, "Rx");
+ //printf("db_init: rx dbid = 0x%x\n", rx_dboard->dbid);
+ set_gpio_mode(GPIO_RX_BANK, rx_dboard);
+ rx_dboard->init(rx_dboard);
+ m = determine_rx_mux_value(rx_dboard);
+ dsp_rx_regs->rx_mux = m;
+ //printf("rx_mux = 0x%x\n", m);
+ rx_dboard->current_lo_offset = rx_dboard->default_lo_offset;
+}
+
+/*!
+ * Calculate the frequency to use for setting the digital down converter.
+ *
+ * \param[in] target_freq desired RF frequency (Hz)
+ * \param[in] baseband_freq the RF frequency that corresponds to DC in the IF.
+ *
+ * \param[out] dxc_freq is the value for the ddc
+ * \param[out] inverted is true if we're operating in an inverted Nyquist zone.
+*/
+void
+calc_dxc_freq(u2_fxpt_freq_t target_freq, u2_fxpt_freq_t baseband_freq,
+ u2_fxpt_freq_t *dxc_freq, bool *inverted)
+{
+ u2_fxpt_freq_t fs = U2_DOUBLE_TO_FXPT_FREQ(100e6); // converter sample rate
+ u2_fxpt_freq_t delta = target_freq - baseband_freq;
+
+#if 0
+ printf("calc_dxc_freq\n");
+ printf(" fs = "); print_fxpt_freq(fs); newline();
+ printf(" target = "); print_fxpt_freq(target_freq); newline();
+ printf(" baseband = "); print_fxpt_freq(baseband_freq); newline();
+ printf(" delta = "); print_fxpt_freq(delta); newline();
+#endif
+
+ if (delta >= 0){
+ while (delta > fs)
+ delta -= fs;
+ if (delta <= fs/2){ // non-inverted region
+ *dxc_freq = -delta;
+ *inverted = false;
+ }
+ else { // inverted region
+ *dxc_freq = delta - fs;
+ *inverted = true;
+ }
+ }
+ else {
+ while (delta < -fs)
+ delta += fs;
+ if (delta >= -fs/2){ // non-inverted region
+ *dxc_freq = -delta;
+ *inverted = false;
+ }
+ else { // inverted region
+ *dxc_freq = delta + fs;
+ *inverted = true;
+ }
+ }
+}
+
+bool
+db_set_lo_offset(struct db_base *db, u2_fxpt_freq_t offset)
+{
+ db->current_lo_offset = offset;
+ return true;
+}
+
+bool
+db_tune(struct db_base *db, u2_fxpt_freq_t target_freq, struct tune_result *result)
+{
+ memset(result, 0, sizeof(*result));
+ bool inverted = false;
+ u2_fxpt_freq_t dxc_freq;
+ u2_fxpt_freq_t actual_dxc_freq;
+
+ // Ask the d'board to tune as closely as it can to target_freq+lo_offset
+ bool ok = db->set_freq(db, target_freq+db->current_lo_offset, &result->baseband_freq);
+
+ // Calculate the DDC setting that will downconvert the baseband from the
+ // daughterboard to our target frequency.
+ calc_dxc_freq(target_freq, result->baseband_freq, &dxc_freq, &inverted);
+
+ // If the spectrum is inverted, and the daughterboard doesn't do
+ // quadrature downconversion, we can fix the inversion by flipping the
+ // sign of the dxc_freq... (This only happens using the basic_rx board)
+
+ if (db->spectrum_inverted)
+ inverted = !inverted;
+
+ if (inverted && !db->is_quadrature){
+ dxc_freq = -dxc_freq;
+ inverted = !inverted;
+ }
+
+ if (db->is_tx){
+ dxc_freq = -dxc_freq; // down conversion versus up conversion
+ ok &= db_set_duc_freq(dxc_freq, &actual_dxc_freq);
+ }
+ else {
+ ok &= db_set_ddc_freq(dxc_freq, &actual_dxc_freq);
+ }
+
+ result->dxc_freq = dxc_freq;
+ result->residual_freq = dxc_freq - actual_dxc_freq;
+ result->inverted = inverted;
+ return ok;
+}
+
+static int32_t
+compute_freq_control_word(u2_fxpt_freq_t target_freq, u2_fxpt_freq_t *actual_freq)
+{
+ // If we were using floating point, we'd calculate
+ // master = 100e6;
+ // v = (int) rint(target_freq / master_freq) * pow(2.0, 32.0);
+
+ //printf("compute_freq_control_word\n");
+ //printf(" target_freq = "); print_fxpt_freq(target_freq); newline();
+
+ int32_t master_freq = 100000000; // 100M
+
+ int32_t v = ((target_freq << 12)) / master_freq;
+ //printf(" fcw = %d\n", v);
+
+ *actual_freq = (v * (int64_t) master_freq) >> 12;
+
+ //printf(" actual = "); print_fxpt_freq(*actual_freq); newline();
+
+ return v;
+}
+
+
+bool
+db_set_ddc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq)
+{
+ int32_t v = compute_freq_control_word(dxc_freq, actual_dxc_freq);
+ dsp_rx_regs->freq = v;
+ return true;
+}
+
+bool
+db_set_duc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq)
+{
+ int32_t v = compute_freq_control_word(dxc_freq, actual_dxc_freq);
+ dsp_tx_regs->freq = v;
+ return true;
+}
+
+bool
+db_set_gain(struct db_base *db, u2_fxpt_gain_t gain)
+{
+ return db->set_gain(db, gain);
+}
+
+bool
+db_set_antenna(struct db_base *db, int ant)
+{
+ if (db->set_antenna == 0) return false;
+ return db->set_antenna(db, ant);
+}
diff --git a/usrp2/firmware/lib/db_rfx.c b/usrp2/firmware/lib/db_rfx.c
index ff12f9e32..546559010 100644
--- a/usrp2/firmware/lib/db_rfx.c
+++ b/usrp2/firmware/lib/db_rfx.c
@@ -157,6 +157,7 @@ struct db_rfx_400_rx db_rfx_400_rx = {
.base.atr_rxval = POWER_UP|MIX_EN,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 0,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -188,6 +189,7 @@ struct db_rfx_400_tx db_rfx_400_tx = {
.base.atr_rxval = POWER_UP|ANT_SW,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 1,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -218,6 +220,7 @@ struct db_rfx_900_rx db_rfx_900_rx = {
.base.atr_rxval = MIX_EN,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 1,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -249,6 +252,7 @@ struct db_rfx_900_tx db_rfx_900_tx = {
.base.atr_rxval = ANT_SW,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 1,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -279,6 +283,7 @@ struct db_rfx_1200_rx db_rfx_1200_rx = {
.base.atr_rxval = MIX_EN,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 1,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -310,6 +315,7 @@ struct db_rfx_1200_tx db_rfx_1200_tx = {
.base.atr_rxval = ANT_SW,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 1,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -340,6 +346,7 @@ struct db_rfx_1800_rx db_rfx_1800_rx = {
.base.atr_rxval = MIX_EN,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 0,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -371,6 +378,7 @@ struct db_rfx_1800_tx db_rfx_1800_tx = {
.base.atr_rxval = ANT_SW,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 0,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -402,6 +410,7 @@ struct db_rfx_2400_rx db_rfx_2400_rx = {
.base.atr_rxval = MIX_EN,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 0,
.common.CP1 = 7,
.common.CP2 = 7,
@@ -433,6 +442,7 @@ struct db_rfx_2400_tx db_rfx_2400_tx = {
.base.atr_rxval = ANT_SW,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.DIV2 = 0,
.common.CP1 = 7,
.common.CP2 = 7,
diff --git a/usrp2/firmware/lib/db_tvrx.c b/usrp2/firmware/lib/db_tvrx.c
index 49bf75883..077e59e88 100644
--- a/usrp2/firmware/lib/db_tvrx.c
+++ b/usrp2/firmware/lib/db_tvrx.c
@@ -97,6 +97,7 @@ struct db_tvrx1 db_tvrx1 = {
.base.atr_rxval = 0,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.first_if = U2_DOUBLE_TO_FXPT_FREQ(43.75e6),
.common.second_if = U2_DOUBLE_TO_FXPT_FREQ(5.75e6),
};
@@ -125,6 +126,7 @@ struct db_tvrx2 db_tvrx2 = {
.base.atr_rxval = 0,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.first_if = U2_DOUBLE_TO_FXPT_FREQ(44e6),
.common.second_if = U2_DOUBLE_TO_FXPT_FREQ(56e6), // Fs - 44e6
};
@@ -153,6 +155,7 @@ struct db_tvrx3 db_tvrx3 = {
.base.atr_rxval = 0,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.first_if = U2_DOUBLE_TO_FXPT_FREQ(44e6),
.common.second_if = U2_DOUBLE_TO_FXPT_FREQ(56e6), // Fs - 44e6
};
diff --git a/usrp2/firmware/lib/db_wbxng.c b/usrp2/firmware/lib/db_wbxng.c
index c02a5bdaa..115ac8a24 100644
--- a/usrp2/firmware/lib/db_wbxng.c
+++ b/usrp2/firmware/lib/db_wbxng.c
@@ -63,6 +63,7 @@ struct db_wbxng_rx db_wbxng_rx = {
.base.atr_rxval = RXBB_EN,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.adf4350_regs_int = UINT16_C(100),
.common.adf4350_regs_frac = 0,
.common.adf4350_regs_prescaler = 1,
@@ -98,6 +99,7 @@ struct db_wbxng_tx db_wbxng_tx = {
.base.atr_rxval = RX_TXN,
// .base.atr_tx_delay =
// .base.atr_rx_delay =
+ .base.set_antenna = 0,
.common.adf4350_regs_int = UINT16_C(100),
.common.adf4350_regs_frac = 0,
.common.adf4350_regs_prescaler = 1,
diff --git a/usrp2/firmware/lib/db_xcvr2450.c b/usrp2/firmware/lib/db_xcvr2450.c
index a48af9035..4cdcf031e 100644
--- a/usrp2/firmware/lib/db_xcvr2450.c
+++ b/usrp2/firmware/lib/db_xcvr2450.c
@@ -64,6 +64,8 @@ bool xcvr2450_set_freq(struct db_base *db, u2_fxpt_freq_t freq, u2_fxpt_freq_t *
bool xcvr2450_set_gain_rx(struct db_base *db, u2_fxpt_gain_t gain);
bool xcvr2450_set_gain_tx(struct db_base *db, u2_fxpt_gain_t gain);
bool xcvr2450_set_tx_enable(struct db_base *db, bool on);
+bool xcvr2450_set_rx_antenna(struct db_base *db, int ant);
+bool xcvr2450_set_tx_antenna(struct db_base *db, int ant);
struct db_xcvr2450_common {
int d_mimo, d_int_div, d_frac_div, d_highband, d_five_gig;
@@ -154,6 +156,7 @@ struct db_xcvr2450_rx db_xcvr2450_rx = {
.base.atr_mask = RX_ATR_MASK,
.base.atr_txval = 0x0,
.base.atr_rxval = 0x0,
+ .base.set_antenna = xcvr2450_set_rx_antenna,
.common = &db_xcvr2450_common,
};
@@ -178,6 +181,7 @@ struct db_xcvr2450_tx db_xcvr2450_tx = {
.base.atr_mask = TX_ATR_MASK,
.base.atr_txval = 0x0,
.base.atr_rxval = 0x0,
+ .base.set_antenna = xcvr2450_set_tx_antenna,
.common = &db_xcvr2450_common,
};
@@ -494,3 +498,24 @@ xcvr2450_set_tx_enable(struct db_base *dbb, bool on){
set_gpio(db);
return true;
}
+
+/**************************************************
+ * Set Antennas
+ **************************************************/
+bool xcvr2450_set_rx_antenna(struct db_base *dbb, int ant){
+ printf("xcvr set rx ant %d\n", ant);
+ if (ant > 1) return false;
+ struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
+ db->common->d_rx_ant = ant;
+ set_gpio(db);
+ return true;
+}
+
+bool xcvr2450_set_tx_antenna(struct db_base *dbb, int ant){
+ printf("xcvr set tx ant %d\n", ant);
+ if (ant > 1) return false;
+ struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
+ db->common->d_tx_ant = ant;
+ set_gpio(db);
+ return true;
+}
generated by cgit (git 2.34.1) at 2024-12-22 17:13:49 +0000