summaryrefslogtreecommitdiffstats
path: root/usrp2/top
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ise12' into packet_routerJosh Blum2010-12-107-30/+34
|\ | | | | | | | | | | Conflicts: usrp2/top/u2_rev3/Makefile usrp2/top/u2_rev3/u2_core.v
| * time sync on usrp2 as well, added debug pins to time sync.Matt Ettus2010-12-101-1/+5
| |
| * Only do udp now, renamed old ports to exp_time_*Matt Ettus2010-12-091-0/+0
| |
| * udp is now the defaultMatt Ettus2010-12-092-2/+2
| |
| * remove old raw ethernet versionMatt Ettus2010-12-092-882/+0
| |
| * reimplemented mimo time transfer to handle 64 bits. Still needsMatt Ettus2010-12-091-1/+2
| | | | | | | | to sync on the received side.
| * renamed exp_pps_* to be exp_time_*, which is the mimo synchronization signalMatt Ettus2010-12-095-22/+22
| |
| * u2plus: clock lock pin capitalization failNick Foster2010-12-062-2/+2
| |
* | packet_router: renamed top level files in an attempt to merge cleanlyJosh Blum2010-12-104-1091/+209
| |
* | packet_router: added status readback for mode, incremented compat numberJosh Blum2010-11-241-1/+1
| |
* | packet_router: program the dsp udp port and ip addr through setting registersJosh Blum2010-11-231-1/+1
| |
* | packet_router: moved udp tx proto machine into packet router, replaced ↵Josh Blum2010-11-231-16/+27
| | | | | | | | udp_wrapper in top level with some fifo conversion stuff
* | packet_router: implemented crossbar and valve module, moved sreg into router ↵Josh Blum2010-11-231-16/+7
| | | | | | | | module
* | packet_router: transplanted the async error interface, its now sent into the ↵Josh Blum2010-11-231-10/+5
| | | | | | | | packet router to be muxed to com out
* | packet_router: fixed sof bug for cpu (== 1), some logic tweaks, added debugJosh Blum2010-11-231-1/+3
| |
* | packet_router: registered control flags, added clear to all state machinesJosh Blum2010-11-231-2/+4
| |
* | packet_router: removed unused status words from readback muxJosh Blum2010-11-231-3/+3
| |
* | packet_router: fixed swapped connection typo, dsp tx routing worksJosh Blum2010-11-231-2/+3
| |
* | packet_router: added all input/output signals to module, created the comm ↵Josh Blum2010-11-231-0/+3
| | | | | | | | muxes (in and out)
* | packet_router: created inspector and added dsp output (however inspection ↵Josh Blum2010-11-231-0/+1
| | | | | | | | logic does not enable it yet)
* | packet_router: created nearly empty router with eth in attached to mapped memoryJosh Blum2010-11-231-19/+14
|/
* shouldn't be executableMatt Ettus2010-11-201-0/+0
|
* Add flow control and other small vrt fixes to u2p, minor cleanupsMatt Ettus2010-11-112-34/+38
|
* clear out the vita tx chain and the tx fifo. need to check the fifoMatt Ettus2010-11-111-11/+12
| | | | reset to make sure it is in the correct clock domain.
* added ability to truly clear out the entire rx chain. also removed old ↵Matt Ettus2010-11-111-3/+9
| | | | style fifo in rx.
* proper triggering for interrupts generated on the dsp_clkMatt Ettus2010-11-111-1/+8
|
* increase compatibility number for flow controlMatt Ettus2010-11-111-1/+1
|
* separated flow control and error reporting on tx path. should work with and ↵Matt Ettus2010-11-111-1/+2
| | | | without flow control
* Removed 'ifdef for second DCM that was a deign idea for external SRAM on ↵Ian Buckley2010-11-111-49/+4
| | | | | | u2plus. Hardcoded -90 degree clcok from first DCM as final solution
* 1) u2p has added a new signal from the SRAM to the pinout, RAM_ZZIan Buckley2010-11-112-2/+5
| | | | | | | | | | | | | | | which allows the SRAM to be placed in a sleep mode. This pin was erroniously pulled high at the top level rendering the SRAM unusable. 2) Added declaration for extramfifo debug bus which had got deleted at some point in the past 3) Created a debug bundle of signals from extsramfifo to help diagnose problem 1) 4) u2p Rev1 PCB ommits control of any of the SRAM chip selects. Made a code change so that control logic does not rely on the presence of this pin and ensuring that the SRAM is always placed in READ mode in any idle cycles.
* Defaulted all SRAM pins to LVCMOS25 8mA FASTIan Buckley2010-11-111-67/+67
|
* Placed 2nd DCM into `ifdef DCM_FOR_RAMCLK which is dissabled by defaultIan Buckley2010-11-112-7/+23
| | | | | Derived RAMCLK from 270degree offset of principle core DCM giving theoretical 2.5nS timing advance on RAM_CLK relative to RAM_* signals.
* Added external RAM FIFO to u2plus.Ian Buckley2010-11-114-7/+123
| | | | | | | | | | Added code branch to ext_fifo.v using generate that instantiates different input and out fifo's and touched nobl_fifo code so that it works at 18 and 36bit widths. Added 2nd DCM to top level to generate off chip RAMCLK. Added explicit I/O instances to top level for tristate drivers and changed signals to core as needed. Creted new FIFO's in core gen to replace much larger FIFO's used on u2rev3
* revert unneeded changes and incorrect commentsMatt Ettus2010-11-111-32/+32
|
* reconnect GPIOs, remove debug pins, meets timing nowMatt Ettus2010-11-111-5/+3
|
* Modified phase shift of DCM1 to -64 which is intended to give more timing ↵Ian Buckley2010-11-111-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-11-111-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-11-114-5/+100
| | | | | | | 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-11-111-1/+1
|
* Corrected extfifo code so that all registers that are on SRAM signals are ↵ianb2010-11-112-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-11-111-4/+5
|
* Regenerated FIFO with lower trigger level for almost full flag to reflect ↵Ian Buckley2010-11-111-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.
* External FIFO tested in simulation and on USRP2 from decimation 64->8 with ↵Ian Buckley2010-11-115-142/+201
| | | | | | | | 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 'u1e' into merge_u1eMatt Ettus2010-11-1019-0/+1381
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * u1e: (130 commits) invert led signals because they are active low duh allow for CS to rise before, at the same time, or after OE better debug pins watch the ethernet chip select on our debug bus fix timing issue on DAC outputs with rev 2. This puts the whole system on a 90 degree phase shift send all gpmc signals to mictor updated pins to match rev2, removed dip switch, etc. seems to compile ok. pins are different on rev2 fixed makefile to compile with our new system add register to tell host about compatibility level and which image we are using move declaration to make loopback compile no need for protocol headers since we're not doing ethernet match the signal names in this design debug pins cleanup properly integrate the new tx chain catch up with tx_policy attach run_tx and run_rx to leds connect atr delay the q channel to make the channels line up on the AD9862 ... Conflicts: usrp2/control_lib/Makefile.srcs
| * invert led signals because they are active lowMatt Ettus2010-11-091-1/+1
| |
| * duhMatt Ettus2010-11-041-1/+1
| |
| * better debug pinsMatt Ettus2010-09-232-7/+11
| |
| * watch the ethernet chip select on our debug busMatt Ettus2010-09-233-6/+8
| |
| * fix timing issue on DAC outputs with rev 2. This puts the whole system on a ↵Matt Ettus2010-09-212-50/+25
| | | | | | | | 90 degree phase shift
| * send all gpmc signals to mictorMatt Ettus2010-09-164-0/+201
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 01:33:22 +0000