From ebb18961903a2bf0f30d5c08dbefe9ae7773718b Mon Sep 17 00:00:00 2001 From: donker <donker@astron.nl> Date: Wed, 3 Apr 2024 08:58:17 +0200 Subject: [PATCH] L2SDP-1030, 1e run --- .../libraries/rdma_packetiser/src/vhdl/rdma_packetiser_pkg.vhd | 2 +- .../avs2_eth_coe_10/sim/common_pkg.vhd | 2 +- .../avs2_eth_coe_10/synth/common_pkg.vhd | 2 +- .../avs2_eth_coe_10/sim/common_pkg.vhd | 2 +- .../avs2_eth_coe_10/synth/common_pkg.vhd | 2 +- libraries/base/common/src/vhdl/common_field_pkg.vhd | 2 +- libraries/base/common/src/vhdl/common_pkg.vhd | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/applications/rdma_demo/libraries/rdma_packetiser/src/vhdl/rdma_packetiser_pkg.vhd b/applications/rdma_demo/libraries/rdma_packetiser/src/vhdl/rdma_packetiser_pkg.vhd index e2c6d16f5e..9ef5d771ed 100644 --- a/applications/rdma_demo/libraries/rdma_packetiser/src/vhdl/rdma_packetiser_pkg.vhd +++ b/applications/rdma_demo/libraries/rdma_packetiser/src/vhdl/rdma_packetiser_pkg.vhd @@ -148,7 +148,7 @@ package rdma_packetiser_pkg is -- ETH header -- Handeled seperate from the other headers as the ethernet header must be excluded from the icrc checksum computation. - constant c_rdma_packetiser_eth_hdr_nof_fields : natural := 3 ; + constant c_rdma_packetiser_eth_hdr_nof_fields : natural := 3; constant c_rdma_packetiser_eth_hdr_field_sel : std_logic_vector(c_rdma_packetiser_eth_hdr_nof_fields - 1 downto 0) := (others => '0'); constant c_rdma_packetiser_eth_hdr_field_arr : t_common_field_arr( diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd index 4bd7e15cc8..84f51e5b77 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd @@ -1264,7 +1264,7 @@ package body common_pkg is end; -- sel_n : string - function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a ; else return b; end if; end; + function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a; else return b; end if; end; function sel_n(sel : natural; a, b, c : string) return string is begin if sel < 2 then return sel_n(sel, a, b ); else return c; end if; end; function sel_n(sel : natural; a, b, c, d : string) return string is begin if sel < 3 then return sel_n(sel, a, b, c ); else return d; end if; end; function sel_n(sel : natural; a, b, c, d, e : string) return string is begin if sel < 4 then return sel_n(sel, a, b, c, d ); else return e; end if; end; diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd index 4bd7e15cc8..84f51e5b77 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd @@ -1264,7 +1264,7 @@ package body common_pkg is end; -- sel_n : string - function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a ; else return b; end if; end; + function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a; else return b; end if; end; function sel_n(sel : natural; a, b, c : string) return string is begin if sel < 2 then return sel_n(sel, a, b ); else return c; end if; end; function sel_n(sel : natural; a, b, c, d : string) return string is begin if sel < 3 then return sel_n(sel, a, b, c ); else return d; end if; end; function sel_n(sel : natural; a, b, c, d, e : string) return string is begin if sel < 4 then return sel_n(sel, a, b, c, d ); else return e; end if; end; diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd index 4bd7e15cc8..84f51e5b77 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd @@ -1264,7 +1264,7 @@ package body common_pkg is end; -- sel_n : string - function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a ; else return b; end if; end; + function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a; else return b; end if; end; function sel_n(sel : natural; a, b, c : string) return string is begin if sel < 2 then return sel_n(sel, a, b ); else return c; end if; end; function sel_n(sel : natural; a, b, c, d : string) return string is begin if sel < 3 then return sel_n(sel, a, b, c ); else return d; end if; end; function sel_n(sel : natural; a, b, c, d, e : string) return string is begin if sel < 4 then return sel_n(sel, a, b, c, d ); else return e; end if; end; diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd index 4bd7e15cc8..84f51e5b77 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd @@ -1264,7 +1264,7 @@ package body common_pkg is end; -- sel_n : string - function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a ; else return b; end if; end; + function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a; else return b; end if; end; function sel_n(sel : natural; a, b, c : string) return string is begin if sel < 2 then return sel_n(sel, a, b ); else return c; end if; end; function sel_n(sel : natural; a, b, c, d : string) return string is begin if sel < 3 then return sel_n(sel, a, b, c ); else return d; end if; end; function sel_n(sel : natural; a, b, c, d, e : string) return string is begin if sel < 4 then return sel_n(sel, a, b, c, d ); else return e; end if; end; diff --git a/libraries/base/common/src/vhdl/common_field_pkg.vhd b/libraries/base/common/src/vhdl/common_field_pkg.vhd index 135a3cbfe4..c1dc41df9d 100644 --- a/libraries/base/common/src/vhdl/common_field_pkg.vhd +++ b/libraries/base/common/src/vhdl/common_field_pkg.vhd @@ -69,7 +69,7 @@ package common_field_pkg is function field_slv_in_len (field_arr : t_common_field_arr ) return natural; function field_slv_out_len (field_arr : t_common_field_arr ) return natural; function field_nof_words (field_arr : t_common_field_arr; word_w : natural ) return natural; - function field_map_in (field_arr : t_common_field_arr; slv : std_logic_vector; word_w : natural ; mode : string) return std_logic_vector; -- returns word_arr + function field_map_in (field_arr : t_common_field_arr; slv : std_logic_vector; word_w : natural; mode : string) return std_logic_vector; -- returns word_arr function field_map_out (field_arr : t_common_field_arr; word_arr : std_logic_vector; word_w : natural ) return std_logic_vector; -- returns slv_out function field_map (field_arr : t_common_field_arr; word_arr_in: std_logic_vector; word_arr_out: std_logic_vector; word_w : natural) return std_logic_vector; -- returns word_arr diff --git a/libraries/base/common/src/vhdl/common_pkg.vhd b/libraries/base/common/src/vhdl/common_pkg.vhd index 90462168da..a45d79b3fc 100644 --- a/libraries/base/common/src/vhdl/common_pkg.vhd +++ b/libraries/base/common/src/vhdl/common_pkg.vhd @@ -1582,7 +1582,7 @@ package body common_pkg is end; -- sel_n : string - function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a ; else return b; end if; end; + function sel_n(sel : natural; a, b : string) return string is begin if sel = 0 then return a; else return b; end if; end; function sel_n(sel : natural; a, b, c : string) return string is begin if sel < 2 then return sel_n(sel, a, b ); else return c; end if; end; function sel_n(sel : natural; a, b, c, d : string) return string is begin if sel < 3 then return sel_n(sel, a, b, c ); else return d; end if; end; function sel_n(sel : natural; a, b, c, d, e : string) return string is begin if sel < 4 then return sel_n(sel, a, b, c, d ); else return e; end if; end; -- GitLab