corrected reset in gbe hub

diff --git a/.gitignore b/.gitignore
index f8c0b322e40dc9aab8a019b16ae4da1e18b9c013..5938fbde1bf6b90c2de3d1b05b9bb6cbacf3d4e6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ version.vhd
 *.log
 workdir
 *.kate-swp
+*.kate*

diff --git a/gbe2_ecp3/trb_net_gbe_components.vhd b/gbe2_ecp3/trb_net_gbe_components.vhd
index 94c3f333bbbdd7b8a25fa31203034e14252e93c8..f8e0e1b17969ee8b2137cdd777e7189ea0aafe3f 100644 (file)
--- a/gbe2_ecp3/trb_net_gbe_components.vhd
+++ b/gbe2_ecp3/trb_net_gbe_components.vhd
@@ -782,7 +782,7 @@ port(
        DBG_FC2_IN               : in std_logic_vector(31 downto 0);
        DBG_FT1_IN               : in std_logic_vector(31 downto 0);
        DBG_FT2_IN               : in std_logic_vector(31 downto 0);
-       DBG_FR_IN                : in std_logic_vector(95 downto 0);
+       DBG_FR_IN                : in std_logic_vector(63 downto 0);
        DBG_RC_IN                : in std_logic_vector(63 downto 0);
        DBG_MC_IN                : in std_logic_vector(63 downto 0);
        DBG_TC_IN                : in std_logic_vector(31 downto 0);

diff --git a/trb_net16_hub_streaming_port_sctrl.vhd b/trb_net16_hub_streaming_port_sctrl.vhd
index c54b10484b4ff59ab850e82a1929d7e8eeeb1081..64389365b45573e9b439bdad8253480d6ece2113 100644 (file)
--- a/trb_net16_hub_streaming_port_sctrl.vhd
+++ b/trb_net16_hub_streaming_port_sctrl.vhd
@@ -226,7 +226,7 @@ begin
   end generate;
 
 
-  hub_make_network_reset <= external_send_reset_long or med_stat_op((MII_NUMBER-1)*16+13);
+  hub_make_network_reset <= external_send_reset_long or med_stat_op((MII_NUMBER-1)*16+15);
   
   make_gbe_reset : process begin
     wait until rising_edge(CLK);

diff --git a/trb_net_components.vhd b/trb_net_components.vhd
index 1ebf32be17763cb72b02636d48c7ca65b8fb06ec..6d6c05bd67eeac9c3fad43da21232a511b50a4d9 100644 (file)
--- a/trb_net_components.vhd
+++ b/trb_net_components.vhd
@@ -1322,6 +1322,7 @@ component handler_trigger_and_data is
     FEE_DATA_ALMOST_FULL_OUT     : out std_logic_vector(DATA_INTERFACE_NUMBER-1 downto 0);\r
 \r
     TMG_TRG_ERROR_IN             : in  std_logic;\r
+    MAX_EVENT_SIZE_IN            : in  std_logic_vector(15 downto 0);\r
     --Status Registers\r
     STATUS_OUT                   : out std_logic_vector(127 downto 0);\r
     STAT_DATA_BUFFER_LEVEL       : out std_logic_vector(DATA_INTERFACE_NUMBER*32-1 downto 0);\r