Commit Graph

42 Commits

Author SHA1 Message Date
Pau Espin 573075bfed Fix compilation with newer sdcc
Since recent system upgrade which pulled in sdcc 4.3.0, build fails with
following error:
/git/libusrp/firmware/include/fx2regs.h:324: syntax error: token -> '+' ; column 26

It seems newer sdcc doesn't like having sums directly in there. Using
parenthesis around the expression fixes the problem.

Related: OS#6157
Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea
2023-08-29 14:02:56 +02:00
Pau Espin d1d39c65a3 cosmetic: fx2regs.h: Fix trailing whitespace
Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db
2023-08-29 14:02:56 +02:00
Harald Welte d40ef8f001 migrate to python3
Let's move to python3, it's 2020 and the conversion seemed
actually rather trivial (famous last words).

Change-Id: Ib1604b36c32630e1360e06567cbd5f63a78df547
2021-11-12 12:52:18 +00:00
Oliver Smith 9aaee8c17b firmware/src/usrp2/ fix "distcheck"
Properly remove lk files to fix the following error during
"make distcheck".

ERROR: files left in build directory after distclean:

Change-Id: I5f1b1f5ad72112ba7212800da7f85846bb6e7187
2019-07-10 15:28:46 +02:00
Alexander Huemer 523993f19d usrp2: firmware: ignore .lk build artifacts
Change-Id: I79cbb834f02dc3f804e5a1476724245407f0eade
2019-02-06 21:36:25 +01:00
Pau Espin 4edd1ab6fb edit-gpif: Fix build for distros with python3 as default
Fix the script so it is python2 and python3 compatible, then let the
distro decide which python version to use.

Change-Id: If805c8167e2cf57ce3d6143dddfd4685ad729142
2019-02-06 18:15:01 +01:00
Pau Espin d20c118fd2 Fix build for distros with python3 as default
The script contains python2-only syntax, so it can only be run with
python2. Make sure to explicitly specify it needs to be run with python2
in order to run it fine on distros where python points to python3.

Change-Id: Ie695c26f1b2a4f84bdc2b67938fe37a4c50681dd
2019-02-06 18:12:22 +01:00
Harald Welte 820287e108 Re-enable build of usrp FX2 firmware
Back in df354005f3, for some reason
building the USRP1 FX2 firmware was disabled.  Let's re-enable it, as
the FX2 firmware is required as an essential part of USRP1 device
operation.  It's loaded into the FX2 RAM over USB after the initial USB

As the firmware code has meanwhile been ported to a more modern
SDCC dialect (SDCC 3.2 or later, released in 2012), we have to adjust
the required minimum SDCC version.

Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b
2019-01-12 09:46:42 +00:00
Harald Welte 0934c37850 firmware: Port to more modern SDCC syntax.
SDCC, at least from version 3 onwards, has change the names of special
attributes like "at" or "sfr".  They are now all prefixed with double-

Upstream fx2lib has made that change in commit 3071389d9a868ed553b84809b399008648536fcf
which can be obtained from

Change-Id: I5df64bc3cc09402bdfacec9c256e96135e3688fd
2019-01-12 09:46:42 +00:00
Harald Welte a001479225 firmware: Fix include directory path names
When we forked libusrp from the gnuradio source archive, we moved
around the directories, but failed to adjust the FW_INCLUDES.

Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0
2019-01-12 09:46:42 +00:00
Pau Espin 15bf18f518 build: use correct python version in
AM_PATH_PYTHON is broken, we already dropped it in other osmocom

Change-Id: I17a79464718c9dcf8f4f579fb1871bfac22075e3
2018-04-29 14:38:15 +00:00
Pau Espin df354005f3 build: Fix make distcheck
Change-Id: I8f71cf91d4cdbe0fdc4e451b89d95437ff800337
2018-04-27 15:14:25 +02:00
Eric Blossom d736692415 Allocate 10 additional USB PIDs to Bdale. 2011-08-13 16:06:21 -07:00
Eric Blossom 72457807d0 Update details on Bdale's existing USB PID allocation. 2011-08-13 16:02:03 -07:00
Eric Blossom deea1393ef Remove bogus check for existence of prefix directory. 2010-05-19 15:26:08 -07:00
Eric Blossom 6f3ac452ba Assign USB PID for Hans de Bok 2010-05-10 10:42:32 -07:00
Johnathan Corgan 01f334c712 Merge branch 'usrp-eeprom' of git://
* 'usrp-eeprom' of git://
  Increase sleep to prevent eeprom problems
2010-04-15 08:05:23 -07:00
Jason Abele 57e1f688e6 Increase sleep to prevent eeprom problems 2010-04-14 15:07:24 -07:00
Eric Blossom 9f813ee505 Add pid for ThinkRF 2010-04-14 13:55:46 -07:00
Jason Abele c61b82ff55 Fixed creation of burn-usrp2-eeprom, burn-usrp4-eeprom
Added $prefix from configure to paths
2010-02-10 10:01:47 -08:00
Eric Blossom bfc5222183 Add USB PID for HPSDR HERMES device. 2009-11-11 12:38:41 -08:00
git 2985cbe8aa Added git ignore files auto created from svn:ignore properties.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2009-08-14 18:10:11 +00:00
jcorgan 707f3cef77 Merged r11377:11390 from jcorgan/usrp-headers in to trunk.
* Public USRP(1) header files are now in their own source directory
  and install into $(includedir)/usrp.  This was done to avoid name
  clashes in the top-level include directory.

  Only users who are developing directly to libusrp in C++ are
  affected; the GNU Radio C++ and Python APIs are unchanged.

  The simple change required by this update is to change:

  #include <usrp_*.h> 

  to #include 

  <usrp/usrp_*.h> your source code.

