1:3 hub, first version

diff --git a/gbe_trb_ecp3/base/gbe_med_fifo.vhd b/gbe_trb_ecp3/base/gbe_med_fifo.vhd
index cca5336fb0f5530421aaa73ca6e0ffeed484388b..8ed6b65b0a647f0b246561883942c4269fcdc152 100644 (file)
--- a/gbe_trb_ecp3/base/gbe_med_fifo.vhd
+++ b/gbe_trb_ecp3/base/gbe_med_fifo.vhd
@@ -20,7 +20,7 @@ entity gbe_med_fifo is
     CLK_125               : in  std_logic;
     CLK_125_RX            : out std_logic_vector(3 downto 0);
     -- FIFO interface RX
-    FIFO_DATA_OUT         : out std_logic_vector(4 * 8 - 1 downto 0);
+    FIFO_DATA_OUT         : out std_logic_vector(4 * 9 - 1 downto 0);
     FIFO_FULL_IN          : in  std_logic_vector(3 downto 0);
     FIFO_WR_OUT           : out std_logic_vector(3 downto 0);
     FRAME_REQ_IN          : in  std_logic_vector(3 downto 0);
@@ -30,7 +30,7 @@ entity gbe_med_fifo is
     -- FIFO interface TX
     FIFO_FULL_OUT         : out std_logic_vector(3 downto 0);
     FIFO_WR_IN            : in  std_logic_vector(3 downto 0);
-    FIFO_DATA_IN          : in  std_logic_vector(4 * 8 - 1 downto 0);
+    FIFO_DATA_IN          : in  std_logic_vector(4 * 9 - 1 downto 0);
     FRAME_START_IN        : in  std_logic_vector(3 downto 0);
     -- SFP Connection
     SD_PRSNT_N_IN         : in  std_logic_vector(3 downto 0)          := (others => '0');
@@ -594,7 +594,7 @@ begin
         -- FIFO interface (TX)
         FIFO_FULL_IN        => FIFO_FULL_IN(i),
         FIFO_WR_OUT         => FIFO_WR_OUT(i),
-        FIFO_Q_OUT          => FIFO_DATA_OUT((i + 1) * 8 - 1 downto i * 8),
+        FIFO_Q_OUT          => FIFO_DATA_OUT((i + 1) * 9 - 1 downto i * 9),
         FRAME_REQ_IN        => FRAME_REQ_IN(i),
         FRAME_ACK_OUT       => FRAME_ACK_OUT(i),
         FRAME_AVAIL_OUT     => FRAME_AVAIL_OUT(i),
@@ -619,7 +619,7 @@ begin
         -- FIFO interface
         FIFO_FULL_OUT     => FIFO_FULL_OUT(i),
         FIFO_WR_IN        => FIFO_WR_IN(i),
-        FIFO_D_IN         => FIFO_DATA_IN((i + 1) * 8 - 1 downto i * 8),
+        FIFO_D_IN         => FIFO_DATA_IN((i + 1) * 9 - 1 downto i * 9),
         -- Link stuff
         FRAME_START_IN    => FRAME_START_IN(i),
         LINK_ACTIVE_IN    => an_complete(i),

diff --git a/gbe_trb_ecp3/base/scatter_ports.vhd b/gbe_trb_ecp3/base/scatter_ports.vhd
index 181c201d3ec988660ebe00a0bb17eeeb83b345e4..ba1c08399103e12b0aef78cb0adbee2016d363dd 100644 (file)
--- a/gbe_trb_ecp3/base/scatter_ports.vhd
+++ b/gbe_trb_ecp3/base/scatter_ports.vhd
@@ -10,6 +10,8 @@ entity scatter_ports is
     CLEAR               : in  std_logic;\r
     RESET               : in  std_logic;\r
     --\r
+    FIFO_FULL_IN        : in  std_logic_vector(15 downto 0) := (others => '0');\r
+    FIFO_FULL_OUT       : out std_logic;\r
     FRAME_AVAIL_IN      : in  std_logic := '0';\r
     FRAME_REQ_OUT       : out std_logic;\r
     FRAME_ACK_IN        : in  std_logic := '0';\r
@@ -33,10 +35,12 @@ architecture scatter_ports_arch of scatter_ports is
 \r
 begin\r
 \r
-  CYCLE_DONE_OUT <= '1' when STATE = CLEANUP else '0';
+  CYCLE_DONE_OUT <= '1' when STATE = CLEANUP else '0';\r
 \r
   FRAME_REQ_OUT <= req_int;\r
 \r
+  FIFO_FULL_OUT <= '0' when FIFO_FULL_IN = x"0000" else '1';\r
+  \r
   -----------------------------------------------------------\r
   -- statemachine: clocked process\r
   -----------------------------------------------------------\r