Changeset 75

Timestamp:

Nov 26, 2009, 12:16:08 AM (15 years ago)

Author:

demin

Message:

fix osc_mux and trg_mux

File:

• trunk/MultiChannelUSB/Paella.v (modified) (3 diffs)

trunk/MultiChannelUSB/Paella.v

@@ -280 +280 @@
                         assign osc_mux_sel[i] = cfg_memory[20+i][3:0];
                         assign trg_mux_sel[i] = cfg_memory[20+i][7:4];
-                        assign hst_mux_sel[i] = cfg_memory[20+i][11:8];
-                        assign bln_mux_sel[i] = cfg_memory[20+i][15:12];
+
+                        assign hst_mux_sel[i] = cfg_memory[23+i][3:0];
+                        assign bln_mux_sel[i] = cfg_memory[23+i][7:4];
 
                         adc_fifo adc_fifo_unit (
@@ -320 +321 @@
 
                         lpm_mux #(
-                                .lpm_size(4),
+                                .lpm_size(5),
                                 .lpm_type("LPM_MUX"),
                                 .lpm_width(12),
-                                .lpm_widths(2)) osc_mux_unit (
-                                .sel(osc_mux_sel[i][1:0]),
-                                .data({ uwt_a3[i][20:9],
+                                .lpm_widths(3)) osc_mux_unit (
+                                .sel(osc_mux_sel[i][2:0]),
+                                .data({ bln_baseline[i],
+                                                uwt_a3[i][20:9],
                                                 uwt_a2[i][17:6],
                                                 uwt_a1[i][14:3],
@@ -332 +334 @@
 
                         lpm_mux #(
-                                .lpm_size(4),
+                                .lpm_size(5),
                                 .lpm_type("LPM_MUX"),
                                 .lpm_width(12),
-                                .lpm_widths(2)) trg_mux_unit (
-                                .sel(trg_mux_sel[i][1:0]),
-                                .data({ uwt_a3[i][20:9],
+                                .lpm_widths(3)) trg_mux_unit (
+                                .sel(trg_mux_sel[i][2:0]),
+                                .data({ bln_baseline[i],
+                                                uwt_a3[i][20:9],
                                                 uwt_a2[i][17:6],
                                                 uwt_a1[i][14:3],