Skip to content

Commit

Permalink
updating submodules and Rudp.vhd
Browse files Browse the repository at this point in the history
  • Loading branch information
ruck314 committed Jul 11, 2024
1 parent 643e74c commit b4f537b
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 12 deletions.
35 changes: 25 additions & 10 deletions firmware/common/rtl/Rudp.vhd
Original file line number Diff line number Diff line change
Expand Up @@ -312,18 +312,33 @@ begin
-- Xilinx Virtual Cable (XVC)
-- https://www.xilinx.com/products/intellectual-property/xvc.html
-----------------------------------------------------------------
U_XVC : entity surf.UdpDebugBridgeWrapper
-- U_XVC : entity surf.UdpDebugBridgeWrapper
-- generic map (
-- TPD_G => TPD_G)
-- port map (
-- -- Clock and Reset
-- clk => ethClk,
-- rst => ethRst,
-- -- UDP XVC Interface
-- obServerMaster => obServerMasters(UDP_SRV_XVC_IDX_C),
-- obServerSlave => obServerSlaves(UDP_SRV_XVC_IDX_C),
-- ibServerMaster => ibServerMasters(UDP_SRV_XVC_IDX_C),
-- ibServerSlave => ibServerSlaves(UDP_SRV_XVC_IDX_C));
U_DmaXvcWrapper : entity surf.DmaXvcWrapper -- Using this project to regression test DmaXvcWrapper, we could of just used UdpDebugBridgeWrapper directly (see above) for this UDP application instead
generic map (
TPD_G => TPD_G)
TPD_G => TPD_G,
DMA_AXIS_CONFIG_G => EMAC_AXIS_CONFIG_C)
port map (
-- Clock and Reset
clk => ethClk,
rst => ethRst,
-- UDP XVC Interface
obServerMaster => obServerMasters(UDP_SRV_XVC_IDX_C),
obServerSlave => obServerSlaves(UDP_SRV_XVC_IDX_C),
ibServerMaster => ibServerMasters(UDP_SRV_XVC_IDX_C),
ibServerSlave => ibServerSlaves(UDP_SRV_XVC_IDX_C));
-- 156.25MHz XVC Clock/Reset (xvcClk156 domain)
xvcClk156 => ethClk,
xvcRst156 => ethRst,
-- DMA Interface (dmaClk domain)
dmaClk => ethClk,
dmaRst => ethRst,
dmaObMaster => obServerMasters(UDP_SRV_XVC_IDX_C),
dmaObSlave => obServerSlaves(UDP_SRV_XVC_IDX_C),
dmaIbMaster => ibServerMasters(UDP_SRV_XVC_IDX_C),
dmaIbSlave => ibServerSlaves(UDP_SRV_XVC_IDX_C));

