summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into udpMatt Ettus2010-05-18224-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 widthMatt Ettus2010-05-181-8/+8
| |
| * added width parameter to avoid warnings (thanks IJB) and default value parameterMatt Ettus2010-05-181-3/+5
| |
| * added pragmas suggested by Ian Buckley to help ISE12 synthesisMatt Ettus2010-05-181-3/+6
| |
| * get rid of old CVS linkageMatt Ettus2010-05-18221-315/+0
| |
| * settings bus to dsp_clk now uses clock crossing fifoMatt Ettus2010-05-162-8/+15
| |
* | ignoresMatt Ettus2010-05-181-1/+1
| |
* | Merge branch 'master' into udp, removes u2_rev1, rev2Matt Ettus2010-05-1310-2076/+0
|\| | | | | | | | | Conflicts: usrp2/control_lib/settings_bus.v
| * remove files for old prototypes, they were confusing peopleMatt Ettus2010-05-1310-2076/+0
| |
| * revert commit 9899b81f920 which should have improved timing but didn'tMatt Ettus2010-05-131-5/+13
| |
* | move dsp settings regs to reclocked setting bus. Works, gets us to within ↵Matt Ettus2010-05-122-12/+19
| | | | | | | | 18ps of passing timing
* | reverting logic clean up which should have made timing better, but made it ↵Matt Ettus2010-05-111-5/+12
| | | | | | | | worse instead
* | Merge branch 'master' into udpMatt Ettus2010-05-1111-14/+540
|\|
| * remove port which is no longer thereMatt Ettus2010-05-111-1/+1
| |
| * cleaned up the logic, this is copied over from quad radioMatt Ettus2010-05-111-13/+5
| |
| * allow settings bus to cross to a new clock domain, should help timing, but ↵Matt Ettus2010-05-119-0/+534
| | | | | | | | not attached yet
* | Merge branch 'corgan_fixes' into udp_corganMatt Ettus2010-04-266-32/+47
|\|
| * Update config to all eight clock buffers to be used.Johnathan Corgan2010-03-291-1/+1
| |
| * Added timing constraint for Wishbone clock/dsp_clock skewJohnathan Corgan2010-03-291-0/+2
| |
| * Merge commit 'upstream/master'Johnathan Corgan2010-03-092-1/+2
| |\
| * | Cut debug bus connection to etherenet MAC to make closing timing easierIan Buckley2010-02-241-2/+7
| | |
| * | Remove some warnings in dsp_core_rxJohnathan Corgan2010-02-231-3/+7
| | |
| * | Fix missing item on sensitivity listJohnathan Corgan2010-02-231-1/+1
| | |
| * | Change bit width of CORDIC constants to remove meaningless warningJohnathan Corgan2010-02-231-24/+24
| | |
| * | Manually assign clk_fpga to BUFG to improve timingJohnathan Corgan2010-02-231-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 udpMatt Ettus2010-03-25221-3/+27520
|\ \ \ | | |/ | |/|
| * | proper initialization of the ramMatt Ettus2010-02-232-1/+2
| |/
| * ignore emacs cruftMatt Ettus2010-02-081-0/+2
| |
| * Merge branch 'usrp1' into usrp2Josh Blum2010-01-22219-2/+27517
| |\ | | | | | | | | | | | | Conflicts: .gitignore
| | * Moved usrp1 fpga files into usrp1 subdir.Josh Blum2010-01-22218-0/+0
| | |
| | * Added git ignore files auto created from svn:ignore properties.git repository hosting2009-08-1312-0/+97
| | |
| | * Revert erroneous file included in r11424jcorgan2009-07-141-6/+3
| | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11425 221aa14e-8319-0410-a670-987f0aec2ac5
| | * Reorganization of debian package directoryjcorgan2009-07-141-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 ↵eb2009-05-122-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 ↵jcorgan2009-02-263-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, ↵matt2008-09-021-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.eb2008-04-3023-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.jcorgan2007-11-105-1/+1
| | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6858 221aa14e-8319-0410-a670-987f0aec2ac5
| | * Regenerated USRP Makefile.extrajcorgan2007-11-011-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 ↵jcorgan2007-11-016-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 ↵jcorgan2007-11-018-94/+339
| | | | | | | | | | | | | | | | | | synthesized with 7.1SP1. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6764 221aa14e-8319-0410-a670-987f0aec2ac5
| | * tool version changedeb2007-10-091-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 SP1eb2007-10-094-0/+0
| | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6603 221aa14e-8319-0410-a670-987f0aec2ac5
| | * Merged r6329:6428 of features/inband-usb + distcheck fixes into trunk.eb2007-09-1323-702/+621
| | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6429 221aa14e-8319-0410-a670-987f0aec2ac5
| | * Merged features/inband-usb r5224:6306 into trunk. This is work-in-progress ↵eb2007-09-0530-942/+2566
| | | | | | | | | | | | | | | | | | on inband signaling for the USRP1. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6307 221aa14e-8319-0410-a670-987f0aec2ac5
| | * Updated license from GPL version 2 or later to GPL version 3 or later.eb2007-07-215-5/+5
| | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6044 221aa14e-8319-0410-a670-987f0aec2ac5
| | * Merged r5732:5941 from jcorgan/sar into trunk. Adds start of gr-radar-mono ↵jcorgan2007-07-124-2/+2
| | | | | | | | | | | | | | | | | | component. Trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5942 221aa14e-8319-0410-a670-987f0aec2ac5
| | * merge ordm/receiver branch -r5574:5659. Reworks OFDM receiver with ↵trondeau2007-06-041-1/+0
| | | | | | | | | | | | | | | | | | refactored OFDM blocks. A few bug fixes for other blocks have also been slipped in. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5661 221aa14e-8319-0410-a670-987f0aec2ac5
| | * not usedmatt2007-05-301-26/+0
| | | | | | | | | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5578 221aa14e-8319-0410-a670-987f0aec2ac5
| | * Merged r5203:5204 from developer branch jcorgan/atr. Fixed ATR delay enable ↵jcorgan2007-05-024-6/+6
| | | | | | | | | | | | | | | | | | and reduced delay width to 12 bits. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5228 221aa14e-8319-0410-a670-987f0aec2ac5