]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
Moving source files to subfolders.
authorTobias Weber <toweber86@gmail.com>
Thu, 19 Jul 2018 08:44:18 +0000 (10:44 +0200)
committerTobias Weber <toweber86@gmail.com>
Thu, 19 Jul 2018 08:44:18 +0000 (10:44 +0200)
35 files changed:
mupix/Mupix8/sources/Datapath/Arbiter.vhd [moved from mupix/Mupix8/sources/Arbiter.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/CircularMemory.vhd [moved from mupix/Mupix8/sources/CircularMemory.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/DataMux.vhd [moved from mupix/Mupix8/sources/DataMux.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/DataMuxWithConversion.vhd [moved from mupix/Mupix8/sources/DataMuxWithConversion.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/Gray2Binary.vhd [moved from mupix/Mupix8/sources/Gray2Binary.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/LinkSynchronizer.vhd [moved from mupix/Mupix8/sources/LinkSynchronizer.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/MuPixDataLink_new.vhd [moved from mupix/Mupix8/sources/MuPixDataLink_new.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/MuPixUnpacker.vhd [moved from mupix/Mupix8/sources/MuPixUnpacker.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/MupixDataLink.vhd [moved from mupix/Mupix8/sources/MupixDataLink.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/MupixTRBReadout.vhd [moved from mupix/Mupix8/sources/MupixTRBReadout.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/PixelAddressDecode.vhd [moved from mupix/Mupix8/sources/PixelAddressDecode.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/ReadoutController.vhd [moved from mupix/Mupix8/sources/ReadoutController.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/ResetHandler.vhd [moved from mupix/Mupix8/sources/ResetHandler.vhd with 100% similarity]
mupix/Mupix8/sources/Datapath/TriggerHandler.vhd [moved from mupix/Mupix8/sources/TriggerHandler.vhd with 100% similarity]
mupix/Mupix8/sources/MupixBoard.vhd
mupix/Mupix8/sources/Simulation/DatasourceSelector.vhd [moved from mupix/Mupix8/sources/DatasourceSelector.vhd with 100% similarity]
mupix/Mupix8/sources/Simulation/FrameGeneratorMux.vhd [moved from mupix/Mupix8/sources/FrameGeneratorMux.vhd with 100% similarity]
mupix/Mupix8/sources/Simulation/Generator3.vhd [moved from mupix/Mupix8/sources/Generator3.vhd with 100% similarity]
mupix/Mupix8/sources/Simulation/LinkSimulation.vhd
mupix/Mupix8/sources/SlowControl/ADS1018SPI.vhd [moved from mupix/Mupix8/sources/ADS1018SPI.vhd with 100% similarity]
mupix/Mupix8/sources/SlowControl/LTC1658SPI.vhd [moved from mupix/Mupix8/sources/LTC1658SPI.vhd with 100% similarity]
mupix/Mupix8/sources/SlowControl/MupixBoardDAC.vhd [moved from mupix/Mupix8/sources/MupixBoardDAC.vhd with 100% similarity]
mupix/Mupix8/sources/SlowControl/PixelControl.vhd [moved from mupix/Mupix8/sources/PixelControl.vhd with 100% similarity]
mupix/Mupix8/sources/SlowControl/TestpulseGenerator.vhd [moved from mupix/Mupix8/sources/TestpulseGenerator.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/BlockMemory.vhd [moved from mupix/Mupix8/sources/BlockMemory.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/CRC.vhd [moved from mupix/Mupix8/sources/CRC.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/FIFO.vhd [moved from mupix/Mupix8/sources/FIFO.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/GrayCounter.vhd [moved from mupix/Mupix8/sources/GrayCounter.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/GrayCounter2.vhd [moved from mupix/Mupix8/sources/GrayCounter2.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/Histogram.vhd [moved from mupix/Mupix8/sources/Histogram.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/HitbusHistogram.vhd [moved from mupix/Mupix8/sources/HitbusHistogram.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/InputSynchronizer.vhd [moved from mupix/Mupix8/sources/InputSynchronizer.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/SignalDelay.vhd [moved from mupix/Mupix8/sources/SignalDelay.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/SortingCell.vhd [moved from mupix/Mupix8/sources/SortingCell.vhd with 100% similarity]
mupix/Mupix8/sources/Utility/SortingNetwork.vhd [moved from mupix/Mupix8/sources/SortingNetwork.vhd with 100% similarity]

index 3de7ed73c659cca1207f51337190a5fd25be4ee4..e3c559036941e8a5edeca8209254e327c5534817 100644 (file)
@@ -339,12 +339,21 @@ architecture Behavioral of MupixBoard8 is
   signal fifo_full_serdes_i  : std_logic_vector(c_links - 1 downto 0);
   signal fifo_data_serdes_i  : std_logic_vector(c_mupixhitsize*c_links - 1 downto 0);
 
+  signal reset_reg : std_logic := '0';
+  
 begin  -- Behavioral
 
 -------------------------------------------------------------------------------
 -- Port Maps
 -------------------------------------------------------------------------------
 
+  register_reset: process (clk) is
+  begin  -- process register_reset
+    if rising_edge(clk) then            -- rising clock edge
+      reset_reg <= reset;
+    end if;
+  end process register_reset;
+  
   THE_BUS_HANDLER : trb_net16_regio_bus_handler
     generic map(
       PORT_NUMBER => NUM_PORTS,
@@ -371,7 +380,7 @@ begin  -- Behavioral
       )
     port map(
       CLK   => CLK,
-      RESET => RESET,
+      RESET => reset_reg,
 
       DAT_ADDR_IN          => REGIO_ADDR_IN,
       DAT_DATA_IN          => REGIO_DATA_IN,
@@ -404,7 +413,7 @@ begin  -- Behavioral
     port map(
       clk_in            => clk,
       fast_clk_in       => fast_clk,
-      reset             => reset,
+      reset             => reset_reg,
       ctrl_dout         => ctrl_dout,
       spi_dout_adc      => spi_dout_adc,
       spi_dout_dac      => spi_dout_dac,
@@ -449,7 +458,7 @@ begin  -- Behavioral
       )
     port map(
       clk                  => clk,
-      reset                => reset,
+      reset                => reset_reg,
       mupixslctrl          => mupixslctrl_i,
       ctrl_dout            => ctrl_dout_sync,
       SLV_READ_IN          => slv_read(1),
@@ -472,7 +481,7 @@ begin  -- Behavioral
   boardcontrol_1 : entity work.MupixBoardDAC
     port map(
       clk                  => clk,
-      reset                => reset,
+      reset                => reset_reg,
       spi_dout_dac         => spi_dout_dac_sync,
       dac4_dout            => dac4_dout_sync,
       spi_dout_adc         => spi_dout_adc_sync,
@@ -522,7 +531,7 @@ begin  -- Behavioral
       )
     port map(
       clk                  => clk,
-      rst                  => reset,
+      rst                  => reset_reg,
       fifo_empty           => mux_fifo_empty,
       fifo_full            => mux_fifo_full,
       fifo_datain          => mux_fifo_data,
@@ -544,7 +553,7 @@ begin  -- Behavioral
   triggerhandler1 : entity work.TriggerHandler
     port map(
       CLK_IN                      => clk,
-      RESET_IN                    => reset,
+      RESET_IN                    => reset_reg,
       TIMING_TRIGGER_IN           => TIMING_TRG_IN,
       LVL1_TRG_DATA_VALID_IN      => LVL1_TRG_DATA_VALID_IN,
       LVL1_VALID_TIMING_TRG_IN    => LVL1_VALID_TIMING_TRG_IN,
@@ -579,7 +588,7 @@ begin  -- Behavioral
       )
     port map(
       clk                  => clk,
-      reset                => reset,
+      reset                => reset_reg,
       serdes_data          => fifo_data_serdes_i,
       serdes_fifo_full     => fifo_full_serdes_i,
       serdes_fifo_empty    => fifo_empty_serdes_i,
@@ -603,8 +612,8 @@ begin  -- Behavioral
     port map(
       sysclk               => clk,
       dataclk              => data_clk,
-      rst                  => reset,
-      clear                => reset,
+      rst                  => reset_reg,
+      clear                => reset_reg,
       mupix_data           => mupix_data,
       fifo_rden            => fifo_rden_serdes_i,
       fifo_empty           => fifo_empty_serdes_i,
index 05d250217345d9ce6fa8acf7262c430934bb6d96..893a058977acd862b892623603b213e7c2077ed8 100644 (file)
@@ -78,8 +78,17 @@ architecture rtl of LinkSimulation is
   signal words_i                  : std_logic_vector(4 downto 0)  := "00100";
   signal slowdown_i               : std_logic_vector(15 downto 0) := x"FF0A";
 
+  signal reset_reg : std_logic := '0';
+
 begin  -- architecture rtl
 
+  register_reset: process (trbclk) is
+  begin  -- process register_reset
+    if rising_edge(trbclk) then            -- rising clock edge
+      reset_reg <= reset;
+    end if;
+  end process register_reset;
+
   mupix_sim_pll_1 : entity work.mupix_sim_pll
     port map (
       CLK   => sendclk,
@@ -90,7 +99,7 @@ begin  -- architecture rtl
   MupixStateMachine_1 : entity work.MupixStateMachine
     port map (
       clk      => data_clk_i,
-      reset    => reset,
+      reset    => reset_reg,
       words    => words_i,
       slowdown => slowdown_i,
       wr_en    => fifo_wren_i,
@@ -106,8 +115,8 @@ begin  -- architecture rtl
       RdClock => sim_clk_i,
       WrEn    => fifo_wren_i,
       RdEn    => fifo_rden_i,
-      Reset   => reset,
-      RPReset => reset,
+      Reset   => reset_reg,
+      RPReset => reset_reg,
       Q       => fifo_data_out,
       Empty   => fifo_empty_i,
       Full    => open);
@@ -115,7 +124,7 @@ begin  -- architecture rtl
   DataOutput_1 : entity work.DataOutput
     port map (
       clk     => sim_clk_i,
-      reset   => reset,
+      reset   => reset_reg,
       datain  => fifo_data_out,
       empty   => fifo_empty_i,
       rden    => fifo_rden_i,
@@ -124,7 +133,7 @@ begin  -- architecture rtl
   data_output_pipe : process (sim_clk_i) is
   begin  -- process data_output_pipe
     if rising_edge(sim_clk_i) then      -- rising clock edge
-      if reset = '1' then               -- synchronous reset (active high)
+      if reset_reg = '1' then               -- synchronous reset (active high)
         data_out_reg <= (others => '0');
       else
         data_out_reg <= data_out_i;