GEN_VEC :
for i in 0 to 1 generate
Expand Down
2 changes: 1 addition & 1 deletion firmware/submodules/surf
Submodule surf updated 85 files
+4 −0 .github/workflows/surf_ci.yml
+1 −0 .gitignore
+22 −0 CPPLINT.cfg
+60 −21 axi/axi-stream/rtl/AxiStreamRingBuffer.vhd
+170 −180 axi/simlink/src/RogueSideBand.c
+15 −20 axi/simlink/src/RogueSideBand.h
+313 −320 axi/simlink/src/RogueTcpMemory.c
+41 −44 axi/simlink/src/RogueTcpMemory.h
+336 −345 axi/simlink/src/RogueTcpStream.c
+23 −26 axi/simlink/src/RogueTcpStream.h
+177 −201 axi/simlink/src/VhpiGeneric.c
+26 −45 axi/simlink/src/VhpiGeneric.h
+0 −235 base/general/simlink/src/VhpiGeneric.c
+0 −80 base/general/simlink/src/VhpiGeneric.h
+74 −0 devices/AnalogDevices/ad5541/rtl/AxiAd5541Core.vhd
+5 −0 devices/AnalogDevices/ad5541/ruckus.tcl
+91 −92 ethernet/EthMacCore/src/send_pause.cpp
+1 −0 pip_requirements.txt
+0 −419 protocols/jtag/README.md
+0 −43 protocols/jtag/xvcSrv/src/Makefile
+0 −92 protocols/jtag/xvcSrv/src/mmioHelper.h
+0 −236 protocols/jtag/xvcSrv/src/xvcConn.cc
+0 −64 protocols/jtag/xvcSrv/src/xvcConn.h
+0 −343 protocols/jtag/xvcSrv/src/xvcDriver.h
+0 −221 protocols/jtag/xvcSrv/src/xvcDrvAxisFifo.cc
+0 −79 protocols/jtag/xvcSrv/src/xvcDrvAxisFifo.h
+0 −344 protocols/jtag/xvcSrv/src/xvcDrvLoopBack.cc
+0 −94 protocols/jtag/xvcSrv/src/xvcDrvLoopBack.h
+0 −225 protocols/jtag/xvcSrv/src/xvcDrvUdp.cc
+0 −54 protocols/jtag/xvcSrv/src/xvcDrvUdp.h
+0 −673 protocols/jtag/xvcSrv/src/xvcSrv.cc
+0 −47 protocols/jtag/xvcSrv/src/xvcSrv.h
+0 −30 protocols/jtag/xvcSrv/test/Makefile
+0 −136 protocols/jtag/xvcSrv/test/test.py
+0 −115,124 protocols/jtag/xvcSrv/test/testData.txt
+1 −0 protocols/pgp/ruckus.tcl
+0 −0 protocols/pgp/shared/xilinx/PgpXvcWrapper.vhd
+1 −1 protocols/sugoi/rtl/SugoiSubordinateCore.vhd
+4 −1 protocols/sugoi/rtl/SugoiSubordinateFsm.vhd
+52 −68 protocols/xvc-udp/rtl/DmaXvcWrapper.vhd
+8 −4 protocols/xvc-udp/rtl/UdpDebugBridgeWrapper.vhd
+5 −0 python/surf/axi/_AxiLiteMasterProxy.py
+1 −1 python/surf/axi/_AxiStreamDmaFifo.py
+2 −2 python/surf/axi/_AxiStreamMonAxiL.py
+65 −52 python/surf/devices/amphenol/_LeapXcvrLowerPage.py
+21 −9 python/surf/devices/amphenol/_LeapXcvrUpperPages.py
+11 −116 python/surf/devices/analog_devices/_Ad5541.py
+1 −0 python/surf/devices/analog_devices/__init__.py
+13 −7 python/surf/devices/linear/_Ltc4151.py
+1 −0 python/surf/devices/micron/_AxiMicronMt28ew.py
+1 −0 python/surf/devices/micron/_AxiMicronN25Q.py
+1 −0 python/surf/devices/micron/_AxiMicronP30.py
+7 −7 python/surf/devices/nxp/_Sa56004x.py
+2 −1 python/surf/devices/silabs/_Si5324.py
+2 −1 python/surf/devices/silabs/_Si5326.py
+1 −1 python/surf/devices/silabs/_Si5345Lite.py
+1 −0 python/surf/devices/silabs/_Si5345Pages.py
+1 −1 python/surf/devices/silabs/_Si5394Lite.py
+16 −15 python/surf/devices/ti/_Ina237.py
+1 −0 python/surf/devices/ti/_Lmx2594.py
+1 −0 python/surf/devices/ti/_Lmx2615.py
+7 −7 python/surf/devices/ti/_Tmp461.py
+2 −2 python/surf/devices/ti/_UCD92xx.py
+53 −46 python/surf/devices/transceivers/__init__.py
+6 −6 python/surf/ethernet/udp/__init__.py
+4 −4 python/surf/protocols/coaxpress/_CoaXPressAxiL.py
+5 −5 python/surf/protocols/i2c/__init__.py
+2 −2 python/surf/protocols/pgp/_Pgp2bAxi.py
+2 −2 python/surf/protocols/pgp/_Pgp2fcAxi.py
+1 −1 python/surf/protocols/pgp/_Pgp3AxiL.py
+1 −1 python/surf/protocols/pgp/_Pgp4AxiL.py
+4 −4 python/surf/protocols/ssi/_SsiPrbsRateGen.py
+3 −3 python/surf/protocols/ssi/_SsiPrbsRx.py
+1 −0 python/surf/protocols/sugoi/_SugoiAxiLitePixelMatrixConfig.py
+29 −24 python/surf/xilinx/_AxiPciePhy.py
+12 −12 python/surf/xilinx/_AxiSysMonUltraScale.py
+3 −3 python/surf/xilinx/_GtRxAlignCheck.py
+19 −16 python/surf/xilinx/_RfBlock.py
+18 −7 python/surf/xilinx/_SpiPs.py
+10 −20 python/surf/xilinx/_Xadc.py
+285 −0 scripts/rssi_network_analyzer.py
+180 −199 xilinx/general/sdk/common/printf.c
+3 −8 xilinx/general/sdk/common/printf.h
+50 −53 xilinx/general/sdk/common/ssi_printf.c
+10 −9 xilinx/general/sdk/common/ssi_printf.h

0 comments on commit b4f537b

Please sign in to comment.