summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'origin/uhd/issue_448_itemsize' into maintBen Hilburn2014-04-211-1/+1
|\
| * multi_usrp: Fixed bug which caused unspecified OTW-format to crash appsMartin Braun2014-04-151-1/+1
| |
* | x300: removing intelligent PPS detection until further developmentBen Hilburn2014-04-151-1/+2
|/
* Merge branch 'origin/ncorgan/tvrx2_fix'Ben Hilburn2014-04-101-3/+3
|\ | | | | | | Fix bug with regard to TVRX2 refclock dividers.
| * tvrx2: fix ref_clock logic when using N2x0Nicholas Corgan2014-04-091-3/+3
| |
* | Merge branch 'origin/b200/issue_418'Ben Hilburn2014-04-103-11/+14
|\ \ | | | | | | | | | Fixing unsafe sscanf call.
| * | b100+b200+usrp1: removed potentially unsafe sscanf callMartin Braun2014-04-103-11/+14
| | |
* | | Merge remote-tracking branch 'origin/bug403'Ben Hilburn2014-04-101-2/+4
|\ \ \ | | | | | | | | | | | | | | | | Properly initializing time and clock source on N-Series to prevent small drift prior to lock.
| * | | Fix for BUG #403: Visible frequency drift on Finite Rx with N210 & SBXmichael-west2014-04-081-2/+4
| |/ / | | | | | | | | | - Added initialization of clock and time sources
* | | Merge branch 'martin/warn_sampling_rate'Ben Hilburn2014-04-1010-3/+62
|\ \ \ | | | | | | | | | | | | Warn users if they request a sample rate greater than the interface bandwidth.
| * | | uhd: Added max link rate info for usrp1, usrp2 and b100Martin Braun2014-04-105-1/+5
| | | |
| * | | b200: Added max link rate infoMartin Braun2014-04-102-1/+4
| | | |
| * | | uhd: multi_usrp now understands link rate info and can check for itMartin Braun2014-04-101-0/+41
| | | |
| * | | x300: Added max link rate infoMartin Braun2014-04-102-1/+12
| |/ /
| * | 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
| | |
* | | bugfix#393: Fixed X300 TX flow control to handle short bursts and arbitrary ↵Ashish Chaudhari2014-04-101-13/+22
| |/ |/| | | | | FC windows.
* | 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
| | | |