8000 Release Candidate v2.59.2 by ruck314 · Pull Request #1281 · slaclab/surf · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Release Candidate v2.59.2 #1281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Release Candidate v2.59.2 #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f547af7
UDP Tx Engine: Fix inferred latch
ruck314 May 17, 2025
b6c7169
Merge pull request #1280 from slaclab/remove-udp-latch
ruck314 May 19, 2025
a2c8785
Create dummy register to trick emacs vhdl-update-sensitivity-list int…
bengineerd May 19, 2025 8000
80dcb1e
removing AxiStreamDepacketizer2.vhd from exclude list
ruck314 May 19, 2025
2587666
Merge pull request #1282 from slaclab/sensitivity-list-fix
ruck314 May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ethernet/UdpEngine/rtl/UdpEngineTx.vhd
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ architecture rtl of UdpEngineTx is
chPntr : natural range 0 to SIZE_G-1;
index : natural range 0 to SIZE_G-1;
arpPos : Slv8Array(SIZE_G-1 downto 0);
arpTabPos : Slv8Array(SIZE_G-1 downto 0);
obDhcpSlave : AxiStreamSlaveType;
ibSlaves : AxiStreamSlaveArray(SIZE_G-1 downto 0);
txMaster : AxiStreamMasterType;
Expand All @@ -95,6 +96,7 @@ architecture rtl of UdpEngineTx is
chPntr => 0,
index => 0,
arpPos => (others => (others => '0')),
arpTabPos => (others => (others => '0')),
obDhcpSlave => AXI_STREAM_SLAVE_INIT_C,
ibSlaves => (others => AXI_STREAM_SLAVE_INIT_C),
txMaster => AXI_STREAM_MASTER_INIT_C,
Expand All @@ -114,8 +116,7 @@ begin
comb : process (arpTabFound, arpTabIpAddr, arpTabMacAddr, ibMasters,
localIp, localMac, obDhcpMaster, r, remoteIp, remoteMac,
remotePort, rst, txSlave) is
variable v : RegType;
variable arpPosV : Slv8Array(SIZE_G-1 downto 0);
variable v : RegType;
begin
-- Latch the current value
v := r;
Expand Down Expand Up @@ -204,14 +205,14 @@ begin
v.ibSlaves(r.index).tReady := '1';
end if;
else
v.chPntr := r.index;
arpPosV(r.index) := ibMasters(r.index).tDest;
v.state := ACC_ARP_TAB_S;
v.chPntr := r.index;
v.arpTabPos(r.index) := ibMasters(r.index).tDest;
v.state := ACC_ARP_TAB_S;
end if;
end if;
-----------------------------------------------------------------------
when ACC_ARP_TAB_S =>
arpPosV(r.chPntr) := ibMasters(r.chPntr).tDest;
v.arpTabPos(r.chPntr) := ibMasters(r.chPntr).tDest;
if arpTabFound(r.chPntr) = '0' then
v.linkUp(r.chPntr) := '0';
-- Blow off the data..
Expand Down Expand Up @@ -444,7 +445,7 @@ begin
obDhcpSlave <= v.obDhcpSlave;
txMaster <= r.txMaster;
linkUp <= r.linkUp;
arpTabPos <= arpPosV;
arpTabPos <= v.arpTabPos;

-- Reset
if (rst = '1') then
Expand Down
9 changes: 7 additions & 2 deletions protocols/packetizer/rtl/AxiStreamDepacketizer2.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ architecture rtl of AxiStreamDepacketizer2 is
crcDataWidth : slv(2 downto 0);
crcInit : slv(31 downto 0);
crcReset : sl;
crcOut : slv(31 downto 0);
linkGoodDly : sl;
rdLat : natural range 0 to 2;
debug : Packetizer2DebugType;
Expand All @@ -110,6 +111,7 @@ architecture rtl of AxiStreamDepacketizer2 is
crcDataWidth => (others => '1'),
F4FC crcInit => (others => '1'),
crcReset => '1',
crcOut => (others => '0'),
linkGoodDly => '0',
rdLat => 2,
debug => PACKETIZER2_DEBUG_INIT_C,
Expand Down Expand Up @@ -272,8 +274,8 @@ begin

end generate;

comb : process (crcOut, inputAxisMaster, linkGood, outputAxisSlave, r, ramCrcRem, ramPacketActiveOut,
ramPacketSeqOut, ramSentEofeOut) is
comb : process (crcOut, inputAxisMaster, linkGood, outputAxisSlave, r, ramCrcRem,
ramPacketActiveOut, ramPacketSeqOut, ramSentEofeOut) is
variable v : RegType;
variable sof : sl;
variable lastBytes : integer;
Expand Down Expand Up @@ -347,6 +349,9 @@ begin
v.crcReset := '0';
v.crcDataWidth := "111"; -- 64-bit transfer

-- Register crcOut in case we need it.
v.crcOut := crcOut;

-- Reset tready by default
v.inputAxisSlave.tready := '0';

Expand Down
3 changes: 0 additions & 3 deletions scripts/emacs_beautify_all_vhdl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ while IFS= read -r file; do EXCLUDE_FILES+=("$file"); done < <(find "$SCRIPT_DIR
while IFS= read -r file; do EXCLUDE_FILES+=("$file"); done < <(find "$SCRIPT_DIR/../protocols/i2c/rtl/stdlib.vhd" -type f -name "*.vhd")
while IFS= read -r file; do EXCLUDE_FILES+=("$file"); done < <(find "$SCRIPT_DIR/../protocols/i2c/rtl/orig" -type f -name "*.vhd")

# Manually add a specific file to the exclude list
EXCLUDE_FILES+=("$SCRIPT_DIR/../protocols/packetizer/rtl/AxiStreamDepacketizer2.vhd")

# Build a lookup table using associative array
declare -A EXCLUDE_MAP
for file in "${EXCLUDE_FILES[@]}"; do
Expand Down
0