summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'features' into ise12_efifo_mergeMatt Ettus2010-08-162-3/+6
|\ | | | | | | | | | | * features: added compat number to usrp2 readback mux makefile dependency fix for second expansion
| * added compat number to usrp2 readback muxJosh Blum2010-08-091-2/+5
| |
| * makefile dependency fix for second expansionJosh Blum2010-08-091-1/+1
| |
* | Matt's attempt at mergingMatt Ettus2010-08-1610-5569/+306
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tx_policy' into ise12_efifo_work * tx_policy: rx error context packets should not be marked as errors in the fifo provide a way to get out of the error state without processor intervention sequence number reset upon programming streamid attempt at avoiding infinite error messages implemented "next packet" and "next burst" policies sequence errors can happen on start of burst as well. more informative error codes cleaner error handling introduce new error types test mux and gen_context_pkt this is an output file, it shouldn't be checked in insert protocol engine flags when requested move the streamid so it isn't at the same address as clear_state connect the demux fix a typo tx error packets now muxed into the ethernet stream back to the host checkpoint. New context packet generator to report underruns and other errors Conflicts: usrp2/top/u2_rev3/u2_core_udp.v
| * | rx error context packets should not be marked as errors in the fifoMatt Ettus2010-08-111-1/+1
| |/
| * provide a way to get out of the error state without processor interventionMatt Ettus2010-07-291-1/+4
| |
| * sequence number reset upon programming streamidMatt Ettus2010-07-282-5/+11
| |
| * attempt at avoiding infinite error messagesMatt Ettus2010-07-281-5/+14
| |
| * implemented "next packet" and "next burst" policiesMatt Ettus2010-07-283-24/+50
| |
| * sequence errors can happen on start of burst as well.Matt Ettus2010-07-281-1/+1
| |
| * more informative error codesMatt Ettus2010-07-282-6/+8
| |
| * cleaner error handlingMatt Ettus2010-07-281-27/+28
| |
| * introduce new error typesMatt Ettus2010-07-283-34/+80
| |
| * test mux and gen_context_pktMatt Ettus2010-07-281-3/+22
| |
| * this is an output file, it shouldn't be checked inMatt Ettus2010-07-281-5506/+0
| |
| * insert protocol engine flags when requestedMatt Ettus2010-07-281-2/+6
| |
| * move the streamid so it isn't at the same address as clear_stateMatt Ettus2010-07-282-2/+2
| |
| * connect the demuxMatt Ettus2010-07-281-1/+1
| |
| * fix a typoMatt Ettus2010-07-283-4/+4
| |
| * tx error packets now muxed into the ethernet stream back to the hostMatt Ettus2010-07-284-47/+66
| |
| * checkpoint. New context packet generator to report underruns and other errorsMatt Ettus2010-07-282-0/+107
| |
* | 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
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 00:30:56 +0000