aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
Commit message (Collapse)AuthorAgeFilesLines
* b200: reverted decim mask for scaling factor, and instead conditionally add ↵Balint Seeber2014-03-311-3/+5
| | | | new X3x0 host rates (get_host_rates) with '_is_b200'
* b200: RX DSP scaling mask is 1 bit too narrow for decim 256Balint Seeber2014-03-311-1/+1
|
* x300: Fix the assumed max header sizeMartin Braun2014-03-282-18/+15
|
* Merge branch adding warning regarding MCR on the B2xx.Ben Hilburn2014-03-277-25/+129
|\
| * b200: changed ad9361 ctrl/transaction magic number 64 to macro, as it is in ↵Balint Seeber2014-03-193-12/+15
| | | | | | | | the FX3 FW
| * b200: explicitly detect libusb timeoutBalint Seeber2014-03-191-8/+19
| |
| * b200: changed ad9361 read timeout handling (kicks in when requesting ↵Balint Seeber2014-03-192-4/+11
| | | | | | | | master_clock_rate above 56MHz)
| * b200: addressed review comments (boost::uint16_t & source code long line ↵Balint Seeber2014-03-191-6/+19
| | | | | | | | breaking)
| * Merge branch 'master' of github.com:EttusResearch/uhddev into b200/warn_mimo_mcrBalint Seeber2014-02-203-30/+44
| |\
| * | b200: throw exception when master clock rate (tick rate) is requested to be ↵Balint Seeber2014-02-145-9/+79
| | | | | | | | | | | | | | | | | | > max for certain # of channels (i.e. restrict to 30.72MHz for MIMO) Also includes sscanf type fix in b200_impl and longer timeout for AD9361 read
* | | b200: update FPGA loading percentage every 1% instead of 10%Nicholas Corgan2014-03-271-1/+1
| | |
* | | Pulling in patch from Marcus Leech for includes and older OSes.Ben Hilburn2014-03-262-0/+9
| | |
* | | b200: Added missing include to b200_implMoritz Fischer2014-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * In order to use std::ceil and std::floor, on older compilers we need to still add an include for cmath. Tested-by: Marcus D. Leech <mleech@ripnet.com> Signed-off-by: Moritz Fischer <moritz@ettus.com>
* | | gps: Removed superfluous include.Moritz Fischer2014-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | | * This file doesn't need boost::container::vector. Tested-by: Marcus D. Leech <mleech@ripnet.com> Signed-off-by: Moritz Fischer <moritz@ettus.com>
* | | More reference clock lock detection clean upmichael-west2014-03-181-10/+28
| | | | | | | | | | | | | | | - Removed check for lock when clock source is changed (including runtime error on failure to lock). - Added separate checks and warning messages for failures to lock the clock during intialization.
* | | Modified reference clock lock check to only be performed on Rev E or later.michael-west2014-03-172-10/+18
| | |
* | | uhd: Addressed Balints and Bens comments for subdev addressingMartin Braun2014-03-173-17/+23
| | |
* | | Merge clock and PPS fixes.Ben Hilburn2014-03-156-53/+130
|\ \ \
| * | | Addressed comments from review.michael-west2014-03-154-40/+53
| | | | | | | | | | | | | | | | | | | | | | | | - Fixed typos. - Renamed reset() to reset_clocks(). - Created wait_for_ref_locked() function.
| * | | - Added wait for reference clock to lock.michael-west2014-02-211-1/+7
| | | | | | | | | | | | | | | | - Modified wait for GPSDO time setting to timeout after 1 second.
| * | | Fixed bug found during testing where internal clock reference was taking ↵Michael West2014-02-203-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | several seconds to lock. Added reset to the clock control and called it whenever the clock reference is changed.
| * | | - Fix for BUG #264: ./test_pps_input --source external passes even with no 1 ↵Michael West2014-02-184-37/+81
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | PPS on external input on X3xx - Fixed behavior of PPS and clock references to be consistent and intuitive. -- Added detection of clock reference and PPS. -- Changed order of precedence to external, gpsdo, internal for default of clock and PPS. -- Throws runtime error if the user requests a reference clock or PPS that is not present. - Bumped FPGA compatibility to 4.
* | | Merging fixes for subdev specs in B2xx.Ben Hilburn2014-03-143-47/+42
|\ \ \
| * | | b200: Added channel mapping capabilitiesMartin Braun2014-02-253-47/+42
| | |/ | |/|
* | | Merge Ethernet, MTU, and frame size fixes.Ben Hilburn2014-03-142-14/+13
|\ \ \
| * | | x300 mtu: Removed magic number, minor manual updatesMartin Braun2014-02-182-14/+13
| | |/ | |/|
* | | Merge branch 'origin/martin/subdev_spec_bug_B'Ben Hilburn2014-03-144-131/+155
|\ \ \
| * \ \ x300: Merged Michaels segfault fixMartin Braun2014-03-101-11/+12
| |\ \ \
| | * | | - Fixed segmentation fault when using X3x0 with daughterboards in 4x4 ↵michael-west2014-03-061-11/+12
| | | |/ | | |/| | | | | | | | | | | | | | | | | configuration. - Updated index of dboard_manager dictionary to include mboard.
| * | | x300: Added comments on mb/chan search codeMartin Braun2014-03-101-0/+4
| | | |
| * | | Removed spurious UHD_VAR.Martin Braun2014-03-102-10/+0
| | | |
| * | | uhd: added channel mapping support to multi_usrpMartin Braun2014-03-101-0/+12
| | | |
| * | | x300: added channel mapping capabilitiesMartin Braun2014-03-103-73/+111
| | | |
| * | | x300: merged subdev update routines for tx and rxMartin Braun2014-03-103-46/+26
| | | |
| * | | x300: remove data that was duplicating property treeMartin Braun2014-03-102-20/+19
| |/ /
* / / Addressed comments from code review.michael-west2014-02-211-26/+14
|/ / | | | | | | | | - Created macro for gain name error. - Fixed typos.
* / b200: Fixed bug in rx_dsp_core_3000 that would assume 3 halfbands and X300 ↵Ashish Chaudhari2014-02-193-30/+44
|/ | | | settings interface.
* Pushing the bulk of UHD-3.7.0 code.Ben Hilburn2014-02-1412-183/+359
|
* Merging USRP X300 and X310 support!!Ben Hilburn2014-02-0437-122/+4765
|
* Merge branch 'origin/mwest/gain_name_check'Ben Hilburn2014-02-041-6/+56
|\
| * Added check and handling for gain names.Michael West2014-01-301-6/+56
| |
* | uhd: so Coverity doesn't complain, removed variable declarations tooBalint Seeber2014-02-031-0/+2
| |
* | uhd: disabled other use of _claimed and cond sync variables (no effect if ↵Balint Seeber2014-02-031-0/+2
| | | | | | | | previous change is used anyway)
* | uhd: disabled atomic 'claim' check for multi-threaded access to ↵Balint Seeber2014-02-031-1/+5
|/ | | | | | | | | | recv_packet_demuxer_3000 The only caller is from super_packet_recv_handler, which is already not thread-safe. The only underlying transport (libusb1_zero_copy) is thread-safe, so this shouldn't have an impact. This solves the issue where (e.g. from GNU Radio), 'interrupt' is called on the worker thread while waiting for a join when worker thread is torn down (e.g. GR top block stop/wait/start), which would cause the demuxer to still think the transport was claimed, as an interrupted exception will be thrown in 'wait_for_completion' in the transport, and execution will not continue back into the demuxer to mark the transport as un-claimed, so future 'recv' streamer calls will always fail since the demux thinks the transport is still claimed from before.
* Brought in UHD 3.6.2 MacPorts patches for OS X compatibilityNicholas Corgan2014-01-271-2/+5
| | | | * With OS X, boost::lexical_cast won't accept to_hex<boost::uint16_t> as a type
* Merge branch 'uhd/adf435x-work'Nicholas Corgan2014-01-2414-658/+583
|\
| * 120 MHz daughterboard support, Integer-N tuning, ADF435x code consolidationNicholas Corgan2014-01-2414-658/+583
| | | | | | | | | | | | | | * Added support for new CBX-120, SBX-120, and WBX-120 daughterboards * Added implementation of Integer-N tuning for all CBX, SBX, and WBX daughterboards * Added --int-n option to examples to show how to use Integer-N tuning API * Removed duplicate ADF4350/ADF4351 code and moved it to common/adf435x_common.cpp
* | Added timed control commands to test_timed_commands example. Added radio ↵Michael West2014-01-151-0/+2
| | | | | | | | core as subscriber to tick rate change for B200.
* | cleaning up gpsdo docsBen Hilburn2013-12-191-21/+19
|/
* Merging mwest's improvements to B2xx utility.Ben Hilburn2013-12-112-0/+25
|