summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextJosh Blum2012-04-2126-80/+144
|\
| * e100: fix typo from last commitJosh Blum2012-04-201-1/+1
| * mboard id's are now more concise (codenames are separated, for example), and ...Nicholas Corgan2012-04-2016-49/+86
| * send: sph holdover from transport workJosh Blum2012-04-191-0/+1
| * Merge branch 'maint'Josh Blum2012-04-182-5/+7
| |\
| | * master: Fixing comments that say SPI is LSB.Ben Hilburn2012-04-181-2/+2
| | * n2x0: card burner fixes for python3.0 and IPv6Josh Blum2012-04-181-3/+5
| * | Merge branch 'maint'Josh Blum2012-04-172-4/+3
| |\|
| | * usb: do not release recv buffer in wrapperJosh Blum2012-04-171-3/+2
| | * recv: only inspect tsf on timestamp error checkJosh Blum2012-04-171-1/+1
| * | multi_usrp: returns db_eeprom instead of gdb_eeprom in both TX/RX casesNicholas Corgan2012-04-171-5/+1
| * | Merge branch 'maint'Josh Blum2012-04-161-2/+2
| |\|
| | * convert: give SIMD conversions prio over tableJosh Blum2012-04-161-2/+2
| * | examples: added multi-channel and host format options to benchmarkJosh Blum2012-04-131-16/+41
| * | Merge branch 'maint'Josh Blum2012-04-133-3/+7
| |\|
| | * cmake: UHDVersion.cmake gets rid of git commit number if 'release' is specifi...Nicholas Corgan2012-04-131-1/+5
| | * utils: card/net burner string decodeJosh Blum2012-04-122-2/+2
| * | Merge branch 'maint'Josh Blum2012-04-101-1/+1
| |\|
| | * uhd: bumped version num to 3.4.1 for releaserelease_003_004_001Josh Blum2012-04-101-1/+1
* | | Merge branch 'timed_cmds_work_fpga' into timed_cmds_workJosh Blum2012-04-216-416/+429
|\ \ \
| * | | N2x0: updated the bootloader w/ latest from fwJosh Blum2012-04-201-390/+390
| * | | usrp2: remove settings_fifo_ctrl, meets timingJosh Blum2012-04-201-2/+11
| * | | fifo ctrl: Nseries timing meets with a single shortfifoJosh Blum2012-04-171-3/+2
| * | | usrp: work on meeting timing constraintsJosh Blum2012-04-105-25/+30
* | | | 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |