aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Ben Hilburn2014-04-105-110/+173
|\
| * review#64288: Addressed Patrick's feedbackAshish Chaudhari2014-04-101-61/+78
| |
| * nirio: Removed RX zero-copy workaround for NI-RIO 13.0Ashish Chaudhari2014-04-101-2/+2
| |
| * nirio: Enhancement: Added state to nirio_fifo to avoid unnecessary kernel ↵Ashish Chaudhari2014-04-102-35/+64
| | | | | | | | calls for redundant transitions.
| * bugfix#393: Fixed X300 TX flow control to handle short bursts and arbitrary ↵Ashish Chaudhari2014-04-101-13/+22
| | | | | | | | FC windows.
| * nirio: Added fifo channel to start and stop RIO syncop params.Ashish Chaudhari2014-04-101-0/+4
| |
| * uhd/host: clarifying LICENSE fileBen Hilburn2014-04-101-0/+4
| |
* | Merge branch 'maint'Ben Hilburn2014-04-091-19/+23
|\|
| * x3x0 docs: the word 'firmware' is misleadingBen Hilburn2014-04-091-19/+23
| |
* | Major improvements to usrp_n2xx_simple_net_burnerNicholas Corgan2014-04-092-310/+284
| | | | | | | | | | | | | | | | | | * Improved utility's memory usage * Moved packet structure and relevant #defines to source file, removed header * Formalized packet code enums and removed unused code * Added progress percentage to image writing and verification * Deprecated --no_fw, --no_fpga, and --auto_reboot options, warning message displays when used * Other misc. coding improvements
* | Merge branch 'maint'Nicholas Corgan2014-04-081-0/+16
|\|
| * x300: add UHD_IMAGES_DIR to list of directories searched for LVBITX filesNicholas Corgan2014-04-081-0/+16
| |
* | Merge branch 'maint'Ben Hilburn2014-04-072-4/+12
|\|
| * docs: Clarified there can only be one streamer per deviceMartin Braun2014-04-072-4/+12
| |
* | b2xx: Pulling FX3 and AD9361 source code into master.Ben Hilburn2014-04-0724-0/+7291
| |
* | Merge branch 'maint'Nicholas Corgan2014-04-021-2/+2
|\|
| * cmake: updated uhd_images_downloader URLNicholas Corgan2014-04-021-2/+2
| |
* | Merge branch 'maint'Nicholas Corgan2014-03-310-0/+0
|\|
| * x300/docs: Clarified programming of IP addressesMartin Braun2014-03-312-58/+39
| |
| * 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
| |
* | Merge fix for x300 documentation regarding updating IP address.Ben Hilburn2014-03-312-58/+39
|\ \
| * | x300/docs: Clarified programming of IP addressesMartin Braun2014-03-312-58/+39
| |/
* | 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
| |
* | Improvements to test_dboard_coercion utilityNicholas Corgan2014-03-311-333/+202
|/ | | | | | | | * Code cleanliness work, removed significant amount of duplicate code * Improved output for clarity * Added B2x0 support * Added channel selection * Added options to select frequency and gain deltas
* x300: Fix the assumed max header sizeMartin Braun2014-03-282-18/+15
|
* Merge branch 'origin/x300/bug386' for flushing buffers smarter.Ben Hilburn2014-03-271-14/+21
|\
| * Fix for BUG #386: RIO & UHD: Flush buffers smartermichael-west2014-03-071-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 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
* | | | Merge branch 'maint'Nicholas Corgan2014-03-273-14/+8
|\ \ \ \
| * | | | nirio: improved dealing with unsupported OS'sNicholas Corgan2014-03-273-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | * 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 Corgan2014-03-271-1/+1
|/ / / /
* | | | BUG #396: X3x0: Packet loss within burst while running full duplex overnightmichael-west2014-03-261-13/+9
| | | | | | | | | | | | | | | | - Disabled all packet forwarding
* | | | Pulling in patch from Marcus Leech for includes and older OSes.Ben Hilburn2014-03-262-0/+9
| | | |
* | | | Merge fix for missing include, breaking builds in older OSes.Ben Hilburn2014-03-252-1/+1
|\ \ \ \
| * | | | 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>
* | | | | cmake: updated images downloader URL and MD5sumNicholas Corgan2014-03-241-2/+2
|/ / / /
* | | | cmake: don't set CPACK_SET_DESTDIR with NSISNicholas Corgan2014-03-211-1/+3
| | | |
* | | | x300 fpga: updating FPGA code with latest bug fixesBen Hilburn2014-03-206-3411/+3432
| | | |
* | | | Merge branch 'maint'Nicholas Corgan2014-03-191-1/+2
|\ \ \ \
| * | | | cmake: added CPACK_SET_DESTDIR variable for consistent CMAKE_INSTALL_PREFIX ↵Nicholas Corgan2014-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | usage in packaging
* | | | | BUG #396: Mid-Burst Sequence Errorsmichael-west2014-03-192-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Restored link state handling. - Enabled forwarding of packets not addressed to this device's MAC address. - Kept forwarding of broadcast packets disabled. NOTE: This is a workaround and not a permanent fix.