summaryrefslogtreecommitdiffstats
path: root/usrp2/top
Commit message (Collapse)AuthorAgeFilesLines
* pushbutton now goes into interrupt controller, can be read from software. ↵Matt Ettus2010-07-192-2/+4
| | | | Normally high, goes low when pushed
* Merge branch 'ise12' into u2pMatt Ettus2010-07-191-8/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 fix to stop endless error packets updated tests to match new features error packets are now valid Extension Context packets error packets don't have a trailer any more streamid is now optional on data packets, set by header register trailer now has a bit to indicate successful End-of-burst hard-coded some header bits to correct values to ensure valid packets reload bit for vita rx ctrl
| * move declaration ahead of useMatt Ettus2010-07-191-5/+5
| |
| * put run_tx and run_rx on the displayed LEDsMatt Ettus2010-07-191-3/+4
| |
* | reset the ack signalMatt Ettus2010-07-131-1/+1
| |
* | includes led blinker in bootramMatt Ettus2010-07-131-3/+7
| |
* | separate boot ram, redone memory map, connected uartMatt Ettus2010-07-132-38/+40
| |
* | further cleanupMatt Ettus2010-07-122-216/+27
| |
* | remove ram loaderMatt Ettus2010-07-121-29/+8
| |
* | updated to ise12 fixes from main development lineMatt Ettus2010-07-121-22/+22
| |
* | Merge branch 'ise12' into u2pMatt Ettus2010-07-122-52/+51
|\| | | | | | | | | | | * ise12: precompute udp checksums barely fails timing on gigE/10 and gigE/12, larger fail on udp/10, but all seem to work ok
| * Merge branch 'master' into ise12Matt Ettus2010-06-181-1/+2
| |\ | | | | | | | | | | | | * master: proper dependency tracking for the makefile
| * | barely fails timing on gigE/10 and gigE/12, larger fail on udp/10, but allMatt Ettus2010-06-142-52/+51
| | | | | | | | | | | | seem to work ok
* | | Merge branch 'master' into u2pMatt Ettus2010-06-181-1/+2
|\ \ \ | | |/ | |/| | | | | | | * master: proper dependency tracking for the makefile
| * | proper dependency tracking for the makefileMatt Ettus2010-06-181-1/+2
| |/
* | Merge branch 'master' into u2pMatt Ettus2010-06-141-1/+7
|\| | | | | | | | | * master: new make works on ise12
| * new make works on ise12Matt Ettus2010-06-141-1/+7
| |
* | new core for u2p, based on u2_coreMatt Ettus2010-06-141-0/+856
| |
* | build using new build systemMatt Ettus2010-06-141-205/+34
| |
* | Merge branch 'master' into u2pMatt Ettus2010-06-145-421/+130
|\| | | | | | | | | | | * master: produces good bin files first attempt at cleaning up the build system
| * produces good bin filesMatt Ettus2010-06-114-57/+31
| |
| * first attempt at cleaning up the build systemMatt Ettus2010-06-104-414/+149
| |
* | actually generates an imageMatt Ettus2010-06-093-17/+9
| |
* | Merge branch 'master' into u2pMatt Ettus2010-06-095-53/+18
|\| | | | | | | | | | | * master: get rid of debug stuff to help timing move u2_core into u2_rev3 directory to simplify directory structure and save headaches
| * get rid of debug stuff to help timingMatt Ettus2010-06-081-7/+16
| |
| * move u2_core into u2_rev3 directory to simplify directory structure and save ↵Matt Ettus2010-06-085-46/+2
| | | | | | | | headaches
* | Merge branch 'master' into u2pMatt Ettus2010-06-082-2/+2
|\| | | | | | | | | | | | | | | * master: allow other clock rates in vita time report ise version in build proper name for directory name build directory with ISE version name
| * report ise version in buildMatt Ettus2010-06-071-1/+1
| |
| * proper name for directoryMatt Ettus2010-06-071-1/+1
| |
| * name build directory with ISE version nameMatt Ettus2010-06-071-1/+1
| |
* | compiles now, added clock constraintsMatt Ettus2010-06-072-3/+43
| |
* | works, leds on front count up.Matt Ettus2010-06-071-341/+2
| |
* | skeleton files copied over from a dead branchMatt Ettus2010-06-079-374/+1728
|/
* non-udp uses a different address for the tx dsp coreMatt Ettus2010-05-271-1/+1
|
* manual merge to use localparams from udp versionMatt Ettus2010-05-271-4/+23
|
* from UDP branch, changed names because I want these separate from the ↵Matt Ettus2010-05-272-0/+1138
| | | | non-udp versions
* new files from udp branch added to main MakefileMatt Ettus2010-05-271-1/+19
|
* Merge branch 'udp' into master_merge_take2Matt Ettus2010-05-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Merge branch 'master' into udpMatt Ettus2010-05-181-9/+9
| |\ | |/ |/| | | | | | | | | | | 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
| |
* | 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
| |
| * move dsp settings regs to reclocked setting bus. Works, gets us to within ↵Matt Ettus2010-05-122-12/+19
| | | | | | | | 18ps of passing timing
| * Merge branch 'master' into udpMatt Ettus2010-05-111-1/+1
| |\ | |/ |/|
* | remove port which is no longer thereMatt Ettus2010-05-111-1/+1
| |
| * Merge branch 'corgan_fixes' into udp_corganMatt Ettus2010-04-263-4/+15
| |\ | |/ |/|
* | 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
| |