aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'flow_control' into flow_ctrlJosh Blum2010-10-1457-256/+10817
|
* Merge branch 'ise12' into nextJosh Blum2010-08-313-29/+23
|
* Merge branch 'tx_policy' of ettus.sourcerepo.com:ettus/fpgapriv into premergeNick Foster2010-08-161-1/+1
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-092-3/+6
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-0923-5878/+873
| | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_mergeJosh Blum2010-07-051-4/+5
|
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_mergeJosh Blum2010-06-241-1/+2
|
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_masterJosh Blum2010-06-15268-901/+1835
| | | | | Conflicts: fpga/.gitignore
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into workJosh Blum2010-05-1822-2090/+554
|
* Merge branch 'shrinkfw' into usrp2Josh Blum2010-05-101-6/+18
|\
| * Added reload flag to the stream cmd.Josh Blum2010-04-281-6/+18
| | | | | | | | | | This reloads the last command to handle continuous streaming in hardware. Moved rx control register setup and stream command issuing to the host.
* | Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpgaprivJosh Blum2010-05-106-32/+47
|/
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-15653-0/+1558782