From: Adrian Weber Date: Mon, 29 Nov 2021 12:00:16 +0000 (+0100) Subject: fix of dummy assignment in regio bus handler of slowcontrol hub X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=b57cf496d157a79193cac3ec71ffa6769b8052ba;p=cri.git fix of dummy assignment in regio bus handler of slowcontrol hub --- diff --git a/src/hub/trb_net16_cri_hub_slwcntrl.vhd b/src/hub/trb_net16_cri_hub_slwcntrl.vhd index 03cbbfa..f6c59b6 100644 --- a/src/hub/trb_net16_cri_hub_slwcntrl.vhd +++ b/src/hub/trb_net16_cri_hub_slwcntrl.vhd @@ -243,7 +243,7 @@ architecture trb_net16_cri_hub_slwcntrl_arch of trb_net16_cri_hub_slwcntrl is signal HUB_CTRL_LOCAL_NETWORK_RESET : std_logic_vector(MII_NUMBER-1 downto 0); signal CTRL_REG_STROBE : std_logic_vector (2**4-1 downto 0); - signal dummy : std_logic_vector(270 downto 0); + signal dummy : std_logic_vector(272 downto 0); signal tmp_buf_to_hub_REPLY_DATA_ctrl : std_logic_vector(15 downto 0); signal global_time : std_logic_vector(31 downto 0); @@ -562,14 +562,14 @@ THE_BUS_HANDLER : trb_net16_regio_bus_handler BUS_ADDR_OUT(20 downto 16) => stat_packets_addr, BUS_ADDR_OUT(31 downto 21) => dummy(10 downto 0), BUS_ADDR_OUT(35 downto 32) => stat_errorbits_addr, - BUS_ADDR_OUT(47 downto 36) => dummy(21 downto 10), + BUS_ADDR_OUT(47 downto 36) => dummy(22 downto 11), BUS_ADDR_OUT(51 downto 48) => stat_busycntincl_addr, - BUS_ADDR_OUT(63 downto 52) => dummy(33 downto 22), + BUS_ADDR_OUT(63 downto 52) => dummy(34 downto 23), BUS_ADDR_OUT(67 downto 64) => stat_busycntexcl_addr, - BUS_ADDR_OUT(79 downto 68) => dummy(44 downto 33), - BUS_ADDR_OUT(95 downto 80) => dummy(60 downto 45), + BUS_ADDR_OUT(79 downto 68) => dummy(46 downto 35), + BUS_ADDR_OUT(95 downto 80) => dummy(62 downto 47), BUS_ADDR_OUT(99 downto 96) => lsm_addr, - BUS_ADDR_OUT(111 downto 100) => dummy(72 downto 61), + BUS_ADDR_OUT(111 downto 100) => dummy(74 downto 63), BUS_DATA_IN(31 downto 0) => REGIO_DATA_IN, BUS_DATA_IN(63 downto 32) => stat_packets_data, BUS_DATA_IN(95 downto 64) => stat_errorbits_data, @@ -578,12 +578,12 @@ THE_BUS_HANDLER : trb_net16_regio_bus_handler BUS_DATA_IN(191 downto 160) => global_time, BUS_DATA_IN(223 downto 192) => lsm_data, BUS_DATA_OUT(31 downto 0) => REGIO_DATA_OUT, - BUS_DATA_OUT(63 downto 32) => dummy(104 downto 73), - BUS_DATA_OUT(95 downto 64) => dummy(136 downto 105), - BUS_DATA_OUT(127 downto 96) => dummy(168 downto 137), - BUS_DATA_OUT(159 downto 128) => dummy(200 downto 169), - BUS_DATA_OUT(191 downto 160) => dummy(232 downto 201), - BUS_DATA_OUT(223 downto 192) => dummy(264 downto 233), + BUS_DATA_OUT(63 downto 32) => dummy(106 downto 75), + BUS_DATA_OUT(95 downto 64) => dummy(138 downto 107), + BUS_DATA_OUT(127 downto 96) => dummy(170 downto 139), + BUS_DATA_OUT(159 downto 128) => dummy(202 downto 171), + BUS_DATA_OUT(191 downto 160) => dummy(234 downto 203), + BUS_DATA_OUT(223 downto 192) => dummy(266 downto 235), BUS_DATAREADY_IN(0) => REGIO_DATAREADY_IN, BUS_DATAREADY_IN(1) => stat_packets_ready, BUS_DATAREADY_IN(2) => stat_errorbits_ready, @@ -606,12 +606,12 @@ THE_BUS_HANDLER : trb_net16_regio_bus_handler BUS_READ_ENABLE_OUT(5) => stat_globaltime_read, BUS_READ_ENABLE_OUT(6) => lsm_read, BUS_TIMEOUT_OUT(0) => REGIO_TIMEOUT_OUT, - BUS_TIMEOUT_OUT(1) => dummy(265), - BUS_TIMEOUT_OUT(2) => dummy(266), - BUS_TIMEOUT_OUT(3) => dummy(267), - BUS_TIMEOUT_OUT(4) => dummy(268), - BUS_TIMEOUT_OUT(5) => dummy(269), - BUS_TIMEOUT_OUT(6) => dummy(270), + BUS_TIMEOUT_OUT(1) => dummy(267), + BUS_TIMEOUT_OUT(2) => dummy(268), + BUS_TIMEOUT_OUT(3) => dummy(269), + BUS_TIMEOUT_OUT(4) => dummy(270), + BUS_TIMEOUT_OUT(5) => dummy(271), + BUS_TIMEOUT_OUT(6) => dummy(272), BUS_UNKNOWN_ADDR_IN(0) => REGIO_UNKNOWN_ADDR_IN, BUS_UNKNOWN_ADDR_IN(1) => stat_packets_unknown, BUS_UNKNOWN_ADDR_IN(2) => stat_packets_unknown,