HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r382:bd4b3b04474b

Update arbitration in front of FFT based on Pong Status

pellion -

r382:bd4b3b04474b (MINI-LFR) WFP_MS-0-1-18 JC

parent child

Context file:

r382:bd4b3b04474b

Collapse all files

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

                    pirq_ms                => 6,
                    pirq_wfp               => 14,
                    hindex                 => 2,
-                   top_lfr_version        => X"000111")  -- aa.bb.cc version
+                   top_lfr_version        => X"000112")  -- aa.bb.cc version
                  PORT MAP (
                    clk             => clk_25,
                    rstn            => reset,
                    IO11 <= '0';
                  ELSIF clk_25'event AND clk_25 = '1' THEN  -- rising clock edge
                    CASE gpioo.dout(2 DOWNTO 0) IS
-                     WHEN "000" =>
+                     WHEN "011" =>
                        IO0  <= observation_reg(0 );
                        IO1  <= observation_reg(1 );
                        IO2  <= observation_reg(2 );
                        IO9  <= '0';
                        IO10 <= '0';
                        IO11 <= '0';
-                     WHEN "011" =>
+                     WHEN "000" =>
                        IO0  <= observation_vector_0(0 );
                        IO1  <= observation_vector_0(1 );
                        IO2  <= observation_vector_0(2 );

lib/lpp/lpp_top_lfr/lpp_lfr_ms.vhd +14 -12

                -- FSM LOAD FFT
                -----------------------------------------------------------------------------
-               sample_ren <= sample_ren_s WHEN sample_load = '1' ELSE (OTHERS => '1');
+               sample_ren <= sample_ren_s    WHEN ping_npong = fft_pong AND sample_load = '1' ELSE
+                             (OTHERS => '1');
                PROCESS (clk, rstn)
                BEGIN
                END PROCESS;
              --  sample_valid <= sample_valid_r AND sample_load;
-               sample_valid <= sample_valid_r AND (sample_load AND (ping_npong AND fft_pong));
+               sample_valid <= sample_valid_r AND sample_load WHEN ping_npong = fft_pong ELSE '0';
                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(5 DOWNTO 0) <= fft_ready &                         --5
+               observation_vector_0(11 DOWNTO 0) <= "0000" &                            --11 10 9 8
+                                                   sample_load_reg &                   --7
+                                                   ping_npong &                        --6
+                                                   fft_ready &                         --5
                                                    fft_data_valid &                    --4
                                                    fft_pong &                          --3
                                                    sample_load &                       --2
                PROCESS (clk, rstn)
                BEGIN
                  IF rstn = '0' THEN
-                   ping_npong <= '0';
-                   sample_load_reg <= '0';
+                   ping_npong        <= '0';
+                   sample_load_reg   <= '0';
                  ELSIF clk'event AND clk = '1' THEN
                    sample_load_reg <= sample_load;
                    IF sample_load_reg = '1' AND sample_load = '0' THEN
                -----------------------------------------------------------------------------
-               observation_vector_1(11 DOWNTO 0) <= "0000" &
+               observation_vector_1(11 DOWNTO 0) <= '0' &
+                                                    SM_correlation_done      &               --4
+                                                    SM_correlation_auto   &                --3
+                                                    SM_correlation_start  &
-                                                    SM_correlation_start &            --7
                                                     status_MS_input(1 DOWNTO 0)&     --6..5
                                                     MEM_IN_SM_locked(4 DOWNTO 0);    --4..0
-               observation_vector_0(11 DOWNTO 6) <= MEM_IN_SM_locked(0) &
-                                                    SM_correlation_done      &               --4
-                                                    SM_correlation_auto   &                --3
-                                                    SM_correlation_start  &                 --2
-                                                    status_component(5 DOWNTO 4);                   --1..0
                -----------------------------------------------------------------------------
                MS_control_1 : MS_control
                  PORT MAP (
                -----------------------------------------------------------------------------
-             END Behavioral;
+             END Behavioral;
  No newline at end of file

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