summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gr-pager/swig/Makefile.am2
-rwxr-xr-xusrp/firmware/src/common/build_eeprom.py18
-rw-r--r--usrp/firmware/src/usrp2/Makefile.am4
-rw-r--r--usrp/host/lib/db_wbxng_adf4350_regs.cc22
-rw-r--r--usrp/host/lib/db_wbxng_adf4350_regs.h22
-rw-r--r--usrp2/firmware/apps/app_common_v2.c6
-rw-r--r--usrp2/firmware/lib/adf4350.c2
-rw-r--r--usrp2/firmware/lib/adf4350.h2
-rw-r--r--usrp2/firmware/lib/adf4350_regs.c2
-rw-r--r--usrp2/firmware/lib/db.h5
-rw-r--r--usrp2/firmware/lib/db_wbxng.c2
-rw-r--r--usrp2/firmware/lib/db_wbxng.h2
12 files changed, 65 insertions, 24 deletions
diff --git a/gr-pager/swig/Makefile.am b/gr-pager/swig/Makefile.am
index 890459cb6..9e1a45219 100644
--- a/gr-pager/swig/Makefile.am
+++ b/gr-pager/swig/Makefile.am
@@ -41,7 +41,7 @@ pager_swig_pythondir_category = \
# additional libraries for linking with the SWIG-generated library
pager_swig_la_swig_libadd = \
- $(builddir)/../lib/libgnuradio-pager.la
+ $(abs_top_builddir)/gr-pager/lib/libgnuradio-pager.la
# additional SWIG files to be installed
pager_swig_swiginclude_headers = \
diff --git a/usrp/firmware/src/common/build_eeprom.py b/usrp/firmware/src/common/build_eeprom.py
index 023c4b3f5..ed9bb56a4 100755
--- a/usrp/firmware/src/common/build_eeprom.py
+++ b/usrp/firmware/src/common/build_eeprom.py
@@ -140,12 +140,12 @@ def build_eeprom_image (filename, rev):
assert (len (image) <= 256)
return image
-def build_shell_script (out, ihx_filename, rev):
+def build_shell_script (out, ihx_filename, rev, prefix):
image = build_eeprom_image (ihx_filename, rev)
out.write ('#!/bin/sh\n')
- out.write ('usrper -x load_firmware /usr/local/share/usrp/rev%d/std.ihx\n' % rev)
+ out.write ('usrper -x load_firmware ' + prefix + '/share/usrp/rev%d/std.ihx\n' % rev)
out.write ('sleep 1\n')
# print "len(image) =", len(image)
@@ -164,8 +164,10 @@ def build_shell_script (out, ihx_filename, rev):
out.write ('sleep 1\n')
if __name__ == '__main__':
- usage = "usage: %prog -r REV [options] bootfile.ihx"
+ usage = "usage: %prog -p PREFIX -r REV [options] bootfile.ihx"
parser = OptionParser (usage=usage)
+ parser.add_option ("-p", "--prefix", type="string", default="",
+ help="Specify install prefix from configure")
parser.add_option ("-r", "--rev", type="int", default=-1,
help="Specify USRP revision number REV (2 or 4)")
(options, args) = parser.parse_args ()
@@ -176,7 +178,15 @@ if __name__ == '__main__':
sys.stderr.write (
"You must specify the USRP revision number (2 or 4) with -r REV\n")
sys.exit (1)
+ if options.prefix == "":
+ sys.stderr.write (
+ "You must specify the install prefix with -p PREFIX\n")
+ sys.exit (1)
+ if not os.path.isdir(options.prefix):
+ sys.stderr.write (
+ "PREFIX dir (" + options.prefix + "), does not exist\n")
+ sys.exit (1)
ihx_filename = args[0]
- build_shell_script (sys.stdout, ihx_filename, options.rev)
+ build_shell_script (sys.stdout, ihx_filename, options.rev, options.prefix)
diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am
index e380b1907..4402cd636 100644
--- a/usrp/firmware/src/usrp2/Makefile.am
+++ b/usrp/firmware/src/usrp2/Makefile.am
@@ -108,11 +108,11 @@ eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP)
$(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
burn-usrp2-eeprom: eeprom_boot.ihx
- $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
+ $(PYTHON) $(srcdir)/../common/build_eeprom.py -p$(prefix) -r2 eeprom_boot.ihx > $@
chmod +x $@
burn-usrp4-eeprom: eeprom_boot.ihx
- $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
+ $(PYTHON) $(srcdir)/../common/build_eeprom.py -p$(prefix) -r4 eeprom_boot.ihx > $@
chmod +x $@
diff --git a/usrp/host/lib/db_wbxng_adf4350_regs.cc b/usrp/host/lib/db_wbxng_adf4350_regs.cc
index bc859158e..21d77dcce 100644
--- a/usrp/host/lib/db_wbxng_adf4350_regs.cc
+++ b/usrp/host/lib/db_wbxng_adf4350_regs.cc
@@ -1,6 +1,22 @@
-/*
- * Copyright 2009 Ettus Research LLC
- */
+//
+// Copyright 2009 Free Software Foundation, Inc.
+//
+// This file is part of GNU Radio
+//
+// GNU Radio 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 asversion 3, or (at your option)
+// any later version.
+//
+// GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
+// the Free Software Foundation, Inc., 51 Franklin Street,
+// Boston, MA 02110-1301, USA.
#include "db_wbxng_adf4350_regs.h"
#include "db_wbxng_adf4350.h"
diff --git a/usrp/host/lib/db_wbxng_adf4350_regs.h b/usrp/host/lib/db_wbxng_adf4350_regs.h
index 3973b4d6b..0018aa07f 100644
--- a/usrp/host/lib/db_wbxng_adf4350_regs.h
+++ b/usrp/host/lib/db_wbxng_adf4350_regs.h
@@ -1,6 +1,22 @@
-/*
- * Copyright 2009 Ettus Research LLC
- */
+//
+// Copyright 2009 Free Software Foundation, Inc.
+//
+// This file is part of GNU Radio
+//
+// GNU Radio 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 asversion 3, or (at your option)
+// any later version.
+//
+// GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
+// the Free Software Foundation, Inc., 51 Franklin Street,
+// Boston, MA 02110-1301, USA.
#ifndef ADF4350_REGS_H
#define ADF4350_REGS_H
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;
}
diff --git a/usrp2/firmware/lib/adf4350.c b/usrp2/firmware/lib/adf4350.c
index b2e8db8e2..0725c9337 100644
--- a/usrp2/firmware/lib/adf4350.c
+++ b/usrp2/firmware/lib/adf4350.c
@@ -1,8 +1,6 @@
/*
* Copyright 2010 Free Software Foundation, Inc.
*
- * Copyright 2010 Ettus Research LLC
- *
* 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
diff --git a/usrp2/firmware/lib/adf4350.h b/usrp2/firmware/lib/adf4350.h
index 5ee13ddbb..3c66ec344 100644
--- a/usrp2/firmware/lib/adf4350.h
+++ b/usrp2/firmware/lib/adf4350.h
@@ -1,8 +1,6 @@
/*
* Copyright 2010 Free Software Foundation, Inc.
*
- * Copyright 2010 Ettus Research LLC
- *
* 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
diff --git a/usrp2/firmware/lib/adf4350_regs.c b/usrp2/firmware/lib/adf4350_regs.c
index 196a97c5b..e2740d3ab 100644
--- a/usrp2/firmware/lib/adf4350_regs.c
+++ b/usrp2/firmware/lib/adf4350_regs.c
@@ -1,8 +1,6 @@
/*
* Copyright 2010 Free Software Foundation, Inc.
*
- * Copyright 2010 Ettus Research LLC
- *
* 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
diff --git a/usrp2/firmware/lib/db.h b/usrp2/firmware/lib/db.h
index cec960267..7feb1c889 100644
--- a/usrp2/firmware/lib/db.h
+++ b/usrp2/firmware/lib/db.h
@@ -100,5 +100,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);
+/*!
+ * \brief Read the eeprom value from the db, without defaulting to BasicRX/TX
+ */
+int
+read_dboard_eeprom(int i2c_addr);
#endif /* INCLUDED_DB_H */
diff --git a/usrp2/firmware/lib/db_wbxng.c b/usrp2/firmware/lib/db_wbxng.c
index 1620c6629..c02a5bdaa 100644
--- a/usrp2/firmware/lib/db_wbxng.c
+++ b/usrp2/firmware/lib/db_wbxng.c
@@ -1,8 +1,6 @@
/*
* Copyright 2010 Free Software Foundation, Inc.
*
- * Copyright 2010 Ettus Research LLC
- *
* 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
diff --git a/usrp2/firmware/lib/db_wbxng.h b/usrp2/firmware/lib/db_wbxng.h
index b2437cbcc..3756e6c24 100644
--- a/usrp2/firmware/lib/db_wbxng.h
+++ b/usrp2/firmware/lib/db_wbxng.h
@@ -1,8 +1,6 @@
/*
* Copyright 2010 Free Software Foundation, Inc.
*
- * Copyright 2010 Ettus Research LLC
- *
* 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
generated by cgit (git 2.34.1) at 2025-03-31 20:33:06 +0000