Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'packet_router_2nd_dsp' into next | Josh Blum | 2011-03-10 | 3 | -14/+18 |
| | |||||
* | Merge branch 'packet_router_2nd_dsp' into usrp2_dual_dsp | Josh Blum | 2011-02-22 | 2 | -0/+34 |
| | |||||
* | Merge branch 'fpga_next' into uhd_with_fpga_next | Josh Blum | 2011-01-19 | 1 | -4/+30 |
| | |||||
* | Merge branch 'fpga_next' into uhd_next | Josh Blum | 2010-12-22 | 2 | -6/+8 |
| | |||||
* | Merge branch 'fpga_ise12' | Josh Blum | 2010-12-09 | 1 | -2/+16 |
| | |||||
* | Merge branch 'fpga_flow_control' into next | Josh Blum | 2010-11-23 | 1 | -1/+1 |
| | |||||
* | fpga: performed a forceful checkout of fpga to overwrite with current fpga code | Josh Blum | 2010-11-23 | 9 | -132/+155 |
| | |||||
* | Merge branch 'flow_control' into flow_ctrl | Josh Blum | 2010-10-14 | 6 | -54/+194 |
| | |||||
* | Merge branch 'tx_policy' of ettus.sourcerepo.com:ettus/fpgapriv into premerge | Nick Foster | 2010-08-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'features' into uhd_fpga_features | Josh Blum | 2010-08-09 | 9 | -52/+305 |
| | | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v | ||||
* | Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_master | Josh Blum | 2010-06-15 | 3 | -164/+77 |
| | | | | | Conflicts: fpga/.gitignore | ||||
* | Added reload flag to the stream cmd. | Josh Blum | 2010-04-28 | 1 | -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. | ||||
* | moved usrp1 and usrp2 fpga dirs into fpga subdirectory | Josh Blum | 2010-04-15 | 9 | -0/+1147 |