]> jspc29.x-matter.uni-frankfurt.de Git - soda.git/commitdiff
minor update
authorPeter Lemmens <p.j.j.lemmens@rug.nl>
Wed, 4 Sep 2013 10:20:10 +0000 (12:20 +0200)
committerPeter Lemmens <p.j.j.lemmens@rug.nl>
Wed, 4 Sep 2013 10:20:10 +0000 (12:20 +0200)
source/TB_soda_chain.vhd
source/super_burst_generator.vhd [deleted file]

index 8190462ef2d6162fb444710670322e9600b28ef7..b928d27898def6d8af7a9615af5624c1e05485c2 100644 (file)
@@ -46,7 +46,15 @@ architecture TestBench of TB_soda_chain is
        signal soda_clt_data_out                        : std_logic_vector(31 downto 0);
        signal soda_addr                                                : std_logic_vector(3 downto 0)  := (others => '0');
        signal soda_leds                                                : std_logic_vector(3 downto 0);\r
-begin\r
+begin
+
+       THE_SOB_SOURCE : soda_start_of_burst_faker
+               port map(
+                       SYSCLK                                          => clk_S,
+                       RESET                                                   => rst_S,
+                       SODA_BURST_PULSE_OUT            => SOB_S
+               );
+\r
 \r
        THE_SODA_SOURCE : soda_source
                port map(
@@ -190,13 +198,13 @@ rst_S <= '0';
 wait;
  end process;
 \r
- burst_proc :process
- begin
-SOB_S <= '0';
-wait for 2.35us;
-SOB_S <= '1';
-wait for 50ns;
- end process; 
+-- burst_proc :process
+-- begin
+--SOB_S <= '0';
+--wait for 2.35us;
+--SOB_S <= '1';
+--wait for 50ns;
+-- end process; 
 
 \r
 end TestBench;\r
diff --git a/source/super_burst_generator.vhd b/source/super_burst_generator.vhd
deleted file mode 100644 (file)
index db15df1..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-library ieee;
-use ieee.std_logic_1164.all;
-use ieee.numeric_std.all;
-use IEEE.STD_LOGIC_ARITH.ALL;
-use ieee.std_logic_signed.all;
-
---library work;
---use work.trb_net_std.all;
---use work.trb_net_components.all;
---use work.trb3_components.all;
---use work.med_sync_define.all;
---use work.version.all;
-
-entity super_burst_generator is
-       generic(
-               BURST_COUNT : natural range 1 to 256 := 16   -- number of bursts to be counted between super-bursts
-               );
-       port(
-               SYSCLK                                  : in    std_logic; -- fabric clock
-               RESET                                           : in    std_logic; -- synchronous reset
-               CLEAR                                           : in    std_logic; -- asynchronous reset
-               CLK_EN                                  : in    std_logic;
-               --Internal Connection
-               SODA_BURST_PULSE_IN     : in    std_logic := '0';       -- 
-               START_OF_SUPERBURST     : out   std_logic := '0';\r
-               SUPER_BURST_NR_OUT      : out   std_logic_vector(30 downto 0) := (others => '0')\r
-               );
-end super_burst_generator;
-
-architecture Behavioral of super_burst_generator is
-
-       constant        cBURST_COUNT                            : std_logic_vector(7 downto 0)  := conv_std_logic_vector(BURST_COUNT - 1,8);
-
-       signal  clk_S                                                   : std_logic;
-       signal  rst_S                                                   : std_logic;
-       signal  soda_burst_pulse_S              : std_logic     := '0';
-       signal  start_of_superburst_S   : std_logic     := '0';
-       signal  super_burst_nr_S                        : std_logic_vector(30 downto 0) := (others => '0');             -- from super-burst-nr-generator
-       signal  burst_counter_S                 : std_logic_vector(7 downto 0)  := (others => '0');             -- from super-burst-nr-generator
-       
-
-begin
-
-       clk_S                                                   <= SYSCLK;
-       rst_S                                                   <= RESET;
-       START_OF_SUPERBURST             <= start_of_superburst_S;\r
-       SUPER_BURST_NR_OUT              <=      super_burst_nr_S;
-       
-       burst_pulse_edge_proc : process(clk_S, rst_S, SODA_BURST_PULSE_IN, soda_burst_pulse_S, burst_counter_S)\r
-       begin
-               if rising_edge(clk_S) then
-                       soda_burst_pulse_S <= SODA_BURST_PULSE_IN;\r
-                       if (rst_S='1') then
-                               burst_counter_S <= cBURST_COUNT;
-                               start_of_superburst_S   <= '0';
-                               super_burst_nr_S                        <= (others => '0');\r
-                       elsif ((SODA_BURST_PULSE_IN = '1') and (soda_burst_pulse_S = '0')) then\r
-                               if (burst_counter_S = x"00") then\r
-                                       start_of_superburst_S   <= '1';\r
-                                       super_burst_nr_S                        <= super_burst_nr_S + 1;
-                                       burst_counter_S <= cBURST_COUNT;
-                               else\r
-                                       start_of_superburst_S   <= '0';
-                                       burst_counter_s <=      burst_counter_s - 1;\r
-                               end if;
-                       else
-                               start_of_superburst_S           <= '0';
-                       end if;\r
-               end if;\r
-       end process;\r
-       
-
-end Behavioral;
\ No newline at end of file