summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ise12' into ise12_efifo_workMatt Ettus2010-08-1610-33/+180
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| |
| * remove warningsMatt Ettus2010-07-162-3/+3
| |
| * add mux and demux to buildMatt Ettus2010-07-151-0/+2
| |
| * mux multiple fifo streams into one. Allows priority or round robinMatt Ettus2010-07-151-0/+57
| |
| * split fifo into 2 streams based on first line in each packetMatt Ettus2010-07-151-0/+50
| |
| * Merge branch 'reload' into ise12Matt Ettus2010-07-154-22/+59
| |\ | | | | | | | | | | | | | | | | | | | | | * reload: 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
| | * fix to stop endless error packetsMatt Ettus2010-07-091-2/+2
| | |
| | * updated tests to match new featuresMatt Ettus2010-07-092-4/+9
| | |
| | * error packets are now valid Extension Context packetsMatt Ettus2010-07-081-11/+32
| | | | | | | | | | | | | | | | | | | | | 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 ctrlJosh Blum2010-07-051-5/+16
| | |
* | | Regenerated FIFO's for extfifo.Ian Buckley2010-08-1212-728/+19
| | | | | | | | | | | | | | | | | | | | | | | | There are problems with certain configurations it seems. It is important that the fifo_xlnx_512x36_2clk_18to36 is generated with the "almost_full" pin even though it is not used in the application. if this pin is omitted the FPGA image doesn't work correctly
* | | Edited FIFO instance to delete port that was not regenerated after ↵Ian Buckley2010-08-121-1/+0
| | | | | | | | | | | | reconfiguration
* | | Adding in files that probably didn;t exist in the ISE10.1 version of coregenIan Buckley2010-08-125-0/+808
| | |
* | | Bringing all coregen files checked in into syncIan Buckley2010-08-1210-137/+60
| | |
* | | Merge branch 'ise12_efifo_work' of git@ettus.sourcerepo.com:ettus/fpgapriv ↵Ian Buckley2010-08-1218-41/+587
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ise12_efifo_work Conflicts: usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.ngc usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.v usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.xco usrp2/coregen/fifo_xlnx_512x36_2clk_36to18.ngc Resolving conflicts by regenerating files clenly in ISE12.1 coregen
| * | | checkin of generated coregen filesMatt Ettus2010-08-1118-8/+556
| | | |
* | | | Found bug due to not accounting for the correct number of possible in flight ↵Ian Buckley2010-08-127-49/+113
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | READ operations that can be in the extfifo pipeline. Regenerated fifo_xlnx_512x36_2clk_18to36 to include prog_full output triggered at 1017 so that there are 6 empty spaces to accept in flight read data upon completion. Had to generate the FIFO using Coregen from ISE12.1 due to 10.1 verion not working correctly in FPGA Still have to tackle making this simulate in Icarus
* | | External FIFO tested in simulation and on USRP2 from decimation 64->8 with ↵Ian Buckley2010-07-3119-238/+7327
| | | | | | | | | | | | | | | | | | | | | | | | current head UHD code. Apparently operation is "flawless" but more regression and corner case regression could and should be done. Tristate drivers have been added at the top level of the hierarchy for the SRAM databus as is considered good practice for both Xilinx and ASIC design flows and so both top level and core fils have been touched.
* | | Checkpoint checkin.Ian Buckley2010-07-2913-0/+1507
| | | | | | | | | | | | | | | Loopback is running via the external ZBT SRAM...HOWEVER, its not running well, its stable but the data is corrupted sometimes. Not clear if its a logic or AC timing/SI issue yet.
* | | get it to buildMatt Ettus2010-07-145-5/+309
| | |
* | | moved forward from the old branchMatt Ettus2010-07-148-4/+876
|/ /
* | Merge branch 'ise12' of ettus.sourcerepo.com:ettus/fpgapriv into ise12Matt Ettus2010-07-120-0/+0
|\ \ | | | | | | | | | * 'ise12' of ettus.sourcerepo.com:ettus/fpgapriv:
| * | Merge branch 'master' into ise12Matt Ettus2010-07-051-4/+5
| |\| | | | | | | | | | | | | * master: fix bug which caused serdes fifo to disappear
* | | Merge branch 'master' into ise12Matt Ettus2010-07-121-4/+5
|\ \ \ | |/ / |/| / | |/ | | * master: fix bug which caused serdes fifo to disappear
| * fix bug which caused serdes fifo to disappearMatt Ettus2010-07-031-4/+5
| |
* | Merge branch 'master' into ise12Matt Ettus2010-06-181-1/+2
|\| | | | | | | | | * master: proper dependency tracking for the makefile
| * proper dependency tracking for the makefileMatt Ettus2010-06-181-1/+2
| |
* | precompute udp checksumsMatt Ettus2010-06-151-5/+14
| |
* | barely fails timing on gigE/10 and gigE/12, larger fail on udp/10, but allMatt Ettus2010-06-147-275/+390
|/ | | | seem to work ok
* new make works on ise12Matt Ettus2010-06-141-1/+7
|
* produces good bin filesMatt Ettus2010-06-114-57/+31
|
* first attempt at cleaning up the build systemMatt Ettus2010-06-1038-422/+583
|
* 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
* allow other clock rates in vita timeMatt Ettus2010-06-081-13/+15
|
* 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
|
* 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-273-0/+1321
| | | | non-udp versions
* ignore output filesMatt Ettus2010-05-271-0/+2
|
* new files from udp branch added to main MakefileMatt Ettus2010-05-271-1/+19
|
* Merge branch 'udp' into master_merge_take2Matt Ettus2010-05-2730-67/+2257
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * better test program for just the tx sideMatt Ettus2010-05-191-163/+63
| |
| * fix typo, no functionality differenceMatt Ettus2010-05-191-1/+1
| |
| * 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
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 19:40:03 +0000