* host: cmake: add function to set SHORT_FILE_ def
The function, based heavily off of a Stack Overflow example :), goes
through all of the source files defined for a given target and sets the
SHORT_FILE_ definition for them.
This results in debug log messages relative to the top directory of the
project, i.e.:
[DEBUG @ host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c:930]
_set_tx_mute: muting TX1 (cached: 10000)
* host: libbladeRF: enable Shortfile for libbladerf_shared
This includes everything but AGC-related stuff.
Squashed commit of the following:
commit ab00f2a68353024c5faf14dedbb5fd05a8438f26
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Wed Aug 9 10:58:08 2017 -0400
libbladeRF: add compilation hint to boilerplate.c
h/t owen on IRC
commit 3cbeaf72dbe22525a5c907dfb9643db81c7aca85
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Mon Aug 7 12:27:21 2017 -0400
host/CMakeLists: dequote variables in ifs (CMP0054) #511
Per CMake Policy CMP0054, the meaning of constructs like
if("${FOOBAR}" STREQUAL "quux")
is ambigious, and the old meaning is deprecated.
https://cmake.org/cmake/help/git-stage/policy/CMP0054.html
commit 73376b7aac65d945c5399a5130aca33265080653
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Fri Aug 4 13:40:37 2017 -0400
host/README.md: add pthreads-win32 build instructions (#447)
On recent versions of Windows / Visual Studio, struct timespec is
already defined, and the definition is subtly different than what
pthreads-win32 is built with.
It may be possible to handle this in a more automatic fashion via CMake,
but this is TBD.
commit b90ff648e5cf754a29264f2a2c2c19d924c5c070
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Mon Aug 7 18:09:30 2017 -0400
host/cmake/CyAPI: define Windows 10 support
This requires that the user get special additional drivers in addition
to the ones provided by the usual SDK; a URL will point in the right
direction.
Note that this does not remove the requirement for driver signing. Some
work will be needed to document how to do this.
commit 888254b975f3b64ec787c741b937a561a08ccc44
Author: Jon Szymaniak <jon.szymaniak@nuand.com>
Date: Thu Jun 9 17:47:21 2016 -0400
libbladeRF: Treat incompatible OS version as "not found" in FindCyAPI.cmake
commit a9e97b2de6c22539266447f755e5a42cdf9a4f70
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Mon Aug 7 11:35:16 2017 -0400
host/libbladeRF/cyapi: ReleaseMutex before CloseHandle
When working on mutexes for the libusb backend, I noticed that I needed
to ReleaseMutex() when closing the device, or else that device would not
be usable again until all of the mutexes were released.
I have not tested this with CyAPI as yet, but I believe the same problem
will occur, and I also believe this may fix it.
commit b897475aa1a5b80358fcf2c8902089740d04582f
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Fri Aug 4 18:00:34 2017 -0400
host/libusb.c: properly release/close handles
commit f9b99ee7715af1ccb64d41d3363a3cc8e66aa063
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Fri Aug 4 17:17:29 2017 -0400
host/libusb.c: fix create_device_mutex errors (#484)
This builds and correctly enforces exclusive access under Windows 10.
commit 6e9c048ff2e8321052c3e72e14f51eb2aa66b5dc
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Thu Aug 3 13:14:51 2017 -0400
host/backend/libusb: enforce exclusive access (#484)
Windows seems to allow multiple instances of libbladeRF to open the same
device, which is problematic in many ways. This borrows the mutex
approach from cyapi.c to enforce exclusivity.
commit 519f26b6b88d1cbdfec7138fe9a0fc13715c7f93
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Fri Aug 4 16:07:49 2017 -0400
host/cmake: search for pthreadVC2.dll more vigorously (#517)
With the pre-built binary pack, pthreadVC2.dll lives in a
dll/${ARCHITECTURE}/ directory. However, when compiling from scratch,
it just lives in the source code's root directory. Look in both places
and set a LIBPTHREADSWIN32_DLL variable accordingly.
commit b7617cda8e87396da19101f10de02619d0fd8e1d
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Wed Aug 2 18:05:33 2017 -0400
CONTRIBUTORS: self-updating
commit 3a4e57b3c2f2b9ac27db832de0bbc945c3217dd7
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Tue Jul 25 15:07:54 2017 -0400
debian: chmod 0444 downloaded fpga/fw images
The mktemp/wget workflow creates the data files chmod 0600, which breaks
loading of firmware for non-root users. Explicitly chmod 0444 to allow
all users to read.
commit 24594d3e34eca05c2fc738dc2fa5d1fcc9ab0bda
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Wed Aug 2 17:34:11 2017 -0400
host: add note about Fedora and /usr/local (#490)
commit 6219e15a38c8dfe957e12ce38fbd76e0bf40a177
Author: Rey Tucker <rey.tucker@nuand.com>
Date: Wed Aug 2 15:35:27 2017 -0400
nios: fix si5338_write typo (#491)
Unnecessary bit is being set when writing address.
commit 0d14e6ec0a3d438c206f4d02a95aa4b250ec3674
Author: Oliver Jowett <oliver@mutability.co.uk>
Date: Thu Apr 27 21:03:12 2017 +0100
Document why postinst should succeed if the FPGA download fails
commit 84042b6aa5bcc761c631a06687dc690343f4d952
Author: Oliver Jowett <oliver@mutability.co.uk>
Date: Thu Apr 27 13:20:25 2017 +0100
Don't make postinst fail entirely (producing half-configured packages and
making the overall install operation fail) if the FPGA download fails.
(cherry picked from commit 13befc071b3cddb913ce961c3cd7b08216bba2e5)
commit b203fbca8c789d8a99bbef34e20feda9d1a6e940
Author: ifrasch <fraschi17@gmail.com>
Date: Sat Feb 18 17:28:59 2017 -0500
hdl: Fixed simulation files
-Added missing ports to nios_system.vhd
-Added missing files to nuand.do
-Compile.do will now compile successfully in Modelsim
We explicitly set VERSION_INFO_EXTRA to "" for release builds, which
causes (${VERSION_INFO_EXTRA} STREQUAL "") to evaluate to
( STREQUAL ""), a syntax error.
Quoting ${VERSION_INFO_EXTRA} should not cause the ambigious condition
foretold in CMP0054, so doing that.
This requires that the user get special additional drivers in addition
to the ones provided by the usual SDK; a URL will point in the right
direction.
Note that this does not remove the requirement for driver signing. Some
work will be needed to document how to do this.
With the pre-built binary pack, pthreadVC2.dll lives in a
dll/${ARCHITECTURE}/ directory. However, when compiling from scratch,
it just lives in the source code's root directory. Look in both places
and set a LIBPTHREADSWIN32_DLL variable accordingly.
FindLibUSB.cmake presents issues with its try_compile() invocation
when using some dated CMake versions, such as 2.8.7 and 2.8.11, while
operating fine with more recent versions (e.g., 2.8.12.2, 3.0.0).
Using try_run() is a cleaner solution than a combination of try_compile() and
execute_process(). However, in Windows we need to stage libusb-1.0.dll in the
directory containing the resulting libusb_version.exe. As try_run() creates a
a temporary build directory and deletes it when done, this originally
posed a challenge to copying libusb-1.0.dll to the correct directory.
To address both of these challenges, the Windows version of this program now
explicitly links libusb at runtime, provided the path to the libusb DLL.
OSX and Linux variants assume libusb is in the library path, and link against
the library at compile-time.
FindLibUSB.cmake now fetches the libusb version via libusb_get_version()
so that we can warn (or error out) about the system containing an
outdated libusb version.
The following policies have been based upon support experiences and the
libusb changelog:
Windows: Error out for libusb < 1.0.19
v1.0.19 provides Windows 8 SuperSpeed detection support,
and appears to address a number of issues bladeRF users
have reported with v1.0.18 and earlier.
We force users to update here, given that some of the failures
on earlier versions were yielding corrupted samples.
OSX: Warn for libusb < 1.0.18:
v1.0.16 - v1.0.18 introduced SuperSpeed and 64-bit support,
as well as fixes for compile-time and run-time issues.
Linux: Warn for libusb < 1.0.16:
This is largely based upon feedback from bladeRF users. While
older versions may work, a number of users reported that issues
appeared to be resolved after updating libusb to >= 1.0.16.
(It isn't always clear if the reported update included Linux
distro upgrades that included kernel updates.)
The version check may be skipped via LIBUSB_SKIP_VERSION_CHECK=Yes.
This is intentionally not noted in the warnings/errors, as it's
preferred that users update libusb rather than just skip the check.
A USB backend based atop of the Cypress CyAPI (which is based atop the
Cypress CyUSB3 driver) has been introduced. This is intended to provide
Windows users with an additional driver to use if they encounter issues
with their USB host controller and libusb.
To build and use this backend, the Cypress FX3 SDK must be installed and
the following CMake flags should be provided:
-DENABLE_BACKEND_CYAPI=Yes -DFX3_SDK_PATH=<path to SDK>
A modified cyusb3.inf is provided in host/drivers/windows/cyusb3. Upon
performing a build this inf file and the associated driver files from
the FX3 SDK will be copied into the "output" directory along with the
bladeRF.dll and bladeRF-cli.exe. To install the driver, point the
Windows driver update to this location and accept the warning about the
driver being unsigned; this occurs because the Cypress driver wasn't
signed with bladeRF VID/PID values.
The libbladeRF device string for this backend is: "cypress"
Many thanks go out to LazyDodo for all his efforts in spearheading the
development of this backend -- much of this code is either his doing or
is directly based upon his efforts.
When making log_* calls, add these two lines to the corresponding
CMake file prior to add_library() or add_executable():
set(SRC_TO_SHORTEN ${MY_SRC_LIST})
include(ShortFileMacro)
Many thanks to LazyDodo for providing the CMake approach for doing this,
and to rwr for suggesting this change.
Added checks for the following functions so that builds on older setups
will error out with error messages at configuration time, rather than
compilation errors at build time.
- libusb_error_name()
- libusb_get_device_speed()
- libusb_handle_events_timeout()
- libusb_handle_events_timeout_completed()
Fixed Issue #242, where the FindLibUSB.cmake script wasn't finding a
libusb installed to /usr/local/ in the case where pkg-config wasn't
installed. This should also help in cases where pkg-config isn't
installed on Linux systems.
Other touch-ups include removal of an unnecessary warning message,
and some re-arrangement of operations.
The version checks are now enforced. (Fixes#130)
FindLibUsb now warns if the user is using < libusb-1.0.16, as this or
1.0.17 are *highly* recommended.
The redundant version check in Windows (ver.c) has been removed. Testing
with CMake 2.8.11.2 has shown check_library_exists() to be sufficient.
Where possible (and with contributor permission), items have been
changed to LGPLv2.1 or MIT licenses to avoid issues with any proprietary
libraries from vendors (HDL and FW), allow static linking (with headless
mode operation in mind), and to generally present users with more
permissive licenses.
File headers and the COPYING have been updated accordingly. Third party
sources have been either removed, replaced, or relocated in the source
tree, in accordance with the licenses decided upon for each part of the tree.
Contributor Assignment Agreements have been added, and it is required
that these be submitted before significant patches and pull requests
are accepted.
Most of these files had inaccurate copy-paste headers, as the files are
now vastly different than those mentioned. These will all just fall under
the "meta-data" category in upcoming licenses.
Per discussion with FindLibBladeRF.cmake author, the text in
FindLibTecla.cmake was unnecessary, and has been removed.
This includes freqmod's fixes provided in pull request/issue #57,
in addition to some other misc. cleanup items noted while reviewing
the aforementioned changset.
*Warning:* This is a broken nightly commit.
If not obvious, quite a bit of rearranging has been done.
The build script(s) for libbladeRF is mostly complete. This still
requires further configuration of debug builds and version info being
used to populate a version header.
Some cleanup has been done in the (formerly apps, now) utilities
directory. There's no CMake support in here yet...that's comming in the
next commit.