* Removed usrp-inband code from tree (put into limbo directory.)
  This code has become unmaintained and has started to suffer
  from bitrot.  A checkpoint tag has been made for anyone still
  needing to use it:

  The plan during the 3.2->3.3 development cycle is to replace the
  functions done by the in-band code with extensions to the existing
  gr-usrp blocks using the new message passing architecture.

  The USRP hardware FPGA code that provided the inband interface
  has not been removed; however, it too has become unmaintained and
  will likely be rewritten/replaced during the 3.3 timeframe.

The trunk passes distcheck.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-09 02:55:51 +00:00
jcorgan 4823541eb9 Make fpga register definition header files installed.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-06-10 19:52:55 +00:00
eb 1e6197dd77 Merged gcell, the Cell SPE scheduler and RPC mechanism into the trunk.
(eb/trunk-with-gcell r8037:8085).  Expect additional tweaks, but
currently works and passes distcheck.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-03-24 06:09:29 +00:00
michaelld 2114353a06 Merged build_config branch into trunk:
1) Modified top-level script:

 a) to execute code for setting or changing the library search path in
    Darwin (DYLD_LIBRARY_PATH) or Windows (PATH) on those host OSs
    only, not on other host OSs.

 b) Added local (to the component making check) library paths to those
    same search paths, since libtool doesn't do it (unlike in Linux).

2) In all AM Makefiles -except those dealing with USRP firmware-,
changes INCLUDES to AM_CPPFLAGS since the former is deprecated.

3) Changed AM_CPPFLAGS to FW_INCLUDES for commands .c.rel in USRP

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-02-21 19:16:45 +00:00
eb df946735f9 VPATH fix
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-02-05 01:56:07 +00:00
eb 9a3f0ff8de Renumbered FGV_* so that they are zero based to fix problem
reported and diagnosed by Michele Bavaro <>

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-12-03 17:46:09 +00:00
eb 117ea8a18b Updated license from GPL version 2 or later to GPL version 3 or later.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-07-21 03:44:38 +00:00
jcorgan aaa14819d3 Merged r5732:5941 from jcorgan/sar into trunk. Adds start of gr-radar-mono component. Trunk passes distcheck.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-07-12 00:54:37 +00:00
eb 071e2f6d1b Fix for ticket:148 "Unable to find USRP #0" on 2.6.20 (Ubuntu Feisty Fawn).
2 days, 1 line ;)

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-04-28 02:00:15 +00:00
jcorgan 0e9c5a85cb Adds capability to independently delay the Auto T/R switching signal
by a configurable number of clock ticks, to allow users to precisely
align their T/R output with the pipeline delays in the transmitter.

There are two new registers:


...and the corresponding methods to set them:


These methods are inherited by all the daughterboard objects so you can
call them from your scripts as:


...where 'subdev' represents the daughtercard object you're working with.

The FPGA synthesis for the 2 RXHB, 2 TX case expands from 95% to 96%,
with no additional synthesis messages or impact on timing.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-04-16 21:30:13 +00:00
eb 2213812e77 allocated 10 USB PIDs for Bdale
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-02-19 22:14:55 +00:00
eb 58602bf71b Fix for ticket:133, merged from eb/bsd 4322:4324.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-01-30 00:34:14 +00:00
eb 5e021a2145 added PID for EZDOP
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-01-03 19:25:13 +00:00
eb 3ff8e05153 Added new PID for QS1R HF Receiver
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-01-03 17:09:30 +00:00
jcorgan 82d18c6aa7 Fixes ticket:109
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2006-12-01 00:11:02 +00:00
gdt b81a7589f7 2006-10-10 Greg Troxel <>
* firmware/include/ avoid nonportable use of $< (first
	prereq in GNU make, implied source for pattern rule in BSD make)
	used in a non-pattern rule.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2006-10-10 16:25:28 +00:00
eb 7a0001d24a Updated FSF address in all files. Fixes ticket:51
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2006-09-13 21:30:04 +00:00
jcorgan 1f153f839e Fixes for ticket:35, allowing use of BSD make instead of GNU make.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-15 03:39:14 +00:00
jcorgan e4478bc155 Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from
/gnuradio/branches/developers/jcorgan/ticket-10.  'make distcheck' now
successfully completes on a machine that has never had gnuradio installed
before.  In addition, several cleanups and refactoring of build system
code have been applied.  NOTE: gr-audio-portaudio, gr-audio-osx, and
gr-audio-windows have not been fully tested and will need verification
by the maintainers of these components.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-07 15:41:19 +00:00
jcorgan 99a9de4013 Houston, we have a trunk.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-03 04:51:51 +00:00