aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'martin/warn_sampling_rate'Ben Hilburn2014-04-1012-9/+65
|\ | | | | | | Warn users if they request a sample rate greater than the interface bandwidth.
| * Merge branch 'martin/warn_sampling_rate'Martin Braun2014-04-100-0/+0
| |\ | | | | | | | | | | | | Conflicts: host/include/uhd/usrp/multi_usrp.hpp
| | * uhd: Added max link rate info for usrp1, usrp2 and b100Martin Braun2014-04-015-1/+5
| | |
| | * b200: Added max link rate infoMartin Braun2014-04-012-1/+4
| | |
| | * uhd: multi_usrp now understands link rate info and can check for itMartin Braun2014-04-012-6/+43
| | |
| | * x300: Added max link rate infoMartin Braun2014-04-012-1/+12
| | |
| | * uhd: Registered sc12 as typeMartin Braun2014-04-011-0/+1
| | |
| * | 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-102-6/+43
| | |
| * | x300: Added max link rate infoMartin Braun2014-04-102-1/+12
| | |
| * | uhd: Registered sc12 as typeMartin Braun2014-04-101-0/+1
| | |
* | | 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