@@ -426,7 +426,7 BEGIN -- beh | |||
|
426 | 426 | pirq_ms => 6, |
|
427 | 427 | pirq_wfp => 14, |
|
428 | 428 | hindex => 2, |
|
429 |
top_lfr_version => X"00010 |
|
|
429 | top_lfr_version => X"00010D") -- aa.bb.cc version | |
|
430 | 430 | PORT MAP ( |
|
431 | 431 | clk => clk_25, |
|
432 | 432 | rstn => reset, |
@@ -185,7 +185,8 BEGIN | |||
|
185 | 185 | ----------------------------------------------------------------------------- |
|
186 | 186 | -- SEND 16 word by DMA (in burst mode) |
|
187 | 187 | ----------------------------------------------------------------------------- |
|
188 | data_2_halfword(31 DOWNTO 0) <= data(15 DOWNTO 0) & data (31 DOWNTO 16); | |
|
188 | --data_2_halfword(31 DOWNTO 0) <= data(15 DOWNTO 0) & data (31 DOWNTO 16); | |
|
189 | data_2_halfword(31 DOWNTO 0) <= data(31 DOWNTO 0); | |
|
189 | 190 | |
|
190 | 191 | lpp_dma_send_16word_1 : lpp_dma_send_16word |
|
191 | 192 | PORT MAP ( |
@@ -178,8 +178,8 BEGIN | |||
|
178 | 178 | ELSIF HCLK'EVENT AND HCLK = '1' THEN |
|
179 | 179 | -- |
|
180 | 180 | debug_reg_s(3) <= status_ready_matrix_f0; |
|
181 |
debug_reg_s(4) <= status_ready_matrix_f |
|
|
182 |
debug_reg_s(5) <= status_ready_matrix_f |
|
|
181 | debug_reg_s(4) <= status_ready_matrix_f1; | |
|
182 | debug_reg_s(5) <= status_ready_matrix_f2; | |
|
183 | 183 | debug_reg_s(6) <= '0'; |
|
184 | 184 | debug_reg_s(7) <= '0'; |
|
185 | 185 | debug_reg_s(8) <= '0'; |
@@ -168,6 +168,11 ARCHITECTURE beh OF lpp_waveform IS | |||
|
168 | 168 | SIGNAL data_f2_out : STD_LOGIC_VECTOR(data_size-1 DOWNTO 0); |
|
169 | 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 | 176 | SIGNAL data_f0_out_valid : STD_LOGIC; |
|
172 | 177 | SIGNAL data_f1_out_valid : STD_LOGIC; |
|
173 | 178 | SIGNAL data_f2_out_valid : STD_LOGIC; |
@@ -362,11 +367,39 BEGIN -- beh | |||
|
362 | 367 | error => status_new_err(I)); |
|
363 | 368 | END GENERATE all_input_valid; |
|
364 | 369 | |
|
370 | data_f0_out_swap <= data_f0_out((16*5)-1 DOWNTO 16*4) & | |
|
371 | data_f0_out((16*6)-1 DOWNTO 16*5) & | |
|
372 | data_f0_out((16*3)-1 DOWNTO 16*2) & | |
|
373 | data_f0_out((16*4)-1 DOWNTO 16*3) & | |
|
374 | data_f0_out((16*1)-1 DOWNTO 16*0) & | |
|
375 | data_f0_out((16*2)-1 DOWNTO 16*1) ; | |
|
376 | ||
|
377 | data_f1_out_swap <= data_f1_out((16*5)-1 DOWNTO 16*4) & | |
|
378 | data_f1_out((16*6)-1 DOWNTO 16*5) & | |
|
379 | data_f1_out((16*3)-1 DOWNTO 16*2) & | |
|
380 | data_f1_out((16*4)-1 DOWNTO 16*3) & | |
|
381 | data_f1_out((16*1)-1 DOWNTO 16*0) & | |
|
382 | data_f1_out((16*2)-1 DOWNTO 16*1) ; | |
|
383 | ||
|
384 | data_f2_out_swap <= data_f2_out((16*5)-1 DOWNTO 16*4) & | |
|
385 | data_f2_out((16*6)-1 DOWNTO 16*5) & | |
|
386 | data_f2_out((16*3)-1 DOWNTO 16*2) & | |
|
387 | data_f2_out((16*4)-1 DOWNTO 16*3) & | |
|
388 | data_f2_out((16*1)-1 DOWNTO 16*0) & | |
|
389 | data_f2_out((16*2)-1 DOWNTO 16*1) ; | |
|
390 | ||
|
391 | data_f3_out_swap <= data_f3_out((16*5)-1 DOWNTO 16*4) & | |
|
392 | data_f3_out((16*6)-1 DOWNTO 16*5) & | |
|
393 | data_f3_out((16*3)-1 DOWNTO 16*2) & | |
|
394 | data_f3_out((16*4)-1 DOWNTO 16*3) & | |
|
395 | data_f3_out((16*1)-1 DOWNTO 16*0) & | |
|
396 | data_f3_out((16*2)-1 DOWNTO 16*1) ; | |
|
397 | ||
|
365 | 398 |
|
|
366 | data_out(0, I) <= data_f0_out(I); | |
|
367 | data_out(1, I) <= data_f1_out(I); | |
|
368 | data_out(2, I) <= data_f2_out(I); | |
|
369 | data_out(3, I) <= data_f3_out(I); | |
|
399 | data_out(0, I) <= data_f0_out_swap(I); | |
|
400 | data_out(1, I) <= data_f1_out_swap(I); | |
|
401 | data_out(2, I) <= data_f2_out_swap(I); | |
|
402 | data_out(3, I) <= data_f3_out_swap(I); | |
|
370 | 403 | END GENERATE all_bit_of_data_out; |
|
371 | 404 | |
|
372 | 405 |
|
General Comments 0
You need to be logged in to leave comments.
Login now