summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* dboard: updated timed sync stuff for wbx* sbx*Josh Blum2012-04-205-39/+53
* usrp2: cleanup for fifo control wraparound_lt16 routineJosh Blum2012-04-201-5/+3
* usrp2: add variable for wb/spi interfaceJosh Blum2012-04-202-12/+27
* usrp2: updated fifo command with to 16 (1 short fifo)Josh Blum2012-04-181-1/+1
* usrp: updated nchan usage for vita rx changeJosh Blum2012-04-101-1/+1
* Merge branch 'master' into nextJosh Blum2012-04-105-282/+337
|\
| * uhd: updated transport hammerNicholas Corgan2012-04-101-269/+261
| * Merge branch 'fpga_master'Josh Blum2012-04-101-0/+60
| |\
| * \ Merge branch 'maint'Josh Blum2012-04-097-12/+10
| |\ \
| | * \ Merge branch 'fpga_maint' into maintJosh Blum2012-04-095-6/+6
| | |\ \
| | * | | dsp: clear register now overlaps with numchan register.Josh Blum2012-04-091-4/+2
| | * | | usrp: fix set_clock_config typo for external and mimo clock refJosh Blum2012-04-061-2/+2
| * | | | uhd: changed ABI compat string to 3.4.0-1 for new multi usrp additionsJosh Blum2012-04-051-1/+1
| * | | | multi_usrp: added subdev spec and antenna to get_usrp_info functionsNicholas Corgan2012-04-051-1/+1
| * | | | multi_usrp: added subdev spec and antenna to get_usrp_info functionsNicholas Corgan2012-04-051-1/+5
| * | | | lib: corrected multi_usrp docsNicholas Corgan2012-04-041-2/+0
| * | | | lib: multi_usrp can now output motherboard and daughterboard data in a dictio...Nicholas Corgan2012-04-042-6/+69
* | | | | Merge branch 'fpga_next' into nextJosh Blum2012-04-104-3/+63
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into nextJosh Blum2012-04-095-7/+67
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'maint'Josh Blum2012-04-095-6/+6
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | vita: moved clear register to overlap with nchan registerJosh Blum2012-04-095-6/+6
| | * | | | Merge branch 'maint'Josh Blum2012-04-022-5/+5
| | |\| | |
| | * | | | fpga: extract usage summary from map fileJosh Blum2012-03-271-0/+60
| * | | | | Merge branch 'master' into nextJosh Blum2012-03-264-85/+92
| |\| | | |
* | | | | | Merge branch 'master' into nextJosh Blum2012-04-0328-357/+722
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'maint'Josh Blum2012-04-033-8/+8
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'fpga_maint' into maintJosh Blum2012-04-022-5/+5
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | b100: fix slave fifo data xfer exit conditionJosh Blum2012-04-012-5/+5
| | | | |/ | | | |/|
| | * | | examples: fix bsd compilation for network relay exampleJosh Blum2012-04-011-3/+3
| * | | | Merge branch 'docs_stuff'Josh Blum2012-03-3016-343/+349
| |\ \ \ \
| | * | | | docs: All instances of "the UHD" have been changed to "UHD". All paths, filen...Nicholas Corgan2012-03-3013-146/+145
| | * | | | docs: Format consistency, such as representation of program names or filepathsNicholas Corgan2012-03-2912-131/+136
| | * | | | docs: Adding links to specific installation instructions for Windows and Linu...Nicholas Corgan2012-03-297-81/+83
| * | | | | uhd: windows fixes and formatting for hammer exampleJosh Blum2012-03-301-293/+293
| * | | | | Merge branch 'maint'Josh Blum2012-03-297-5/+15
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | usrp1: stop threads in deconstructorJosh Blum2012-03-293-4/+10
| | * | | | cmake: Binaries give notification before installing or uninstalling UHD. Bett...Nicholas Corgan2012-03-294-1/+5
| | |/ / /
| * | | | examples: Transport Hammer - a stress test that calls for random or user-spec...Nicholas Corgan2012-03-272-0/+349
* | | | | Merge branch 'master' into nextJosh Blum2012-03-268-126/+169
|\| | | |
| * | | | Merge branch 'maint'Josh Blum2012-03-262-4/+25
| |\| | |
| | * | | dbsrx: limit the USRP1 + DBSRX GPIO clock rate to 4MHzJosh Blum2012-03-261-1/+8
| | * | | usrp2: possible fix for invalid broadcast repliesJosh Blum2012-03-261-3/+17
| * | | | Merge branch 'maint'Josh Blum2012-03-264-85/+92
| |\| | |
| | * | | Merge branch 'fpga_maint' into maintJosh Blum2012-03-264-85/+92
| | |\| |
| | | * | B100: port cleanups from b100-txbug to this branchNick Foster2012-03-262-28/+21
| | | * | fpga: fifo_2clock handles widths and sizes in-between corgensJosh Blum2012-03-251-21/+23
| | | * | b100: cleanup redundant logic for slwr and slrdJosh Blum2012-03-251-2/+2
| | | * | b100: extra data pktend cycle for fifo addrJosh Blum2012-03-251-2/+8
| | | * | b100: slave fifo fix for dst/src ready signalsJosh Blum2012-03-242-35/+41
| * | | | fx2: simplify i2c code and overload eeprom read/writeJosh Blum2012-03-261-15/+24