Commit Graph

316 Commits

Author SHA1 Message Date
Oliver Smith 9aaee8c17b firmware/src/usrp2/Makefile.am: fix "distcheck"
Properly remove lk files to fix the following error during
"make distcheck".

ERROR: files left in build directory after distclean:
./firmware/src/usrp2/eeprom_boot.lk
./firmware/src/usrp2/std.lk

Change-Id: I5f1b1f5ad72112ba7212800da7f85846bb6e7187
2019-07-10 15:28:46 +02:00
Alexander Huemer db7fbf8c11 Avoid compiler warning 'dynamic exception specifications are deprecated in C++11 [-Wdeprecated]'
Change-Id: Ie472e6f92944cfe1af7d63cd644879573d080ca2
2019-02-06 21:45:14 +01: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 build_eeprom.py: 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
Max bbb6193093 Add config for git-review
Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b
2019-01-24 17:53:48 +01:00
Harald Welte bc019b203f debian: Add 'sdcc' package to BuildDepends
We recently re-introduced building the USRP1 FX2 firmware
using SDCC.  This needs to be listed as requirement for building
the package, otherwise build are failing.

Change-Id: I23ca8d7ad26437f2c971608cd881a6f40e26a887
2019-01-13 10:15:10 +01:00
Harald Welte 0751a53cc5 debian: Make sure the FX2 firmware is packaged
Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127
2019-01-12 09:46:42 +00: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
attach.

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-
underscores.

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

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 b1ad0157dc debian/rules: Don't overwrite .tarball-version
The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99
2018-09-17 10:44:20 +02:00
Pau Espin 15bf18f518 build: use correct python version in generate_regs.py
AM_PATH_PYTHON is broken, we already dropped it in other osmocom
projects.

Change-Id: I17a79464718c9dcf8f4f579fb1871bfac22075e3
2018-04-29 14:38:15 +00:00
Pau Espin 52f0929e62 Add debian directory
Related: OS#3218
Change-Id: I5ff1d76f533b9ac68ab3f2c70ead6b66f4413b4f
2018-04-28 11:07:41 +02:00
Pau Espin 85538b98d0 Makefile.par.gen: Fix .deps directory not present during build
Change-Id: I899cde47bb03ed6f00d431e7d744be6f663ae314
2018-04-27 15:14:25 +02:00
Pau Espin df354005f3 build: Fix make distcheck
Change-Id: I8f71cf91d4cdbe0fdc4e451b89d95437ff800337
2018-04-27 15:14:25 +02:00
Pau Espin e9f1d62080 usrp.pc.in: Drop unset LIBUSB_PKG_CONFIG_NAME
That variable is expected to be set by macro USRP_LIBUSB
from m4/usrp_libusb.m4, but it is never called in configure.ac.
Furthermore, the macro doesn't seem to be working fine in some
environments like debian9, while it works on others (ArchLinux), so
let's better drop it.

Change-Id: Ia5f7ec69701abff91ff8e903e0fd53f8d9fbfba6
2018-04-26 20:42:12 +02:00
Pau Espin 12196606d5 usrp.pc.in: Fix version in output pc file
Change-Id: If9906a54175146cf80ea793a5ae40a7b4a005775
2018-04-24 17:45:57 +02:00
Pau Espin fc8b77e303 gitignore: Remove and ignore libtool related m4 files
Change-Id: I05278c823ca76644ce4e494ff4c7de95e42d4f20
2018-04-24 17:45:55 +02:00
Pau Espin 46ac7d0df8 Makefile.common: Fix typo preventing build
Change-Id: Ib38f6c38e5a40bd11e7b42285d2e244b3f54e0b2
2018-04-24 17:45:53 +02:00
Martin Hauke ce3b2fda09 build: Link libusrp_la also to boost_system
Change-Id: I184214c37251dde0ea9bd05f4a4cebfed35a8d9f
2018-01-23 22:12:14 +01:00
Harald Welte f6bdf4a410 Add contrib/jenkins.sh for jenkins.osmocom.org integration
Change-Id: Ie186074b338314e560ccf7f87b17dae2617a0966
2018-01-21 18:30:18 +01:00
Alexander Huemer ec6adccbbd Extract libusrp, adjust to be buildable standalone
* $ git \
    filter-branch \
    --prune-empty \
    --tree-filter \
    'find \! -path "./usrp/*" -a -type f -delete' \
    HEAD
* Craft custom configure.ac
* Update m4 macros
* Small fixes here and there

