Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | x300: Addressed review feedback | Ashish Chaudhari | 2014-04-25 | 2 | -12/+13 | |
| | | | | | - Fixed synchronization for unclaim - Removed stray RIO addr space set | |||||
* | x300: Added synchronization between device claiming and checking. | Ashish Chaudhari | 2014-04-24 | 2 | -5/+40 | |
| | | | | | - We now maintain a registry of pcie ZPU transports - Added static mutex for claimer | |||||
* | x300: Cleanup for PCIe flushing | Ashish Chaudhari | 2014-04-24 | 2 | -38/+44 | |
| | ||||||
* | x300: Added hardware flush mechanism to PCIe logic. | Ashish Chaudhari | 2014-04-24 | 4 | -12/+124 | |
| | | | | | - Added DMA enabled states to DMA logic to allow for hardware data flushing during init. - niusrprio_session will now check for FPGA busy before downloading | |||||
* | Merge branch 'origin/uhd/issue_448_itemsize' into maint | Ben Hilburn | 2014-04-21 | 1 | -1/+1 | |
|\ | ||||||
| * | multi_usrp: Fixed bug which caused unspecified OTW-format to crash apps | Martin Braun | 2014-04-15 | 1 | -1/+1 | |
| | | ||||||
* | | x300: removing intelligent PPS detection until further development | Ben Hilburn | 2014-04-15 | 1 | -1/+2 | |
|/ | ||||||
* | Merge branch 'origin/ncorgan/tvrx2_fix' | Ben Hilburn | 2014-04-10 | 1 | -3/+3 | |
|\ | | | | | | | Fix bug with regard to TVRX2 refclock dividers. | |||||
| * | tvrx2: fix ref_clock logic when using N2x0 | Nicholas Corgan | 2014-04-09 | 1 | -3/+3 | |
| | | ||||||
* | | Merge branch 'origin/b200/issue_418' | Ben Hilburn | 2014-04-10 | 3 | -11/+14 | |
|\ \ | | | | | | | | | | Fixing unsafe sscanf call. | |||||
| * | | b100+b200+usrp1: removed potentially unsafe sscanf call | Martin Braun | 2014-04-10 | 3 | -11/+14 | |
| |/ | ||||||
* | | Merge remote-tracking branch 'origin/bug403' | Ben Hilburn | 2014-04-10 | 1 | -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 & SBX | michael-west | 2014-04-08 | 1 | -2/+4 | |
| |/ | | | | | | | - Added initialization of clock and time sources | |||||
* | | Merge branch 'origin/uhd/issue_294_errcode' | Ben Hilburn | 2014-04-10 | 2 | -0/+93 | |
|\ \ | | | | | | | | | | Convert numeric errors to PP strings that are actually useful. | |||||
| * | | uhd: Added pp routines for error codes and rx metadata | Martin Braun | 2014-04-10 | 2 | -0/+93 | |
| |/ | ||||||
* | | Merge branch 'martin/warn_sampling_rate' | Ben Hilburn | 2014-04-10 | 11 | -3/+63 | |
|\ \ | | | | | | | | | | Warn users if they request a sample rate greater than the interface bandwidth. | |||||
| * | | uhd: Added max link rate info for usrp1, usrp2 and b100 | Martin Braun | 2014-04-10 | 5 | -1/+5 | |
| | | | ||||||
| * | | b200: Added max link rate info | Martin Braun | 2014-04-10 | 2 | -1/+4 | |
| | | | ||||||
| * | | uhd: multi_usrp now understands link rate info and can check for it | Martin Braun | 2014-04-10 | 1 | -0/+41 | |
| | | | ||||||
| * | | x300: Added max link rate info | Martin Braun | 2014-04-10 | 2 | -1/+12 | |
| | | | ||||||
| * | | uhd: Registered sc12 as type | Martin Braun | 2014-04-10 | 1 | -0/+1 | |
| |/ | ||||||
* / | bugfix#393: Fixed X300 TX flow control to handle short bursts and arbitrary ↵ | Ashish Chaudhari | 2014-04-10 | 1 | -13/+22 | |
|/ | | | | FC windows. | |||||
* | x300: add UHD_IMAGES_DIR to list of directories searched for LVBITX files | Nicholas Corgan | 2014-04-08 | 1 | -0/+16 | |
| | ||||||
* | b200: reverted decim mask for scaling factor, and instead conditionally add ↵ | Balint Seeber | 2014-03-31 | 1 | -3/+5 | |
| | | | | new X3x0 host rates (get_host_rates) with '_is_b200' | |||||
* | b200: RX DSP scaling mask is 1 bit too narrow for decim 256 | Balint Seeber | 2014-03-31 | 1 | -1/+1 | |
| | ||||||
* | x300: Fix the assumed max header size | Martin Braun | 2014-03-28 | 2 | -18/+15 | |
| | ||||||
* | Merge branch 'origin/x300/bug386' for flushing buffers smarter. | Ben Hilburn | 2014-03-27 | 1 | -14/+21 | |
|\ | ||||||
| * | Fix for BUG #386: RIO & UHD: Flush buffers smarter | michael-west | 2014-03-07 | 1 | -14/+21 | |
| | | | | | | | | - Updated flush algorithm to acquire and release all elements instead of 1 element at a time | |||||
* | | Merge branch adding warning regarding MCR on the B2xx. | Ben Hilburn | 2014-03-27 | 7 | -25/+129 | |
|\ \ | ||||||
| * | | b200: changed ad9361 ctrl/transaction magic number 64 to macro, as it is in ↵ | Balint Seeber | 2014-03-19 | 3 | -12/+15 | |
| | | | | | | | | | | | | the FX3 FW | |||||
| * | | b200: explicitly detect libusb timeout | Balint Seeber | 2014-03-19 | 1 | -8/+19 | |
| | | | ||||||
| * | | b200: changed ad9361 read timeout handling (kicks in when requesting ↵ | Balint Seeber | 2014-03-19 | 2 | -4/+11 | |
| | | | | | | | | | | | | master_clock_rate above 56MHz) | |||||
| * | | b200: addressed review comments (boost::uint16_t & source code long line ↵ | Balint Seeber | 2014-03-19 | 1 | -6/+19 | |
| | | | | | | | | | | | | breaking) | |||||
| * | | Merge branch 'master' of github.com:EttusResearch/uhddev into b200/warn_mimo_mcr | Balint Seeber | 2014-02-20 | 3 | -30/+44 | |
| |\ \ | ||||||
| * | | | b200: throw exception when master clock rate (tick rate) is requested to be ↵ | Balint Seeber | 2014-02-14 | 5 | -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 | |||||
* | | | | Merge branch 'maint' | Nicholas Corgan | 2014-03-27 | 2 | -6/+4 | |
|\ \ \ \ | ||||||
| * | | | | nirio: improved dealing with unsupported OS's | Nicholas Corgan | 2014-03-27 | 2 | -6/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Instead of specifically checking for Apple, default to unsupported iface file if unsupported OS is detected * Don't error out if we can't catch a specific unsupported OS, just use barebones "unsupported" structs | |||||
* | | | | | b200: update FPGA loading percentage every 1% instead of 10% | Nicholas Corgan | 2014-03-27 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Pulling in patch from Marcus Leech for includes and older OSes. | Ben Hilburn | 2014-03-26 | 2 | -0/+9 | |
| | | | | ||||||
* | | | | b200: Added missing include to b200_impl | Moritz Fischer | 2014-03-23 | 1 | -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 Fischer | 2014-03-23 | 1 | -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 up | michael-west | 2014-03-18 | 1 | -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-west | 2014-03-17 | 2 | -10/+18 | |
| | | | | ||||||
* | | | | uhd: Addressed Balints and Bens comments for subdev addressing | Martin Braun | 2014-03-17 | 3 | -17/+23 | |
| | | | | ||||||
* | | | | Merge branch 'maint' | Nicholas Corgan | 2014-03-17 | 1 | -1/+9 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'maint' into usb/serial_fix | Nicholas Corgan | 2014-03-17 | 3 | -30/+44 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | usb: better processing of strings from libusb | Nicholas Corgan | 2014-02-14 | 1 | -1/+9 | |
| | |/ / | |/| | | | | | | | | | | | | | | * When overwriting a string field with a shorter string, libusb doesn't erase extra characters * Extra processing of this string (already done by load_eeprom) removes extraneous characters | |||||
* | | | | uhd: Fixed WSA bugs (superfluous %s, getsockopt parameters) | Patrick Sisterhen | 2014-03-16 | 1 | -5/+7 | |
| | | | | ||||||
* | | | | uhd: prelim fix for windows-based UDP transport | Martin Braun | 2014-03-16 | 1 | -2/+77 | |
| | | | | ||||||
* | | | | Merge clock and PPS fixes. | Ben Hilburn | 2014-03-15 | 6 | -53/+130 | |
|\ \ \ \ |