summaryrefslogtreecommitdiffstats
path: root/usrp2/top
Commit message (Collapse)AuthorAgeFilesLines
* proper triggering for interrupts generated on the dsp_clkMatt Ettus2010-10-121-1/+8
|
* increase compatibility number for flow controlMatt Ettus2010-10-111-1/+1
|
* separated flow control and error reporting on tx path. should work with and ↵Matt Ettus2010-10-101-1/+2
| | | | without flow control
* revert unneeded changes and incorrect commentsMatt Ettus2010-10-071-32/+32
|
* reconnect GPIOs, remove debug pins, meets timing nowMatt Ettus2010-10-061-5/+3
|
* Merge branch 'ise12' into efifo_merge_dcmMatt Ettus2010-10-062-7/+10
|\ | | | | | | | | | | | | * ise12: fix timing problem on DAC output bus clean up DAC inversion and swapping to match schematics Clean up iq swapping on RX. It is now swapped in the top level. widened muxes to 4 bits to match tx side and handle more ADCs in future
| * fix timing problem on DAC output busMatt Ettus2010-10-011-2/+2
| |
| * clean up DAC inversion and swapping to match schematicsMatt Ettus2010-08-251-3/+6
| |
| * Clean up iq swapping on RX. It is now swapped in the top level.Matt Ettus2010-08-252-5/+5
| | | | | | | | widened muxes to 4 bits to match tx side and handle more ADCs in future
* | Modified phase shift of DCM1 to -64 which is intended to give more timing ↵Ian Buckley2010-09-301-1/+1
| | | | | | | | | | | | | | margin on reads from the SRAM at the expense of Writes to the SRAM. Tested to be at least as stable as a phase shift of 12 and beter looking timing on the logic analyzer. Signals driven by the FPGA are observed changing on the SRAM pins about 4 nS after the rising edge of the RAM clock.
* | Enabled phase offset adjustment on DCM_INST1 which drives the external Fast ↵Ian Buckley2010-09-141-12/+12
| | | | | | | | | | | | | | | | SRAM clock. Set phase shift to -12 after experimentation using logic analyzer to see results. This value gives near optimum 1.5nS setup times on the source sync signals FPGA -> SRAM under lab conditions.
* | Added to DCM's and some BUFG's to align the internal 125MHz clock edge with ↵Ian Buckley2010-09-014-5/+101
| | | | | | | | | | | | | | its presentation externally at the NoBL SRAM. Since we don't have a board level trace to use to estimate clock propigation delay we just loop through the I/O on the FPGA. This hasn't been verified as working on a USRP2 yet.
* | hangedddddddextrnal fifo size to use full NoBL SRAMianb2010-08-251-1/+1
| |
* | Corrected extfifo code so that all registers that are on SRAM signals are ↵ianb2010-08-252-37/+42
| | | | | | | | | | | | | | | | packed into IOBs Explcit drives and skews added to GPIO pins Corrected minor error in FIFO logic that showed data avail internally incorrectly
* | Added a bunch of debug signals.Ian Buckley2010-08-191-4/+5
| |
* | Merge branch 'ise12_efifo_work' into efifo_mergeMatt Ettus2010-08-191-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | * ise12_efifo_work: Regenerated FIFO with lower trigger level for almost full flag to reflect logic removed from nobl_fifo. Conflicts: usrp2/vrt/vita_tx_deframer.v
| * | Regenerated FIFO with lower trigger level for almost full flag to reflect ↵Ian Buckley2010-08-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logic removed from nobl_fifo. Improved ext_fifo_tb further, try to simulate more combinations of decomation rates and packet arrival patterns. Strip out the logic in nobl_fifo that made it look like a Xilinx fall-through FIFO...it is now very simple logic but a propriatory interface that exposes the high inetrnal latency of reads. Allow the USED size of the external FIFO to be parameterized from the core level. Currently set at only 256 Corrected a bug in vita_tx_deframer.v that can write to a FIFO when its full causing illegal state. Made further edits that are currently commented becuase simulation indicates they cause problems, however suspect a further bug is in this code.
* | | 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-161-27/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | connect the demuxMatt Ettus2010-07-281-1/+1
| | |
| * | fix a typoMatt Ettus2010-07-281-1/+1
| | |
| * | tx error packets now muxed into the ethernet stream back to the hostMatt Ettus2010-07-281-27/+22
| | |
* | | Merge branch 'ise12' into ise12_efifo_workMatt Ettus2010-08-161-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
| |
* | External FIFO tested in simulation and on USRP2 from decimation 64->8 with ↵Ian Buckley2010-07-315-140/+227
|/ | | | | | | | 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.
* 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
| |
* | 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
* 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-104-414/+149
|
* 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
* 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-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
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 17:52:20 +0000