Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | manual merge to use localparams from udp version | Matt Ettus | 2010-05-27 | 1 | -4/+23 |
| | |||||
* | from UDP branch, changed names because I want these separate from the ↵ | Matt Ettus | 2010-05-27 | 3 | -0/+1321 |
| | | | | non-udp versions | ||||
* | ignore output files | Matt Ettus | 2010-05-27 | 1 | -0/+2 |
| | |||||
* | new files from udp branch added to main Makefile | Matt Ettus | 2010-05-27 | 1 | -1/+19 |
| | |||||
* | Merge branch 'udp' into master_merge_take2 | Matt Ettus | 2010-05-27 | 30 | -67/+2257 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * udp: (67 commits) better test program for just the tx side fix typo, no functionality difference ignores move dsp settings regs to reclocked setting bus. Works, gets us to within 18ps of passing timing reverting logic clean up which should have made timing better, but made it worse instead moved fifos around, now easier to see where they are and how big bigger fifo on UDP TX path, to possibly fix overruns on decim=4 Xilinx ISE is incorrectly parsing the verilog case statement, this is a workaround pps and vita time debug pins ignore emacs backup files more debug for fixing E's better debug pins for going after cascading E's copy in wrong place copied over from quad radio just debug pin changes typo caused the tx udp chain to be disconnected moved into subdir speed up timing by ignoring the too_early error. We'll need to FIXME this later Added set time and set time at next pps. Removed the old sync pps commands, they dont make sense to use anymore. moved around regs, added a bit to allow for alternate PPS source ... | ||||
| * | better test program for just the tx side | Matt Ettus | 2010-05-19 | 1 | -163/+63 |
| | | |||||
| * | fix typo, no functionality difference | Matt Ettus | 2010-05-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into udp | Matt Ettus | 2010-05-18 | 224 | -329/+19 |
| |\ | |/ |/| | | | | | | | | | | | Remove CVS files, warning removal on setting reg width, aeMB synthesis pragmas Conflicts: usrp2/control_lib/setting_reg.v usrp2/top/u2_core/u2_core.v usrp2/top/u2_rev3/Makefile | ||||
* | | get rid of some warnings by declaring setting reg width | Matt Ettus | 2010-05-18 | 1 | -8/+8 |
| | | |||||
* | | added width parameter to avoid warnings (thanks IJB) and default value parameter | Matt Ettus | 2010-05-18 | 1 | -3/+5 |
| | | |||||
* | | added pragmas suggested by Ian Buckley to help ISE12 synthesis | Matt Ettus | 2010-05-18 | 1 | -3/+6 |
| | | |||||
* | | get rid of old CVS linkage | Matt Ettus | 2010-05-18 | 221 | -315/+0 |
| | | |||||
* | | settings bus to dsp_clk now uses clock crossing fifo | Matt Ettus | 2010-05-16 | 2 | -8/+15 |
| | | |||||
| * | ignores | Matt Ettus | 2010-05-18 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into udp, removes u2_rev1, rev2 | Matt Ettus | 2010-05-13 | 10 | -2076/+0 |
| |\ | |/ |/| | | | | | Conflicts: usrp2/control_lib/settings_bus.v | ||||
* | | remove files for old prototypes, they were confusing people | Matt Ettus | 2010-05-13 | 10 | -2076/+0 |
| | | |||||
* | | revert commit 9899b81f920 which should have improved timing but didn't | Matt Ettus | 2010-05-13 | 1 | -5/+13 |
| | | |||||
| * | move dsp settings regs to reclocked setting bus. Works, gets us to within ↵ | Matt Ettus | 2010-05-12 | 2 | -12/+19 |
| | | | | | | | | 18ps of passing timing | ||||
| * | reverting logic clean up which should have made timing better, but made it ↵ | Matt Ettus | 2010-05-11 | 1 | -5/+12 |
| | | | | | | | | worse instead | ||||
| * | Merge branch 'master' into udp | Matt Ettus | 2010-05-11 | 11 | -14/+540 |
| |\ | |/ |/| | |||||
* | | remove port which is no longer there | Matt Ettus | 2010-05-11 | 1 | -1/+1 |
| | | |||||
* | | cleaned up the logic, this is copied over from quad radio | Matt Ettus | 2010-05-11 | 1 | -13/+5 |
| | | |||||
* | | allow settings bus to cross to a new clock domain, should help timing, but ↵ | Matt Ettus | 2010-05-11 | 9 | -0/+534 |
| | | | | | | | | not attached yet | ||||
| * | Merge branch 'corgan_fixes' into udp_corgan | Matt Ettus | 2010-04-26 | 6 | -32/+47 |
| |\ | |/ |/| | |||||
* | | Update config to all eight clock buffers to be used. | Johnathan Corgan | 2010-03-29 | 1 | -1/+1 |
| | | |||||
* | | Added timing constraint for Wishbone clock/dsp_clock skew | Johnathan Corgan | 2010-03-29 | 1 | -0/+2 |
| | | |||||
* | | Merge commit 'upstream/master' | Johnathan Corgan | 2010-03-09 | 2 | -1/+2 |
|\ \ | |||||
* | | | Cut debug bus connection to etherenet MAC to make closing timing easier | Ian Buckley | 2010-02-24 | 1 | -2/+7 |
| | | | |||||
* | | | Remove some warnings in dsp_core_rx | Johnathan Corgan | 2010-02-23 | 1 | -3/+7 |
| | | | |||||
* | | | Fix missing item on sensitivity list | Johnathan Corgan | 2010-02-23 | 1 | -1/+1 |
| | | | |||||
* | | | Change bit width of CORDIC constants to remove meaningless warning | Johnathan Corgan | 2010-02-23 | 1 | -24/+24 |
| | | | |||||
* | | | Manually assign clk_fpga to BUFG to improve timing | Johnathan Corgan | 2010-02-23 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting Router Phase 1: 96908 unrouted; REAL time: 25 secs Phase 2: 85651 unrouted; REAL time: 35 secs Phase 3: 27099 unrouted; REAL time: 49 secs Phase 4: 27099 unrouted; (97405) REAL time: 49 secs Phase 5: 27259 unrouted; (5348) REAL time: 54 secs Phase 6: 27277 unrouted; (0) REAL time: 54 secs Phase 7: 0 unrouted; (0) REAL time: 1 mins 46 secs Phase 8: 0 unrouted; (0) REAL time: 1 mins 56 secs Phase 9: 0 unrouted; (0) REAL time: 2 mins 29 secs | ||||
| | * | Merge branch 'master' into udp | Matt Ettus | 2010-03-25 | 221 | -3/+27520 |
| | |\ | | |/ | |/| | |||||
| * | | proper initialization of the ram | Matt Ettus | 2010-02-23 | 2 | -1/+2 |
|/ / | |||||
* | | ignore emacs cruft | Matt Ettus | 2010-02-08 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'usrp1' into usrp2 | Josh Blum | 2010-01-22 | 219 | -2/+27517 |
|\ \ | | | | | | | | | | | | | Conflicts: .gitignore | ||||
| * | | Moved usrp1 fpga files into usrp1 subdir. | Josh Blum | 2010-01-22 | 218 | -0/+0 |
| | | | |||||
| * | | Added git ignore files auto created from svn:ignore properties. | git repository hosting | 2009-08-13 | 12 | -0/+97 |
| | | | |||||
| * | | Revert erroneous file included in r11424 | jcorgan | 2009-07-14 | 1 | -6/+3 |
| | | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11425 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Reorganization of debian package directory | jcorgan | 2009-07-14 | 1 | -3/+6 |
| | | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11424 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Built and checked in new rbfs that fix ticket:248 and ticket:290. The rbfs ↵ | eb | 2009-05-12 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are built from r11012 and were compiled using Quartus II Version 7.1 build 178 06/25/2007 SP 1 SJ Web Edition. ticket:248 was actually fixed in [9485], but the updated rbfs were never checked in. Ticket:290 wasn't really a bug. The host code has always been correct. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11014 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk ↵ | jcorgan | 2009-02-26 | 3 | -33/+64 |
| | | | | | | | | | | | | | | | | | | passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10529 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Allows for changing the interpolation rate dynamically. Stop the pipeline, ↵ | matt | 2008-09-02 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | set the rate, restart the pipeline. Fixes bug #248. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9485 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Merged features/inband-usb -r6431:8293 into trunk. | eb | 2008-04-30 | 23 | -1325/+1021 |
| | | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8295 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Restores 8-bit sample format support to FPGA code. Synthesized with 7.1SP1. | jcorgan | 2007-11-10 | 5 | -1/+1 |
| | | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6858 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Regenerated USRP Makefile.extra | jcorgan | 2007-11-01 | 1 | -142/+184 |
| | | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6777 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Merged r6766:6775 from jcorgan/t195. Fixes ticket:195. NOTE: this removes ↵ | jcorgan | 2007-11-01 | 6 | -97/+151 |
| | | | | | | | | | | | | | | | | | | 8 bit sample width support on receive. Synthesized with 7.1SP1. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6776 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | Merged r6749:6763 from jcorgan/t179. Fixes ticket:179. New RBFs ↵ | jcorgan | 2007-11-01 | 8 | -94/+339 |
| | | | | | | | | | | | | | | | | | | synthesized with 7.1SP1. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6764 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | tool version changed | eb | 2007-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6604 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
| * | | New rbfs built from r6602 using Quartus II Web Edition version 7.1 SP1 | eb | 2007-10-09 | 4 | -0/+0 |
| | | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6603 221aa14e-8319-0410-a670-987f0aec2ac5 |