Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pushbutton now goes into interrupt controller, can be read from software. ↵ | Matt Ettus | 2010-07-19 | 2 | -2/+4 |
| | | | | Normally high, goes low when pushed | ||||
* | Merge branch 'ise12' into u2p | Matt Ettus | 2010-07-19 | 1 | -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 use | Matt Ettus | 2010-07-19 | 1 | -5/+5 |
| | | |||||
| * | put run_tx and run_rx on the displayed LEDs | Matt Ettus | 2010-07-19 | 1 | -3/+4 |
| | | |||||
* | | reset the ack signal | Matt Ettus | 2010-07-13 | 1 | -1/+1 |
| | | |||||
* | | includes led blinker in bootram | Matt Ettus | 2010-07-13 | 1 | -3/+7 |
| | | |||||
* | | separate boot ram, redone memory map, connected uart | Matt Ettus | 2010-07-13 | 2 | -38/+40 |
| | | |||||
* | | further cleanup | Matt Ettus | 2010-07-12 | 2 | -216/+27 |
| | | |||||
* | | remove ram loader | Matt Ettus | 2010-07-12 | 1 | -29/+8 |
| | | |||||
* | | updated to ise12 fixes from main development line | Matt Ettus | 2010-07-12 | 1 | -22/+22 |
| | | |||||
* | | Merge branch 'ise12' into u2p | Matt Ettus | 2010-07-12 | 2 | -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 ise12 | Matt Ettus | 2010-06-18 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | * master: proper dependency tracking for the makefile | ||||
| * | | barely fails timing on gigE/10 and gigE/12, larger fail on udp/10, but all | Matt Ettus | 2010-06-14 | 2 | -52/+51 |
| | | | | | | | | | | | | seem to work ok | ||||
* | | | Merge branch 'master' into u2p | Matt Ettus | 2010-06-18 | 1 | -1/+2 |
|\ \ \ | | |/ | |/| | | | | | | | * master: proper dependency tracking for the makefile | ||||
| * | | proper dependency tracking for the makefile | Matt Ettus | 2010-06-18 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch 'master' into u2p | Matt Ettus | 2010-06-14 | 1 | -1/+7 |
|\| | | | | | | | | | * master: new make works on ise12 | ||||
| * | new make works on ise12 | Matt Ettus | 2010-06-14 | 1 | -1/+7 |
| | | |||||
* | | new core for u2p, based on u2_core | Matt Ettus | 2010-06-14 | 1 | -0/+856 |
| | | |||||
* | | build using new build system | Matt Ettus | 2010-06-14 | 1 | -205/+34 |
| | | |||||
* | | Merge branch 'master' into u2p | Matt Ettus | 2010-06-14 | 5 | -421/+130 |
|\| | | | | | | | | | | | * master: produces good bin files first attempt at cleaning up the build system | ||||
| * | produces good bin files | Matt Ettus | 2010-06-11 | 4 | -57/+31 |
| | | |||||
| * | first attempt at cleaning up the build system | Matt Ettus | 2010-06-10 | 4 | -414/+149 |
| | | |||||
* | | actually generates an image | Matt Ettus | 2010-06-09 | 3 | -17/+9 |
| | | |||||
* | | Merge branch 'master' into u2p | Matt Ettus | 2010-06-09 | 5 | -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 timing | Matt Ettus | 2010-06-08 | 1 | -7/+16 |
| | | |||||
| * | move u2_core into u2_rev3 directory to simplify directory structure and save ↵ | Matt Ettus | 2010-06-08 | 5 | -46/+2 |
| | | | | | | | | headaches | ||||
* | | Merge branch 'master' into u2p | Matt Ettus | 2010-06-08 | 2 | -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 build | Matt Ettus | 2010-06-07 | 1 | -1/+1 |
| | | |||||
| * | proper name for directory | Matt Ettus | 2010-06-07 | 1 | -1/+1 |
| | | |||||
| * | name build directory with ISE version name | Matt Ettus | 2010-06-07 | 1 | -1/+1 |
| | | |||||
* | | compiles now, added clock constraints | Matt Ettus | 2010-06-07 | 2 | -3/+43 |
| | | |||||
* | | works, leds on front count up. | Matt Ettus | 2010-06-07 | 1 | -341/+2 |
| | | |||||
* | | skeleton files copied over from a dead branch | Matt Ettus | 2010-06-07 | 9 | -374/+1728 |
|/ | |||||
* | non-udp uses a different address for the tx dsp core | Matt Ettus | 2010-05-27 | 1 | -1/+1 |
| | |||||
* | 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 | 2 | -0/+1138 |
| | | | | non-udp versions | ||||
* | 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 | 1 | -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 udp | Matt Ettus | 2010-05-18 | 1 | -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 width | Matt Ettus | 2010-05-18 | 1 | -8/+8 |
| | | |||||
* | | 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 |
| | | |||||
| * | 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 | ||||
| * | Merge branch 'master' into udp | Matt Ettus | 2010-05-11 | 1 | -1/+1 |
| |\ | |/ |/| | |||||
* | | remove port which is no longer there | Matt Ettus | 2010-05-11 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'corgan_fixes' into udp_corgan | Matt Ettus | 2010-04-26 | 3 | -4/+15 |
| |\ | |/ |/| | |||||
* | | 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 |
| | |