The code in doc/, firmware/ and host/swig does _not_ build at the
moment, due to m4 macros not being adhered and is disabled therefore.
2018-01-21 01:30:14 +01: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
Don Ward 39daad5310 usrp: cleanup misc usage 2011-03-30 15:36:36 -07:00
Tom Rondeau 9d9baa5386 Merge branch 'master' of gnuradio.org:gnuradio 2011-03-25 13:53:09 -04:00
Don Ward 83056e43d7 Fixing missing include files and various other patches for Windows build issues. 2011-03-25 11:53:04 -04:00
Tom Rondeau a75112feb7 Merge branch 'master' of gnuradio.org:gnuradio 2011-03-20 12:31:10 -04:00
Tom Rondeau d694deb33b Fixing missing header file (in prep for future GCC's). ptrdiff_t is defined in stddef.h. 2011-02-27 17:35:05 -05:00
Eric Blossom f2857f1818 Merge branch 'next' into guile-next
* next: (116 commits)
  Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted.
  Modifying blsk2 wrapper for PFB arbitrary resampler to allow the user to just specify the requested resampling rate without providing their own filter taps.
  uhd: reverting tag changes on uhd single usrp source, there seems to be issues with the work() logic
  uhd: removed default value chan=0 in the cc files
  WITH_INCLUDES _must_ be last
  uhd: replaced CFLAGS with CPPFLAGS variable, and fixed swig args FIXME
  uhd: default channel params to zero for single source and sink blocks
  Revert "Removed usrp2-firmware from being automatically built."
  Remove generated file from repo
  Removed usrp2-firmware from being automatically built.
  uhd: added libdir to UHD CFLAGS (shared by lib and swig)
  Swapping out preset keys until I work out some of their issues.
  Modifying QA tests for the sample tags. By default, it only checks the sizes of the tags since order is not specified or guarenteed.
  Block is a gr_block, so this sets its relative rate. Was required for using in the QA of the sample tags code.
  Removing global pmt constants. Were causing segfaults during make check. Must fix this later.
  Fixing up the UHD sample tag example to take command line options.
  Swapping order of testing rrate.
  Changing propagation policy enum type name and making a few other minor edits.
  Changing API for gr_skiphead to use uint64_t for the offset instead of size_t (still unsigned). Fixes issue #304.
  Adding typedef for uint64_t and int64_t so we can use them through SWIG.
  ...

Passes make distcheck.
2010-12-06 23:16:25 -08:00
Tom Rondeau 1cab2ce245 Merge branch 'master' into next
* master:
  Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted.
  Modifying blks2 wrapper for PFB arbitrary resampler to allow the user to just specify the requested resampling rate without providing their own filter taps.
  Changing API for gr_skiphead to use uint64_t for the offset instead of size_t (still unsigned). Fixes issue #304.
  Adding typedef for uint64_t and int64_t so we can use them through SWIG.
  Removing warnings in portaudio source/sink.
  Fixing output types from tap_type to o_type in gr_single_pole_iir.h. Doesn't make a difference in the current uses of this class, but could in the future. Thanks to Achilleas Anastasopoulos for pointing this out.
  first shot at Windows-compatible LIBUSB check
  Tweak LIBUSB m4 script to not check for 'usb_debug' symbol on Windows, because the symbol does not exist for that platform (only, it seems)
  Removing autogenerated file.
  Updated doxygen Doxyfile for newer versions.
  Adding file operations result checking.
  Updating audio_jack to new interface for creating a client. Fixes depricated warning.
  Potential fix to MSDD warnings by setting sequence number from buffer more explicitly.
  Adding a bit more checking on file operations.
  Fixing copyright date.
  Fixed warning re defining GNU_SOURCE. Can probably just remove it since it's defined in config, but this won't hurt anyone.
  Fixing signed/unsigned warnings.
  first shot at Windows-compatible LIBUSB check
  Tweak LIBUSB m4 script to not check for 'usb_debug' symbol on Windows, because the symbol does not exist for that platform (only, it seems)

Conflicts:
	gnuradio-core/src/lib/swig/gnuradio.i
2010-12-06 20:57:40 -05:00
Eric Blossom 6f9d7add08 Regenerated Makefile.swig.gen's 2010-12-03 23:34:24 -08:00
Eric Blossom f0e7635c6a Update .gitignore's 2010-11-24 19:13:33 -08:00
Eric Blossom dc2588910e Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
2010-11-24 17:29:11 -08:00
Rob Savoye 005c0c55a5 regenerated 2010-11-19 08:07:52 -07:00
Eric Blossom 5c9d25a206 Merge remote branch 'gnuradio.org/next' into test
* gnuradio.org/next:
  distcheck fix for gr-uhd
  Keep doxygen 1.7.1 from crashing.
  uhd: swig changes for templated ranges
2010-11-17 19:00:12 -08:00
Eric Blossom 3ce5c6a3f0 Keep doxygen 1.7.1 from crashing. 2010-11-17 18:52:05 -08:00
Eric Blossom 01f050a935 Fix guile related problem with gr-usrp 2010-11-16 21:40:55 -08:00
Eric Blossom f741fdab2b regenerated 2010-11-16 21:33:50 -08:00
Eric Blossom a52aed2448 regenerated 2010-11-10 13:01:38 -08:00
Rob Savoye 3f60d7f0ee regenerated 2010-11-10 12:15:43 -08:00
Eric Blossom 1b40745d32 additional regenerated files 2010-11-10 12:15:42 -08:00
Eric Blossom 234fd45233 regenerate 2010-11-10 12:13:53 -08:00
Eric Blossom b1f86e8b1a Rengenerate Makefile.swig.gen's 2010-11-10 12:13:53 -08:00
Eric Blossom 347bb61cf1 gitignore swig generated files 2010-11-10 12:10:45 -08:00
Eric Blossom 3699771aa9 Update generated files 2010-11-10 12:10:45 -08:00
Rob Savoye 6f86a68513 regenerated after changes to the template 2010-11-10 12:10:44 -08:00
Tom Rondeau c12f11bb72 Updated doxygen Doxyfile for newer versions. 2010-11-10 00:25:37 -05:00
Michael Dickens c6f56e4d15 rearrange includes to always be: internal GR, external, with GR. 2010-10-09 21:10:10 -04:00