From 3facc09b682d6f3cb6413da258491772fd0b0121 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Fri, 30 Aug 2019 14:28:12 +0200 Subject: [PATCH] =?utf8?q?apply=20patches=20bei=20Thomas=20Ge=C3=9Fler=20-?= =?utf8?q?=20syntax=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- trb_net16_hub_streaming_port_sctrl_cts.vhd | 10 ++++++++-- trb_net_std.vhd | 13 ------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/trb_net16_hub_streaming_port_sctrl_cts.vhd b/trb_net16_hub_streaming_port_sctrl_cts.vhd index c56259f..eb1a970 100644 --- a/trb_net16_hub_streaming_port_sctrl_cts.vhd +++ b/trb_net16_hub_streaming_port_sctrl_cts.vhd @@ -375,8 +375,14 @@ signal info_registers : std_logic_vector_array_32(0 to 4); signal info_rx : CTRLBUS_RX; signal info_tx : CTRLBUS_TX; +signal info_tx_ack_or_info_tx_rack : std_logic; +signal info_tx_ack_or_info_tx_wack : std_logic; + begin +info_tx_ack_or_info_tx_rack <= info_tx.ack or info_tx.rack; +info_tx_ack_or_info_tx_wack <= info_tx.ack or info_tx.wack; + --------------------------------------------------------------------- -- Reset --------------------------------------------------------------------- @@ -1120,14 +1126,14 @@ COMMON_STAT_REGS <= common_stat; BUS_DATA_IN(223 downto 192)=> stat_buffer_i, BUS_DATAREADY_IN(0) => REGIO_DATAREADY_IN, BUS_DATAREADY_IN(1) => dbuf_dataready, - BUS_DATAREADY_IN(2) => info_tx.ack or info_tx.rack,--tbuf_dataready, + BUS_DATAREADY_IN(2) => info_tx_ack_or_info_tx_rack,--tbuf_dataready, BUS_DATAREADY_IN(3) => last_read_enable(3), BUS_DATAREADY_IN(4) => last_read_enable(4), BUS_DATAREADY_IN(5) => last_read_enable(5), BUS_DATAREADY_IN(6) => stat_buffer_ready, BUS_WRITE_ACK_IN(0) => REGIO_WRITE_ACK_IN, BUS_WRITE_ACK_IN(1) => '0', - BUS_WRITE_ACK_IN(2) => info_tx.ack or info_tx.wack,--'0', + BUS_WRITE_ACK_IN(2) => info_tx_ack_or_info_tx_wack,--'0', BUS_WRITE_ACK_IN(3) => '0', BUS_WRITE_ACK_IN(4) => '0', BUS_WRITE_ACK_IN(5) => '0', diff --git a/trb_net_std.vhd b/trb_net_std.vhd index e896faf..3b1466f 100644 --- a/trb_net_std.vhd +++ b/trb_net_std.vhd @@ -283,9 +283,6 @@ package trb_net_std is function is_time_reached (timer : integer; time : integer; period : integer) return std_logic; - function MAX(x : integer; y : integer) - return integer; - function Log2( input:integer ) return integer; function count_ones( input:std_logic_vector ) return integer; function minimum (LEFT, RIGHT: INTEGER) return INTEGER; @@ -385,16 +382,6 @@ package body trb_net_std is if i = 1 then return '1'; else return '0'; end if; end is_time_reached; - function MAX(x : integer; y : integer) - return integer is - begin - if x > y then - return x; - else - return y; - end if; - end MAX; - function Log2( input:integer ) return integer is variable temp,log:integer; -- 2.43.0