HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r386:100ad6ccce4d

Update arbitration in front of FFT based on falling edge of fft_ready and sample_load

pellion -

r386:100ad6ccce4d (MINI-LFR) WFP_MS-0-1-21 JC

parent child

Context file:

r386:100ad6ccce4d

Collapse all files

designs/MINI-LFR_WFP_MS/MINI_LFR_top.vhd +1 -1

                   pirq_ms                => 6,
                   pirq_wfp               => 14,
                   hindex                 => 2,
-                  top_lfr_version        => X"000114")  -- aa.bb.cc version
+                  top_lfr_version        => X"000115")  -- aa.bb.cc version
                 PORT MAP (
                   clk             => clk_25,
                   rstn            => reset,

lib/lpp/lpp_top_lfr/lpp_lfr_ms.vhd +29 -16

               SIGNAL status_component_fifo_0_end : STD_LOGIC;
               SIGNAL status_component_fifo_1_end : STD_LOGIC;
               -----------------------------------------------------------------------------
-              SIGNAL fft_ongoing_counter : STD_LOGIC_VECTOR(1 DOWNTO 0);
+              SIGNAL fft_ongoing_counter : STD_LOGIC;--_VECTOR(1 DOWNTO 0);
               SIGNAL fft_ready_reg         : STD_LOGIC;
               SIGNAL fft_ready_rising_down : STD_LOGIC;
                   rdata       => sample_f0_B_rdata,
                   empty       => sample_f0_B_empty,
                   full        => sample_f0_B_full,
                   almost_full => OPEN);
+              -----------------------------------------------------------------------------
+              -- sample_f1_wen   in
+              -- sample_f1_wdata in
+              -- sample_f1_full  OUT
               lppFIFOxN_f1 : lppFIFOxN
                 GENERIC MAP (
                   tech    => 0,
                 END IF;
               END PROCESS;
+              -----------------------------------------------------------------------------
               lppFIFOxN_f2 : lppFIFOxN
                 GENERIC MAP (
               -- FSM LOAD FFT
               -----------------------------------------------------------------------------
-              sample_ren <= (OTHERS => '1') WHEN fft_ongoing_counter = "10" ELSE
+              sample_ren <= (OTHERS => '1') WHEN fft_ongoing_counter = '1' ELSE
                             sample_ren_s    WHEN sample_load = '1' ELSE
                             (OTHERS => '1');
                 END IF;
               END PROCESS;
-              sample_valid <= '0' WHEN fft_ongoing_counter = "10" ELSE sample_valid_r AND sample_load;
+              sample_valid <= '0' WHEN fft_ongoing_counter = '1' ELSE sample_valid_r AND sample_load;
               sample_data <= sample_rdata(16*1-1 DOWNTO 16*0) WHEN next_state_fsm_load_FFT = FIFO_1 ELSE
                              sample_rdata(16*2-1 DOWNTO 16*1) WHEN next_state_fsm_load_FFT = FIFO_2 ELSE
                   fft_data_valid => fft_data_valid,
                   fft_ready      => fft_ready);
-              observation_vector_0(11 DOWNTO 0) <= "00" &                              --11 10
+              observation_vector_0(11 DOWNTO 0) <= "000" &                              --11 10
                                                    fft_ongoing_counter &               --9 8
                                                    sample_load_rising_down &           --7
                                                    fft_ready_rising_down &             --6
                   fft_ready_reg     <= '0';
                   sample_load_reg   <= '0';
-                  fft_ongoing_counter <= "00";
+                  fft_ongoing_counter <= '0';
                 ELSIF clk'event AND clk = '1' THEN
                   fft_ready_reg    <= fft_ready;
                   sample_load_reg  <= sample_load;
                   IF fft_ready_rising_down = '1' AND sample_load_rising_down = '0' THEN
-                    CASE fft_ongoing_counter IS
+                    fft_ongoing_counter <= '0';
-                      WHEN "01" => fft_ongoing_counter <= "00";
-                      WHEN "10" => fft_ongoing_counter <= "01";
+            --        CASE fft_ongoing_counter IS
-                      WHEN OTHERS => NULL;
+            --          WHEN "01" => fft_ongoing_counter <= "00";
-                    END CASE;
+            ----          WHEN "10" => fft_ongoing_counter <= "01";
+            --          WHEN OTHERS => NULL;
+            --        END CASE;
                   ELSIF fft_ready_rising_down = '0' AND sample_load_rising_down = '1' THEN
-                    CASE fft_ongoing_counter IS
+                    fft_ongoing_counter <= '1';
-                      WHEN "00" => fft_ongoing_counter <= "01";
+            --        CASE fft_ongoing_counter IS
-                      WHEN "01" => fft_ongoing_counter <= "10";
+            --          WHEN "00" => fft_ongoing_counter <= "01";
-                      WHEN OTHERS => NULL;
+            ----          WHEN "01" => fft_ongoing_counter <= "10";
-                    END CASE;
+            --          WHEN OTHERS => NULL;
+            --        END CASE;
                   END IF;
                 END IF;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages