From 44afadfe693ab9587e8b3380c409fc3786d7dd9f Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Thu, 5 Aug 2010 13:05:48 +0000 Subject: [PATCH] *** empty log message *** --- constraints_cts_fpga2.lpf | 42 +++++++++++++++++++-------------------- cts_fpga2.vhd | 29 ++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/constraints_cts_fpga2.lpf b/constraints_cts_fpga2.lpf index a02b3ff..4e23e05 100644 --- a/constraints_cts_fpga2.lpf +++ b/constraints_cts_fpga2.lpf @@ -27,39 +27,38 @@ LOCATE UGROUP "THE_MEDIA_INTERFACE_1/media_interface_group" REGION "MED1" ; ######################################### # Endpoint Placement ######################################### -REGION "ENDP_CTS_REGION" "R59C90" 52 38; -REGION "ENDP_RDO_REGION" "R2C90" 56 38; +REGION "ENDP_CTS_REGION" "R59C80" 52 48; +REGION "ENDP_RDO_REGION" "R2C80" 56 48; #Readout endpoint -LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_gen_regio_regIO/RegIOgroup" REGION "ENDP_RDO_REGION"; +LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_gen_regio_regIO/RegIO_group" REGION "ENDP_RDO_REGION"; LOCATE UGROUP "THE_RDO_BUS_HANDLER/Bus_handler_group" REGION "ENDP_RDO_REGION"; -LOCATE UGROUP "THE_SPI_MASTER/SPI_group" REGION "ENDP_RDO_REGION"; -LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_0_geniobuf_gen_api_pas_DAT_PASSIVE_API/API_GROUP" REGION "ENDP_RDO_REGION"; -LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_gen_api_pas_DAT_PASSIVE_API/API_GROUP" REGION "ENDP_RDO_REGION"; -LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_gen_api_pas_DAT_PASSIVE_API/API_GROUP" REGION "ENDP_RDO_REGION"; + +LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_gen_api_DAT_PASSIVE_API/API_group" REGION "ENDP_RDO_REGION"; +LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_gen_api_DAT_PASSIVE_API/API_group" REGION "ENDP_RDO_REGION"; LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_0_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IBUF_group" REGION "ENDP_RDO_REGION"; LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IBUF_group" REGION "ENDP_RDO_REGION"; LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IBUF_group" REGION "ENDP_RDO_REGION"; -LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_0_geniobuf_IOBUF/genINITOBUF1_INITOBUF/OBUF_group" REGION "ENDP_RDO_REGION"; -LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_IOBUF/genINITOBUF1_INITOBUF/OBUF_group" REGION "ENDP_RDO_REGION"; -LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genINITOBUF1_INITOBUF/OBUF_group" REGION "ENDP_RDO_REGION"; +# LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genINITOBUF2_gen_INITOBUF3_INITOBUF/OBUF_group" REGION "ENDP_RDO_REGION"; +# LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genINITOBUF2_gen_INITOBUF3_INITOBUF/OBUF_group" REGION "ENDP_RDO_REGION"; +# LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genINITOBUF2_gen_INITOBUF3/OBUF_group" REGION "ENDP_RDO_REGION"; LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_0_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "ENDP_RDO_REGION"; LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "ENDP_RDO_REGION"; LOCATE UGROUP "THE_DATA_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "ENDP_RDO_REGION"; #CTS endpoint +LOCATE UGROUP "THE_SPI_MASTER/SPI_group" REGION "ENDP_CTS_REGION"; +LOCATE UGROUP "THE_CTS_ENDPOINT/regIO/RegIO_group" REGION "ENDP_CTS_REGION"; -LOCATE UGROUP "THE_CTS_ENDPOINT/regIO/RegIOgroup" REGION "ENDP_CTS_REGION"; - -LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_0_geniobuf_gen_api_pas_DAT_ACTIVE_API/API_GROUP" REGION "ENDP_CTS_REGION"; -LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_1_geniobuf_gen_api_pas_DAT_ACTIVE_API/API_GROUP" REGION "ENDP_CTS_REGION"; -LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_3_geniobuf_gen_api_pas_DAT_PASSIVE_API/API_GROUP" REGION "ENDP_CTS_REGION"; +LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_0_geniobuf_gen_api_act_DAT_ACTIVE_API/API_group" REGION "ENDP_CTS_REGION"; +LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_1_geniobuf_gen_api_act_DAT_ACTIVE_API/API_group" REGION "ENDP_CTS_REGION"; +LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_3_geniobuf_gen_api_pas_DAT_PASSIVE_API/API_group" REGION "ENDP_CTS_REGION"; LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_0_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IBUF_group" REGION "ENDP_CTS_REGION"; LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_1_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IBUF_group" REGION "ENDP_CTS_REGION"; @@ -67,12 +66,13 @@ LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_3_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IB LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_0_geniobuf_IOBUF/genINITOBUF1_INITOBUF/OBUF_group" REGION "ENDP_CTS_REGION"; LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_1_geniobuf_IOBUF/genINITOBUF1_INITOBUF/OBUF_group" REGION "ENDP_CTS_REGION"; -LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genINITOBUF1_INITOBUF/OBUF_group" REGION "ENDP_CTS_REGION"; +# LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genINITOBUF2_gen_INITOBUF3/OBUF_group" REGION "ENDP_CTS_REGION"; -LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_0_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "ENDP_CTS_REGION"; -LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_1_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "ENDP_CTS_REGION"; +# LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_0_geniobuf_IOBUF/genREPLYOBUF2_gen_REPLYOBUF3/OBUF_group" REGION "ENDP_CTS_REGION"; +# LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_1_geniobuf_IOBUF/genREPLYOBUF2_gen_REPLYOBUF3/OBUF_group" REGION "ENDP_CTS_REGION"; LOCATE UGROUP "THE_CTS_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "ENDP_CTS_REGION"; -######################################### -# Serdes Placement -######################################### + + + + diff --git a/cts_fpga2.vhd b/cts_fpga2.vhd index 844904c..8f9af71 100644 --- a/cts_fpga2.vhd +++ b/cts_fpga2.vhd @@ -471,7 +471,8 @@ begin BUS_UNKNOWN_ADDR_IN => rdo_regio_unknown_addr_in, BUS_TIMEOUT_OUT => rdo_regio_timeout_out, ONEWIRE_INOUT => TEMPSENS, - ONEWIRE_MONITOR_IN => cts_regio_onewire_monitor_i, + ONEWIRE_MONITOR_OUT => cts_regio_onewire_monitor_i, + ONEWIRE_MONITOR_IN => '0', TIME_GLOBAL_OUT => rdo_global_time, TIME_LOCAL_OUT => rdo_local_time, @@ -560,8 +561,8 @@ begin REGIO_UNKNOWN_ADDR_IN => cts_regio_unknown_addr_i, REGIO_TIMEOUT_OUT => cts_regio_timeout_i, REGIO_ONEWIRE_INOUT => open, - REGIO_ONEWIRE_MONITOR_OUT => cts_regio_onewire_monitor_i, - REGIO_ONEWIRE_MONITOR_IN => '0', + REGIO_ONEWIRE_MONITOR_OUT => open, + REGIO_ONEWIRE_MONITOR_IN => cts_regio_onewire_monitor_i, TRIGGER_MONITOR_IN => '0', GLOBAL_TIME_OUT => cts_global_time_i, LOCAL_TIME_OUT => cts_local_time_i, @@ -708,4 +709,26 @@ begin ONEWIRE_MONITOR_OUT <= cts_regio_onewire_monitor_i; + +--------------------------------------------------------------------------- +-- LED +--------------------------------------------------------------------------- + PROC_REG_LED : process(clk_100) + begin + if rising_edge(clk_100) then + LED_TRB_OK <= not cts_med_stat_op(9); + LED_TRB_RX <= not cts_med_stat_op(10); + LED_TRB_TX <= not cts_med_stat_op(11); + LED_GBE_OK <= not rdo_med_stat_op(9); + LED_GBE_RX <= not rdo_med_stat_op(10); + LED_GBE_TX <= not rdo_med_stat_op(11); + end if; + end process; + + LED_RED <= '1'; + LED_YELLOW <= '1'; + LED_GREEN <= '1'; + LED_ORANGE <= '1'; + + end architecture; -- 2.43.0