]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
*** empty log message ***
authorhadeshyp <hadeshyp>
Thu, 4 Oct 2012 12:11:24 +0000 (12:11 +0000)
committerhadeshyp <hadeshyp>
Thu, 4 Oct 2012 12:11:24 +0000 (12:11 +0000)
cts/trb3_central.vhd
cts/trb3_central_constraints.lpf

index 6348b08b6ab23bc386cafb8d9e3a39411d054169..2d57ec0f383b267558185a2ab118437b645bdfe2 100644 (file)
@@ -312,7 +312,7 @@ architecture trb3_central_arch of trb3_central is
 
    signal cts_rdo_additional_data     : std_logic_vector(31 downto 0);
    signal cts_rdo_additional_write    : std_logic := '0';
-   signal cts_rdo_additional_finished : std_logic := '1';
+   signal cts_rdo_additional_finished : std_logic := '0';
 
    signal cts_trg_send                : std_logic;
    signal cts_trg_type                : std_logic_vector(3 downto 0);
@@ -408,7 +408,7 @@ begin
       TRIGGER_INPUT_COUNT  => 4,
       TRIGGER_COIN_COUNT   => 4,
       TRIGGER_PULSER_COUNT => 4,
-      TRIGGER_RAND_PULSER  => 2
+      TRIGGER_RAND_PULSER  => 1
    )
    port map ( 
       CLK => clk_100_i,
@@ -458,7 +458,7 @@ begin
       FEE_DATA_FINISHED_OUT   => cts_rdo_finished
    );   
    
-   cts_rdo_trg_status_bits <= cts_rdo_trg_status_bits_cts OR cts_rdo_trg_status_bits_additional;
+--    cts_rdo_trg_status_bits <= cts_rdo_trg_status_bits_cts OR cts_rdo_trg_status_bits_additional;
    
 ---------------------------------------------------------------------------
 -- Reset Generation
@@ -711,15 +711,16 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4_onboard
     RDO_VALID_NOTIMING_TRG_OUT     => cts_rdo_valid_notiming_trg,
     RDO_INVALID_TRG_OUT            => cts_rdo_invalid_trg,
     --Data out
-    RDO_TRG_STATUSBITS_IN          => cts_rdo_trg_status_bits,
+    RDO_TRG_STATUSBITS_IN          => cts_rdo_trg_status_bits_cts,
     RDO_DATA_IN                    => cts_rdo_data,
     RDO_DATA_WRITE_IN              => cts_rdo_write,
     RDO_DATA_FINISHED_IN           => cts_rdo_finished,
     
+    RDO_ADDITIONAL_STATUSBITS_IN   => cts_rdo_trg_status_bits_additional,
     RDO_ADDITIONAL_DATA            => cts_rdo_additional_data,
     RDO_ADDITIONAL_WRITE           => cts_rdo_additional_write,
     RDO_ADDITIONAL_FINISHED        => cts_rdo_additional_finished,
-         
+    
          COMMON_STAT_REGS        => common_stat_regs, --open,
          COMMON_CTRL_REGS        => common_ctrl_regs, --open,
          ONEWIRE                 => TEMPSENS,
index 7276d94e69182c692aa20cebfcf6186bc7bfcd4e..45b84afdb36fb16f85bd1e03ec30a612bba9067a 100644 (file)
@@ -32,6 +32,7 @@ LOCATE COMP   "THE_MEDIA_ONBOARD/gen_serdes_125_THE_SERDES/PCSD_INST" SITE "PCSC
 MULTICYCLE TO   CELL "THE_RESET_HANDLER/final_reset_*" 30 ns;\r
 MULTICYCLE TO   CELL "THE_HUB/THE_HUB/local_network_reset*" 30 ns;\r
 \r
+\r
 REGION "MEDIA_UPLINK" "R98C95" 17 27;\r
 LOCATE UGROUP "THE_MEDIA_UPLINK/media_interface_group" REGION "MEDIA_UPLINK" ;\r
 \r