summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Merge branch 'maint'Josh Blum2012-03-261-22/+28
| |\| | |
| | * | | uhd: use release mode and git count for stable and unstable buildsJosh Blum2012-03-261-22/+28
* | | | | Merge branch 'master' into nextJosh Blum2012-03-231-1/+1
|\| | | |
| * | | | Merge branch 'maint'Josh Blum2012-03-231-1/+1
| |\| | |
| | * | | Changes preinst.in to 'echo' instead of 'ls'Nicholas Corgan2012-03-231-1/+1
* | | | | uhd: updated sync docs for timed commandsJosh Blum2012-03-231-1/+34
* | | | | Merge branch 'fpga_next' into nextJosh Blum2012-03-2312-426/+1454
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | spi core: ready logic low one cycle earlierJosh Blum2012-03-161-1/+1
| * | | | fifo ctrl: parameterize having a proto headerJosh Blum2012-03-164-10/+12
| * | | | fifo ctrl: rename fifo ctrl module and add sid ack paramJosh Blum2012-03-164-37/+40
| * | | | fifo ctrl: minor fixes for spi core, swap time defineJosh Blum2012-03-165-10/+10
| * | | | fifo ctrl: simplified perfs, added spi clock idle phaseJosh Blum2012-03-165-333/+341
| * | | | fifo ctrl: minor fixes from last commitJosh Blum2012-03-163-366/+366
| * | | | fifo ctrl: spi core work, fifo ctrl perifs, usrp2 supportJosh Blum2012-03-165-370/+429
| * | | | spi: created simple spi core (sr based)Josh Blum2012-03-164-383/+593
| * | | | fifo ctrl: simplified result packets (no tsf or sid)Josh Blum2012-03-161-16/+7
| * | | | fifo_ctrl: switched to medfifo and separate result fifoJosh Blum2012-03-163-92/+122