HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r183:cf9b1db95735

temp

pellion -

r183:cf9b1db95735 paul

parent child

Context file:

r183:cf9b1db95735

lib/lpp/dirs.txt +3 -3

             ./amba_lcd_16x2_ctrlr
-            ./dsp/iir_filter
-            ./dsp/lpp_downsampling
-            ./dsp/lpp_fft
             ./general_purpose
             ./general_purpose/lpp_AMR
             ./general_purpose/lpp_balise
             ./general_purpose/lpp_delay
+            ./dsp/iir_filter
+            ./dsp/lpp_downsampling
+            ./dsp/lpp_fft
             ./lfr_time_management
             ./lpp_ad_Conv
             ./lpp_amba

lib/lpp/dsp/iir_filter/RAM_CTRLR_v2.vhd +1 -1

@@ -117,4 +117,4 BEGIN
117	STD_LOGIC_VECTOR(UNSIGNED(counter));	117	STD_LOGIC_VECTOR(UNSIGNED(counter));
118		118
119		119
120	END ar_RAM_CTRLR_v2;	120	END ar_RAM_CTRLR_v2; No newline at end of file

lib/lpp/lfr_time_management/apb_lfr_time_management.vhd +3 -3

                   END IF;
                 END IF;
-                apbo.pconfig <= pconfig;
               END PROCESS;
-              apbo.prdata <= Rdata WHEN apbi.penable = '1';
+              apbo.prdata <= Rdata ;--WHEN apbi.penable = '1';
               coarse_time <= r.coarse_time;
               fine_time   <= r.fine_time;
+              apbo.pconfig <= pconfig;
-            END Behavioral;
+            END Behavioral;
  No newline at end of file

lib/lpp/lpp_ad_Conv/AD7688_drvr.vhd +1 -2

                       --shift_reg(l)(15)          <= sdo(l);
                       --shift_reg(l)(14 DOWNTO 0) <= shift_reg(l)(15 DOWNTO 1);
                       shift_reg(l)(0)           <= sdo(l);
-                      shift_reg(l)(15 DOWNTO 1) <= shift_reg(l)(14 DOWNTO 0);
+                      shift_reg(l)(14 DOWNTO 1) <= shift_reg(l)(13 DOWNTO 0);
                     END LOOP;
                     SCK <= '0';
                   ELSE
               END PROCESS;
             END ar_AD7688_drvr;

lib/lpp/lpp_top_lfr/lpp_top_apbreg.vhd +1 -1

@@ -405,4 +405,4 BEGIN -- beh
405	apbo.prdata <= prdata;	405	apbo.prdata <= prdata;
406		406
407		407
408	END beh;	408	END beh; No newline at end of file

lib/lpp/lpp_top_lfr/lpp_top_lfr_wf_picker.vhd +12 -4

             ENTITY lpp_top_lfr_wf_picker IS
               GENERIC (
                 hindex                 : INTEGER := 2;
-                pindex                 : INTEGER := 4;
+                pindex                 : INTEGER := 15;
-                paddr  : INTEGER := 4;
+                paddr  : INTEGER := 15;
                 pmask  : INTEGER := 16#fff#;
-                pirq   : INTEGER := 0;
+                pirq   : INTEGER := 15;
                 tech                   : INTEGER := 0;
                 nb_burst_available_size : INTEGER := 11;
                 nb_snapshot_param_size  : INTEGER := 11;
             BEGIN
+            	ready_matrix_f0_0 <= '0';
+            	ready_matrix_f0_1 <= '0';
+            	ready_matrix_f1 <= '0';
+            	ready_matrix_f2 <= '0';
+              	error_anticipating_empty_fifo <= '0';
+              	error_bad_component_error <= '0';
+              	debug_reg <= (others => '0');
               lpp_top_apbreg_1: lpp_top_apbreg
                 GENERIC MAP (
                   nb_burst_available_size => nb_burst_available_size,
                   addr_data_f1       => addr_data_f1,
                   addr_data_f2       => addr_data_f2,
                   addr_data_f3       => addr_data_f3);
-            END tb;
+            END tb;
  No newline at end of file

lib/lpp/lpp_waveform/lpp_waveform_dma.vhd +3 -3

                                              SEND_TIME_1, WAIT_TIME_1,
                                              SEND_5_TIME,
                                              SEND_DATA, WAIT_DATA);
-              SIGNAL state                : state_DMAWriteBurst := IDLE;
+              SIGNAL state                : state_DMAWriteBurst;
               -----------------------------------------------------------------------------
               -- CONTROL
               SIGNAL sel_data_s           : STD_LOGIC_VECTOR(1 DOWNTO 0);
                 GENERIC MAP (
                   hindex   => hindex,
                   vendorid => VENDOR_LPP,
-                  deviceid => 0,
+                  deviceid => 10,
                   version  => 0,
                   syncrst  => 1,
                   boundary => 1)                    -- FIX 11/01/2013
               -----------------------------------------------------------------------------
-            END Behavioral;
+            END Behavioral;
  No newline at end of file

lib/lpp/lpp_waveform/lpp_waveform_snapshot_controler.vhd +1 -3

               SIGNAL coarse_time_0_r : STD_LOGIC;
               SIGNAL start_snapshot_f2_temp : STD_LOGIC;
               SIGNAL start_snapshot_fothers_temp : STD_LOGIC;
-              SIGNAL start_snapshot_fothers_temp2 : STD_LOGIC;
             BEGIN  -- beh
               PROCESS (clk, rstn)
                   coarse_time_0_r <=  '0';
                   start_snapshot_f2_temp <=  '0';
                   start_snapshot_fothers_temp <=  '0';
-                  start_snapshot_fothers_temp2 <=  '0';
                 ELSIF clk'EVENT AND clk = '1' THEN
                   IF counter_delta_snapshot = UNSIGNED(delta_snapshot) THEN
                     start_snapshot_f2_temp <=   '1';
                 END IF;
               END PROCESS;
-            END beh;
+            END beh;
  No newline at end of file

General Comments 0

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

No TODOs yet

	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