aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'ise12' into u1eMatt Ettus2010-07-199-45/+163
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ise12: move declaration ahead of use put run_tx and run_rx on the displayed LEDs remove warnings add mux and demux to build mux multiple fifo streams into one. Allows priority or round robin split fifo into 2 streams based on first line in each packet precompute udp checksums barely fails timing on gigE/10 and gigE/12, larger fail on udp/10, but all seem to work ok
| * | | make loopback compileMatt Ettus2010-07-141-0/+3
| | | |
| * | | Merge branch 'reload' into u1eMatt Ettus2010-07-092-5/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * reload: fix to stop endless error packets updated tests to match new features
| * | | | point to new location for fifosMatt Ettus2010-07-091-1/+1
| | | | |
| * | | | Merge branch 'reload' into u1eMatt Ettus2010-07-081-11/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * reload: error packets are now valid Extension Context packets
| * \ \ \ \ Merge branch 'reload' into u1eMatt Ettus2010-07-071-5/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reload: reload bit for vita rx ctrl
| * \ \ \ \ \ Merge branch 'master' into u1eMatt Ettus2010-07-061-4/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: fix bug which caused serdes fifo to disappear
| * \ \ \ \ \ \ Merge branch 'master' into u1eMatt Ettus2010-06-181-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: proper dependency tracking for the makefile
| * | | | | | | | added ability to clear out fifos of tx and rx.Matt Ettus2010-06-173-28/+37
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into u1e_newbuildMatt Ettus2010-06-1442-715/+672
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made so Makefile changes as well to get it to build * master: new make works on ise12 produces good bin files first attempt at cleaning up the build system get rid of debug stuff to help timing move u2_core into u2_rev3 directory to simplify directory structure and save headaches Conflicts: usrp2/fifo/fifo36_to_fifo18.v usrp2/top/u2_rev3/Makefile usrp2/top/u2_rev3/Makefile.udp usrp2/top/u2_rev3/u2_core_udp.v
| * | | | | | | | | debug pinsMatt Ettus2010-06-101-3/+6
| | | | | | | | | |
| * | | | | | | | | much bigger fifosMatt Ettus2010-06-101-2/+2
| | | | | | | | | |
| * | | | | | | | | left something out of the sensitivity list.Matt Ettus2010-06-101-1/+1
| | | | | | | | | |
| * | | | | | | | | proper overrun, underrun connections, debug pins.Matt Ettus2010-06-101-4/+8
| | | | | | | | | |
| * | | | | | | | | ignoresMatt Ettus2010-06-081-0/+1
| | | | | | | | | |
| * | | | | | | | | debug pinsMatt Ettus2010-06-083-4/+10
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into u1eMatt Ettus2010-06-083-15/+17
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: allow other clock rates in vita time report ise version in build proper name for directory name build directory with ISE version name
| * | | | | | | | | | remove double declarationMatt Ettus2010-06-061-1/+1
| | | | | | | | | | |
| * | | | | | | | | | use fifo19 not fifo18 in makefileMatt Ettus2010-06-061-1/+1
| | | | | | | | | | |
| * | | | | | | | | | added little endian capability for gpmc to fifo and fifo to gpmc, since ARM ↵Matt Ettus2010-06-064-41/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is LE.
| * | | | | | | | | | get rid of redundant fifo18, since we can just use fifo19 and ignore the occ bitMatt Ettus2010-06-063-44/+6
| | | | | | | | | | |
| * | | | | | | | | | Phil wants gpio #145Matt Ettus2010-06-032-4/+4
| | | | | | | | | | |
| * | | | | | | | | | use same version as usrp2-udp, so regs are same place in memory mapMatt Ettus2010-06-012-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'ise12_exp' into u1eMatt Ettus2010-06-0111-391/+1749
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ise12_exp: zero out debug pins. helps timing a little bit. non-udp uses a different address for the tx dsp core manual merge to use localparams from udp version from UDP branch, changed names because I want these separate from the non-udp versions ignore output files new files from udp branch added to main Makefile change the debug pins, which makes it more reliable. This is unnerving. experimental mods to make ram loader fully synchronous. Based on IJB's work fixes from IJB from 5/24. Basically connect unconnected wires. removes the icache and pipelines the reads
| | * | | | | | | | | | zero out debug pins. helps timing a little bit.Matt Ettus2010-06-011-9/+11
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'new_ramloader' into nocache_plus_newramloader, plus manual ↵Matt Ettus2010-05-284-250/+280
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge into udp version. Raw ethernet, ISE 10 -- Passes timing, works UDP, ISE 10 -- barely fails timing, works ISE 12 -- both fail timing, not tested yet. * new_ramloader: experimental mods to make ram loader fully synchronous. Based on IJB's work
| | | * | | | | | | | | | experimental mods to make ram loader fully synchronous. Based on IJB's workMatt Ettus2010-05-263-235/+266
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master_nocache' into master_nocache_post_mergeMatt Ettus2010-05-287-26/+114
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems to work on raw ethernet version which was automatically merged UDP version untested, and the following files were merged manually: u2_core_udp.v Makefile.udp * master_nocache: change the debug pins, which makes it more reliable. This is unnerving. fixes from IJB from 5/24. Basically connect unconnected wires. removes the icache and pipelines the reads
| | | * | | | | | | | | | | change the debug pins, which makes it more reliable. This is unnerving.Matt Ettus2010-05-261-1/+2
| | | |/ / / / / / / / / /
| | | * | | | | | | | | | fixes from IJB from 5/24. Basically connect unconnected wires.Matt Ettus2010-05-242-2/+5
| | | | | | | | | | | | |
| | | * | | | | | | | | | removes the icache and pipelines the readsMatt Ettus2010-05-205-16/+98
| | | | | | | | | | | | |
| * | | | | | | | | | | | connect the rx run lines so it doesn't get optimized outMatt Ettus2010-06-011-1/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | use DDR regs instead of a 2nd clockMatt Ettus2010-06-011-8/+46
| | | | | | | | | | | | |
| * | | | | | | | | | | | assign addresses for the settings regsMatt Ettus2010-06-011-5/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | vita49 tx and rx added in, all sample rates now at main system clock rate.Matt Ettus2010-06-014-107/+220
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'udp' into u1e_merge_with_udpMatt Ettus2010-05-274-172/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * udp: 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 Conflicts: usrp2/control_lib/settings_bus.v usrp2/top/u2_core/u2_core.v
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into u1e_merge_with_masterMatt Ettus2010-05-27235-2409/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: get rid of some warnings by declaring setting reg width added width parameter to avoid warnings (thanks IJB) and default value parameter added pragmas suggested by Ian Buckley to help ISE12 synthesis get rid of old CVS linkage settings bus to dsp_clk now uses clock crossing fifo remove files for old prototypes, they were confusing people revert commit 9899b81f920 which should have improved timing but didn't Conflicts: usrp2/control_lib/setting_reg.v usrp2/top/u2_core/u2_core.v usrp2/top/u2_rev3/Makefile
| * | | | | | | | | | | | | test full width packetsMatt Ettus2010-05-241-0/+27
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fifo36_to_ll8 and fifo pacer need a real fifo between them or they deadlock ↵Matt Ettus2010-05-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (by design)
| * | | | | | | | | | | | | fix double declarationMatt Ettus2010-05-211-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | send bigger packets to reduce cpu loadMatt Ettus2010-05-202-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | put over/underrun on debug bus, remove high order address bitsMatt Ettus2010-05-201-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'u1e' of ettus.sourcerepo.com:ettus/fpgapriv into u1eMatt Ettus2010-05-201-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: usrp2/top/u1e/u1e_core.v
| | * | | | | | | | | | | | | better debug pinsMatt Ettus2010-05-171-6/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | combined timed and crc cases. fifo pacer produces/consumes at a fixed rateMatt Ettus2010-05-203-34/+48
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | moved fifos into gpmc_async, reorganized top level a bit, added in crc ↵Matt Ettus2010-05-126-66/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packet gen and test
| * | | | | | | | | | | | | add missing signal from sensitivity listMatt Ettus2010-05-121-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into u1eMatt Ettus2010-05-1217-46/+587
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | packet generator and verifier, to test gpmc and other data transfer stuffMatt Ettus2010-05-124-0/+153
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | switched passthru of cgen_sen_b to gpio127, made a note of it. No more ↵Matt Ettus2010-05-108-561/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safe_u1e necessary.