aboutsummaryrefslogtreecommitdiffstats
path: root/usrp2/top
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Merge branch 'new_ramloader' into nocache_plus_newramloader, plus manual ↵Matt Ettus2010-05-282-30/+28
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-15/+14
| | | | | | | | |
| | * | | | | | | Merge branch 'master_nocache' into master_nocache_post_mergeMatt Ettus2010-05-284-15/+20
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-2/+3
| | | | | | | | |
| | | * | | | | | removes the icache and pipelines the readsMatt Ettus2010-05-202-5/+6
| | | | | | | | |
| * | | | | | | | 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-272-8/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2712-2089/+20
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | | send bigger packets to reduce cpu loadMatt Ettus2010-05-201-2/+2
| | | | | | | | | |
| * | | | | | | | | 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-202-34/+24
| |/ / / / / / / / /
| * | | | | | | | | moved fifos into gpmc_async, reorganized top level a bit, added in crc ↵Matt Ettus2010-05-122-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packet gen and test
| * | | | | | | | | Merge branch 'master' into u1eMatt Ettus2010-05-124-5/+16
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | switched passthru of cgen_sen_b to gpio127, made a note of it. No more ↵Matt Ettus2010-05-108-561/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safe_u1e necessary.
| * | | | | | | | | | proper signal level for 24 bit dataMatt Ettus2010-05-101-2/+7
| | | | | | | | | | |
| * | | | | | | | | | SPI passthru for programming clock gen chip on brand new boardsMatt Ettus2010-05-073-0/+391
| | | | | | | | | | |
| * | | | | | | | | | added DAC output pins, and a sine wave generator to test themMatt Ettus2010-05-043-18/+63
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'u1e' of ettus.sourcerepo.com:ettus/fpgapriv into u1eMatt Ettus2010-05-042-0/+14
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | add timing constraints. Just have main clock signal at 64 MHz for now.Matt Ettus2010-05-042-0/+14
| | | | | | | | | | | |
| * | | | | | | | | | | changed commentMatt Ettus2010-05-041-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | separate timed tx and rx instead of loopbackMatt Ettus2010-04-281-3/+51
| | | | | | | | | | |
| * | | | | | | | | | send bus error to debug pinsMatt Ettus2010-04-261-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Pass previously unused GPIOs to debug pins to help debug interruptsMatt Ettus2010-04-243-16/+21
| | | | | | | | | | |
| * | | | | | | | | | find time_64bitMatt Ettus2010-04-201-0/+1
| | | | | | | | | | |
| * | | | | | | | | | added pps and time capabilityMatt Ettus2010-04-153-5/+21
| | | | | | | | | | |
| * | | | | | | | | | access frame length regs from wishboneMatt Ettus2010-04-151-6/+14
| | | | | | | | | | |
| * | | | | | | | | | async seems to work with packet lengths now. Still need to do wishbone regs ↵Matt Ettus2010-04-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for gpmc
| * | | | | | | | | | async gpmc progressMatt Ettus2010-04-152-18/+20
| | | | | | | | | | |
| * | | | | | | | | | synchronous and asynchronous gpmc modelsMatt Ettus2010-04-151-1/+1
| | | | | | | | | | |
| * | | | | | | | | | handle all tri-state in the top level of gpmcMatt Ettus2010-04-151-0/+2
| | | | | | | | | | |
| * | | | | | | | | | more progress on synchronous interfaceMatt Ettus2010-04-141-0/+1
| | | | | | | | | | |
| * | | | | | | | | | renamed to async. Will be building a sync version for GPMC_CLKMatt Ettus2010-04-141-1/+1
| | | | | | | | | | |
| * | | | | | | | | | added in a loopback fifoMatt Ettus2010-04-141-4/+11
| | | | | | | | | | |
| * | | | | | | | | | minor changes to get it to synthesizeMatt Ettus2010-04-131-0/+3
| | | | | | | | | | |
| * | | | | | | | | | replaced ram interface with a fifo interface. still need to do rx sideMatt Ettus2010-04-121-39/+7
| | | | | | | | | | |
| * | | | | | | | | | added 16-bit wide atr controllerMatt Ettus2010-04-012-33/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings_bus_16 now handles variable address window sizes split ctrl of nsgpio into ctrl (selector) and debug bits
| * | | | | | | | | | connect up the 16 bit spi coreMatt Ettus2010-03-262-5/+4
| | | | | | | | | | |
| * | | | | | | | | | connect 2 clock gen controls and 3 status pins to the wishbone so they can ↵Matt Ettus2010-03-263-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be read/controlled from SW
| * | | | | | | | | | Merge branch 'udp' into u1eMatt Ettus2010-03-252-57/+179
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | connected spi pins, but the spi core still needs to be redone for 16 bit ↵Matt Ettus2010-03-253-40/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interfaces Also reconnected GPIOs so you'll need to send commands in order to get debug pins on the GPIOs
| * | | | | | | | | | | debug pinsMatt Ettus2010-02-251-2/+3
| | | | | | | | | | | |
| * | | | | | | | | | | invert the pushbuttons since they are active lowMatt Ettus2010-02-251-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | gpmc debug pinsMatt Ettus2010-02-251-3/+6
| | | | | | | | | | | |
| * | | | | | | | | | | point to the new filesMatt Ettus2010-02-251-0/+2
| | | | | | | | | | | |