aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/control_lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_next' into nextJosh Blum2012-02-173-26/+149
|
* Merge branch 'fpga_master' into uhd_nextJosh Blum2011-11-075-0/+630
|
* Merge branch 'fpga_master' into nextJosh Blum2011-08-311-3/+2
|
* Merge branch 'fpga_patch_release' into patch_releaseJosh Blum2011-08-291-23/+23
|
* Merge branch 'fpga_patch_release' into patch_releaserelease_003_002_002Josh Blum2011-08-151-1/+1
|
* Merge branch 'atr_fix_fpga' into atr_fixrelease_003_002_000Josh Blum2011-07-281-45/+31
|
* fpga: squashed new_work fpga changes onto uhd nextJosh Blum2011-07-192-4/+10
|
* Merge branch 'fpga_next' into uhd_nextJosh Blum2011-06-1462-151/+1306
|
* Merge branch 'next' into use_vita_lengthJosh Blum2011-05-093-100/+145
|
* Merge branch 'fpga_memory_reorg' into usrp2/new_reg_mapJosh Blum2011-03-171-3/+1
|
* Merge branch 'packet_router_2nd_dsp' into nextJosh Blum2011-03-108-256/+0
|
* Merge branch 'fpga_next' into usrp_e100_develJosh Blum2011-02-081-0/+5
|
* Merge branch 'fpga_next' into uhd_with_fpga_nextJosh Blum2011-01-192-0/+74
|
* fpga: performed a forceful checkout of fpga to overwrite with current fpga codeJosh Blum2010-11-2319-18/+1138
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-093-212/+318
| | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_masterJosh Blum2010-06-1523-7530/+48
| | | | | Conflicts: fpga/.gitignore
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into workJosh Blum2010-05-182-1/+20
|
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpgaprivJosh Blum2010-05-101-1/+1
|
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-1576-0/+11383