aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/dboard/magnesium
Commit message (Collapse)AuthorAgeFilesLines
* mg: Turn the set-lock into a recursive mutexMartin Braun2019-11-262-15/+15
| | | | | Individual API calls might have to call each other (e.g., like set_rate() will call set_rx_frequency()), which would cause a deadlock.
* mg: Always set MCR on both daughterboardsMartin Braun2019-11-263-12/+33
| | | | | | | | | | | | | | | | | The N310 cannot set the MCR for its daughterboards separately. This patch modifies the radio block controller such that any block controller, when requested to change the master clock rate, will first change Radio 0, and then Radio 1. This fixes the following issues: - In multi_usrp, calling set_master_clock_rate() will not necessarily call set_rate() on the radios in any particular order, which will break when calling Radio 1 first - In RFNoC apps, it wasn't possible to run off of slot B alone without this change. Note: When calling set_rate() on one radio, the other radio is in an invalid state until its set_rate() is also called.
* n310: Fix GPIO registersMartin Braun2019-11-261-3/+6
| | | | | This enables the use of the dboard and FP GPIOs. The problem was that the register offset of 8 was not encoded.
* mg/rh/rfnoc: Harmonize peripheral registersMartin Braun2019-11-262-16/+27
| | | | | - Move the SPI addresses out of radio_control_impl - Fix the GPIO address spaces for N310/N300
* uhd: Replace usage of boost smart pointers with C++11 counterpartsMartin Braun2019-11-263-2/+4
| | | | | | | | | | | | | | | | | | | This removes the following Boost constructs: - boost::shared_ptr, boost::weak_ptr - boost::enable_shared_from_this - boost::static_pointer_cast, boost::dynamic_pointer_cast The appropriate includes were also removed. All C++11 versions of these require #include <memory>. Note that the stdlib and Boost versions have the exact same syntax, they only differ in the namespace (boost vs. std). The modifications were all done using sed, with the exception of boost::scoped_ptr, which was replaced by std::unique_ptr. References to boost::smart_ptr were also removed. boost::intrusive_ptr is not removed in this commit, since it does not have a 1:1 mapping to a C++11 construct.
* Remove proto-RFNoC filesMartin Braun2019-11-262-3/+1
| | | | | | | This commit removes all files and parts of files that are used by proto-RFNoC only. uhd: Fix include CMakeLists.txt, add missing files
* x300/mpmd: Port all RFNoC devices to the new RFNoC frameworkMartin Braun2019-11-2612-1671/+1780
| | | | | | | Co-Authored-By: Alex Williams <alex.williams@ni.com> Co-Authored-By: Sugandha Gupta <sugandha.gupta@ettus.com> Co-Authored-By: Brent Stapleton <brent.stapleton@ettus.com> Co-Authored-By: Ciro Nishiguchi <ciro.nishiguchi@ni.com>
* mg: Allow for timeout on retuneMartin Braun2019-08-223-1/+19
| | | | set_freq() calls now have a 15 seconds timeout.
* n310: add capability to control RF filter bypass and freq.band limitsThomas Vogel2019-07-246-39/+133
| | | | | | | | | | | | | | | | | | With the keywords "rx_gain_profile", "tx_gain_profile" and the new values "default_bypass_always_off" and "default_bypass_always_on" the customer can control whether the filter bypass shall be applied as defined in the gain-table or whether to switch the bypass to ON or OFF for all gains. With the keywords "rx_band_map" and "tx_band_map" the user can define custom frequency borders for the band mapping. These new keywords can be used in the uhd.con, e.g.: [type=n3xx] rx_gain_profile=default_bypass_always_off tx_gain_profile=default_bypass_always_on rx_band_map=431e6;601e6;1051e6;1601e6;2101e6;2701e6 tx_band_map=723.18e6;1623.18e6;3323.18e6
* uhd: mpm: update all license header w/ "-or-later"Brent Stapleton2019-03-081-1/+1
| | | | Updating all SPDX license identifiers to include "-or-later"
* uhd: mpm: apply clang-format to all filesBrent Stapleton2019-01-1613-1806/+1346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying formatting changes to all .cpp and .hpp files in the following directories: ``` find host/examples/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/tests/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/dboard/neon/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/dboard/magnesium/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/device3/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/mpmd/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/x300/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/utils/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find mpm/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file ``` Also formatted host/include/, except Cpp03 was used as a the language standard instead of Cpp11. ``` sed -i 's/ Cpp11/ Cpp03/g' .clang-format find host/include/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file ``` Formatting style was designated by the .clang-format file.
* formatting: remove vim hints in headersBrent Stapleton2019-01-163-3/+0
| | | | | Remove trailing vim hints in header files. This functionality will be replaced by clang-format.
* uhd: skip formatting misc arrays, maps, etc.Brent Stapleton2019-01-161-0/+2
| | | | | | Various data structures are nicely formatted to be human-readable. clang-format makes these structures harder to read, so we can skip formatting these sections.
* N310 E320: Add initialization of TX bandwidthmichael-west2018-12-191-1/+1
| | | | - Fixes "Error: map::at" errors (during calls to get_tx_bandwidth())
* mg: Unindent falsely indented block of codeMartin Braun2018-11-301-29/+29
| | | | Whitespace changes only.
* cmake: Update coding style to use lowercase commandsMartin Braun2018-11-141-1/+1
| | | | | | | | | | | | | | | | | Also updates our coding style file. Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. Run the following shell code (with GNU compliant sed): cmake --help-command-list | grep -v "cmake version" | while read c; do echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g' done > convert.sed \ && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' \ '*CMakeLists.txt' | xargs -0 gsed -i -f convert.sed && rm convert.sed (Make sure the backslashes don't get mangled!)
* mg: fixup set_rx_antennaTrung Tran2018-10-041-1/+1
| | | | | | After going to 2 radios configuration (FPGA), the channnel value is passed into this set_rx_antenna now have value either 0 or 1. We want the mapping of {radio_channel:cpld_channel} = {0:CHAN1} or {1:CHAN2}.
* mg: clipping frequencyTrung Tran2018-09-142-4/+7
| | | | | Clipping requested frequency to acceptable ranges in Magnesium TX/RX set frequency functions.
* fixup! mpm: mg: add set_master_clock_rate memberMartin Braun2018-08-031-2/+2
|
* mg: Allow calling set_rate() at runtimeMartin Braun2018-08-022-6/+38
|
* mpm: mg: add set_master_clock_rate memberDaniel Jepson2018-08-022-0/+13
|
* mg: fix tx power issueTrung Tran2018-07-144-27/+4
| | | | | | This commit will fix power issues with 2 radios configuration (UHD 3.12+). Removed unused _master boolean. CPLD path are now correct, each radio has its own CPLD object.
* mg: remove set_rpc_lockTrung Tran2018-06-182-14/+1
|
* cmake: Add ENABLE_N300 targetMartin Braun2018-06-111-13/+14
| | | | | | | | | | Driver support for N310/N300 was previously implied by ENABLE_MPMD, which had two issues: 1) It was not clear that ENABLE_MPMD was actually enabling the N3x0 2) It did not allow to enable mpmd support without N3x0 support This resolves these issues.
* mg: Rename _L to _log_prefixMartin Braun2018-05-312-12/+12
| | | | Avoids clashes with ctype.h.
* lib: Purge use of boost::assign, except for uhd::dictMartin Braun2018-05-021-2/+2
| | | | | | | Replaced with initialization lists. Note: uhd::dict does not work with initializer lists without making changes to said data structure. This commit has no functional changes, so keeping the boost::assigns for uhd::dict.
* docs: Clarify that the magnesium/ dboard driver is used for N310/N300Martin Braun2018-04-101-1/+7
|
* fixup! mg: fix compiler warningsMartin Braun2018-04-091-10/+10
|
* mg: fix compiler warningsmichael-west2018-04-052-2/+2
|
* rfnoc/x300: Make sure peek32() and peek64() are called with actual addressesMartin Braun2018-03-161-4/+8
| | | | Before, we were calling peeks with the number of the readback register.
* uhd: Move internal headers to uhdlib/Martin Braun2018-03-143-6/+6
| | | | | | | | | | | | | | | | To avoid the proliferation of additional include directories and multiple ways of including project-local headers, we now default to moving all headers that are used across UHD into the uhdlib/ subdirectory. Some #include statements were also reordered as they were modified for closer compliance with the coding guidelines. Internal cpp source files should now include files like this: #include <uhdlib/rfnoc/ctrl_iface.hpp> Reviewed-by: Ashish Chaudhari <ashish.chaudhari@ettus.com>
* mg: reduce to 2 radios for n310Trung N Tran2018-03-132-192/+52
|
* n3xx: add front panel gpio control registersTrung N Tran2018-02-212-7/+127
|
* uhd: Update license headersMartin Braun2018-02-1913-13/+13
| | | | | | | All copyright is now attributed to "Ettus Research, a National Instruments company". SPDX headers were also updated to latest version 3.0.
* mg: Fixed typo in set_rx_bandwidth()Martin Braun2018-02-151-2/+4
|
* mg: turn on tx power amplifiers when idleTrung N Tran2018-02-141-2/+3
| | | | | | Without turning on tx power amplifer when being idle, the TX settling time is 100ms. Turning these power amplifiers on "all time" results in tx settling time around 140us.
* mg: Temporarily disable concurrency in parts of set_rpc_client()Martin Braun2018-02-092-1/+15
| | | | | | There is an issue with parallel inits and liberio which crops up during initialization. This is not a fix but is a workaround which enables the parallel initialization of devices using liberio.
* mg: Fix some compiler warningsMartin Braun2018-02-081-20/+39
| | | | | - Superfluous captures in lambdas - Make use of new TX bandwidth API
* mg : implement set_bandwidthTrung N Tran2018-02-084-17/+27
|
* mg: Remove superfluous DEBUG message, minor formattingMartin Braun2018-01-181-10/+12
| | | | Fixed indents to 4 spaces in get_?x_lo_source().
* mg: Fix various compiler warningsMartin Braun2018-01-163-47/+48
| | | | | | - Made const constexpr where sensible - Moved non-global constants to their local scope - Changed const char * to const char[] where they should
* mg: Fix missing return value for half-dB stepsMartin Braun2018-01-161-0/+1
|
* mg: add clip function on setting individual gain.Trung Tran2018-01-121-8/+19
| | | | Reviewed-by: Martin Braun <martin.braun@ettus.com>
* mg: add facility that handle individual gainTrung N Tran2018-01-125-12/+348
| | | | | | | -Create name for each gain/att element -Create property tree entry for each gain and their handlers. -Create gain profile that control how gain distributed. Right now, it is either "default" or "manual".
* mg: fix update_freq direction in set_rx_lo_freqTrung N Tran2018-01-091-1/+1
|
* fixup! mg: Use enums for all bands, move freq mapping to single locationMartin Braun2018-01-081-0/+1
|
* mg: Use enums for all bands, move freq mapping to single locationMartin Braun2018-01-089-109/+339
| | | | | | | | This removes the need to re-implement the band checks (in particular, the low band check) in multiple places, potentially causing confusion. Signed-off-by: Trung Tran <trung.tran@ettus.com> Reviewed-by: Trung Tran <trung.tran@ettus.com>
* mg: Remove superfluous UHD_VARMartin Braun2018-01-081-1/+0
|
* Move all headers to SPDX format, harmonize license headersMartin Braun2017-12-222-26/+4
|
* mg: Add 'identify' block arg, will toggle LEDs for identificationMartin Braun2017-12-225-1/+51
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 20:05:22 +0000