HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r368:aaed3c518959

Update DMA data (big endian)

pellion -

r368:aaed3c518959 (MINI-LFR) WFP_MS-0-1-13 JC

parent child

Context file:

r368:aaed3c518959

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"00010C")  -- aa.bb.cc version
+                  top_lfr_version        => X"00010D")  -- aa.bb.cc version
                 PORT MAP (
                   clk             => clk_25,
                   rstn            => reset,

lib/lpp/lpp_dma/lpp_dma_singleOrBurst.vhd +2 -1

               -----------------------------------------------------------------------------
               -- SEND 16 word by DMA (in burst mode)
               -----------------------------------------------------------------------------
-              data_2_halfword(31 DOWNTO 0) <= data(15 DOWNTO 0) & data (31 DOWNTO 16);
+              --data_2_halfword(31 DOWNTO 0) <= data(15 DOWNTO 0) & data (31 DOWNTO 16);
+              data_2_halfword(31 DOWNTO 0) <= data(31 DOWNTO 0);
               lpp_dma_send_16word_1 : lpp_dma_send_16word
                 PORT MAP (

lib/lpp/lpp_top_lfr/lpp_lfr_ms_fsmdma.vhd +2 -2

                 ELSIF HCLK'EVENT AND HCLK = '1' THEN
                   --
                   debug_reg_s(3)  <= status_ready_matrix_f0;
-                  debug_reg_s(4)  <= status_ready_matrix_f0;
+                  debug_reg_s(4)  <= status_ready_matrix_f1;
-                  debug_reg_s(5)  <= status_ready_matrix_f0;
+                  debug_reg_s(5)  <= status_ready_matrix_f2;
                   debug_reg_s(6)  <= '0';
                   debug_reg_s(7)  <= '0';
                   debug_reg_s(8)  <= '0';

lib/lpp/lpp_waveform/lpp_waveform.vhd +38 -5

@@ -168,6 +168,11 ARCHITECTURE beh OF lpp_waveform IS
168	SIGNAL data_f2_out : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);	168	SIGNAL data_f2_out : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
169	SIGNAL data_f3_out : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);	169	SIGNAL data_f3_out : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
170		170
		171	SIGNAL data_f0_out_swap : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
		172	SIGNAL data_f1_out_swap : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
		173	SIGNAL data_f2_out_swap : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
		174	SIGNAL data_f3_out_swap : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0);
		175
171	SIGNAL data_f0_out_valid : STD_LOGIC;	176	SIGNAL data_f0_out_valid : STD_LOGIC;
172	SIGNAL data_f1_out_valid : STD_LOGIC;	177	SIGNAL data_f1_out_valid : STD_LOGIC;
173	SIGNAL data_f2_out_valid : STD_LOGIC;	178	SIGNAL data_f2_out_valid : STD_LOGIC;
@@ -362,13 +367,41 BEGIN -- beh
362	error => status_new_err(I));	367	error => status_new_err(I));
363	END GENERATE all_input_valid;	368	END GENERATE all_input_valid;
364		369
		370	data_f0_out_swap <= data_f0_out((165)-1 DOWNTO 164) &
		371	data_f0_out((166)-1 DOWNTO 165) &
		372	data_f0_out((163)-1 DOWNTO 162) &
		373	data_f0_out((164)-1 DOWNTO 163) &
		374	data_f0_out((161)-1 DOWNTO 160) &
		375	data_f0_out((162)-1 DOWNTO 161) ;
		376
		377	data_f1_out_swap <= data_f1_out((165)-1 DOWNTO 164) &
		378	data_f1_out((166)-1 DOWNTO 165) &
		379	data_f1_out((163)-1 DOWNTO 162) &
		380	data_f1_out((164)-1 DOWNTO 163) &
		381	data_f1_out((161)-1 DOWNTO 160) &
		382	data_f1_out((162)-1 DOWNTO 161) ;
		383
		384	data_f2_out_swap <= data_f2_out((165)-1 DOWNTO 164) &
		385	data_f2_out((166)-1 DOWNTO 165) &
		386	data_f2_out((163)-1 DOWNTO 162) &
		387	data_f2_out((164)-1 DOWNTO 163) &
		388	data_f2_out((161)-1 DOWNTO 160) &
		389	data_f2_out((162)-1 DOWNTO 161) ;
		390
		391	data_f3_out_swap <= data_f3_out((165)-1 DOWNTO 164) &
		392	data_f3_out((166)-1 DOWNTO 165) &
		393	data_f3_out((163)-1 DOWNTO 162) &
		394	data_f3_out((164)-1 DOWNTO 163) &
		395	data_f3_out((161)-1 DOWNTO 160) &
		396	data_f3_out((162)-1 DOWNTO 161) ;
		397
365	all_bit_of_data_out : FOR I IN 95 DOWNTO 0 GENERATE	398	all_bit_of_data_out : FOR I IN 95 DOWNTO 0 GENERATE
366	data_out(0, I) <= data_f0_out(I);	399	data_out(0, I) <= data_f0_out_swap(I);
367	data_out(1, I) <= data_f1_out(I);	400	data_out(1, I) <= data_f1_out_swap(I);
368	data_out(2, I) <= data_f2_out(I);	401	data_out(2, I) <= data_f2_out_swap(I);
369	data_out(3, I) <= data_f3_out(I);	402	data_out(3, I) <= data_f3_out_swap(I);
370	END GENERATE all_bit_of_data_out;	403	END GENERATE all_bit_of_data_out;
371		404
372	-----------------------------------------------------------------------------	405	-----------------------------------------------------------------------------
373	-- TODO : debug	406	-- TODO : debug
374	-----------------------------------------------------------------------------	407	-----------------------------------------------------------------------------

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