From: hadeshyp Date: Fri, 23 Mar 2007 14:32:38 +0000 (+0000) Subject: added status port in trb_net_active_apimbuf.vhd, Jan X-Git-Tag: oldGBE~740 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=9571d1274209363e51559688d9cd37ee97a03f1b;p=trbnet.git added status port in trb_net_active_apimbuf.vhd, Jan --- diff --git a/trb_net_active_apimbuf.vhd b/trb_net_active_apimbuf.vhd index 978fe23..2e707a6 100644 --- a/trb_net_active_apimbuf.vhd +++ b/trb_net_active_apimbuf.vhd @@ -67,6 +67,7 @@ entity trb_net_active_apimbuf is STAT_LOCKED: out STD_LOGIC_VECTOR (31 downto 0); -- Status of the handshake and buffer control STAT_INIT_BUFFER: out STD_LOGIC_VECTOR (31 downto 0); -- Status of the handshake and buffer control STAT_REPLY_BUFFER: out STD_LOGIC_VECTOR (31 downto 0); -- General Status + STAT_api_control_signals: out std_logic_vector(31 downto 0); CTRL_GEN: in STD_LOGIC_VECTOR (31 downto 0); CTRL_LOCKED: in STD_LOGIC_VECTOR (31 downto 0); STAT_CTRL_INIT_BUFFER: in STD_LOGIC_VECTOR (31 downto 0); @@ -205,9 +206,7 @@ component trb_net_active_api is INT_REPLY_READ_OUT: out STD_LOGIC -- Status and control port - -- not needed now, but later - ); END component; @@ -361,6 +360,17 @@ begin -- not needed now, but later ); +STAT_api_control_signals(2 downto 0) <= APL_DATA_IN(2 downto 0); +STAT_api_control_signals(3) <= APL_WRITE_IN; +STAT_api_control_signals(4) <= APL_SEND_IN; +STAT_api_control_signals(7 downto 5) <= "000"; +STAT_api_control_signals(10 downto 8) <= apl_to_buf_INIT_DATA(2 downto 0); +STAT_api_control_signals(11) <= apl_to_buf_INIT_DATAREADY; +STAT_api_control_signals(12) <= apl_to_buf_INIT_READ; +STAT_api_control_signals(31 downto 13) <= (others => '0'); + + + IOBUF: trb_net_iobuf generic map (INIT_DEPTH => INIT_DEPTH, diff --git a/trb_net_med_13bit_slow.vhd b/trb_net_med_13bit_slow.vhd index b5527de..943c956 100755 --- a/trb_net_med_13bit_slow.vhd +++ b/trb_net_med_13bit_slow.vhd @@ -424,7 +424,7 @@ INT2MED_fsm_reg: process(CLK,RESET) MED2INT_fsm: process(MED_PARITY_IN,MED2INT_state,CLK,MED_DATA_IN,DAT_MED2INT, MED_TRANSMISSION_CLK_IN,MED_CARRIER_IN,INT_READ_IN, RECV_STAT, - media_not_connected) + media_not_connected,buf_INT_DATAREADY_OUT, buf_INT_DATA_OUT) begin next_DAT_MED2INT (64 downto 0) <= DAT_MED2INT (64 downto 0); next_INT_DATA_OUT <= (others => '0');