Changeset 161 for trunk/MultiChannelUSB/Paella.v

Timestamp:

Jan 24, 2012, 11:16:15 AM (13 years ago)

Author:

demin

Message:

add multiplexers for spectrum and rate histograms

File:

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

trunk/MultiChannelUSB/Paella.v

@@ -119 +119 @@
         wire    [11:0]  amp_data [2*N-1:0];
 
+        wire    [1:0]   amp_mux_flag [1:0];
+        wire    [11:0]  amp_mux_data [1:0];
+
         wire                    cnt_good [N-1:0];
         wire    [15:0]  cnt_bits_wire;
@@ -219 +222 @@
                 .data({int_mux_data[2], int_mux_data[1], int_mux_data[0]}),
                 .result(trg_mux_data));
+
+        lpm_mux #(
+                .lpm_size(3),
+                .lpm_type("LPM_MUX"),
+                .lpm_width(14),
+                .lpm_widths(2)) amp_mux_unit_1 (
+                .sel(cfg_bits[8][1:0]),
+                .data({
+                        {amp_flag[4], amp_data[4]},
+                        {amp_flag[2], amp_data[2]},
+                        {amp_flag[0], amp_data[0]}}),
+                .result({amp_mux_flag[0], amp_mux_data[0]}));
+
+        lpm_mux #(
+                .lpm_size(3),
+                .lpm_type("LPM_MUX"),
+                .lpm_width(14),
+                .lpm_widths(2)) amp_mux_unit_2 (
+                .sel(cfg_bits[8][5:4]),
+                .data({
+                        {amp_flag[5], amp_data[5]},
+                        {amp_flag[3], amp_data[3]},
+                        {amp_flag[1], amp_data[1]}}),
+                .result({amp_mux_flag[1], amp_mux_data[1]}));
 
         generate
@@ -302 +329 @@
                                 .frame(sys_frame),
                                 .reset(1'b0),
-                                .cfg_data(cfg_bits[6+2*j][11:0]),
+                                .cfg_data(cfg_bits[6][11:0]),
+//                              .cfg_data(cfg_bits[6+2*j][11:0]),
                                 .inp_data(clp_data[j]),
                                 .out_flag(amp_flag[0+2*j]),
@@ -311 +339 @@
                                 .frame(sys_frame),
                                 .reset(1'b0),
-                                .cfg_data(cfg_bits[7+2*j][11:0]),
+                                .cfg_data(cfg_bits[7][11:0]),
+//                              .cfg_data(cfg_bits[7+2*j][11:0]),
                                 .inp_data(clp_data[j]),
                                 .out_flag(amp_flag[1+2*j]),
@@ -323 +352 @@
                 .frame(sys_frame),
                 .reset(cfg_bits[0][5]),
-                .hst_good((amp_flag[0][0]) & (cnt_good[0]) & (cfg_bits[13][1])),
-                .hst_data(amp_data[0]),
-/*
-                .hst_good((amp_flag[j]) & (cnt_good[j]) & (cfg_bits[13][1])),
-                .hst_data(amp_data[j]),
-*/
+                .hst_good((amp_mux_flag[0][0]) & (cnt_good[0]) & (cfg_bits[13][1])),
+                .hst_data(amp_mux_data[0]),
                 .bus_ssel(bus_ssel[2]),
                 .bus_wren(bus_wren),
@@ -338 +363 @@
         counter hst_counter_unit (
                 .clock(sys_clock),
-                .frame((sys_frame) & (~amp_flag[0][1])),
+                .frame((sys_frame) & (~amp_mux_flag[0][1])),
 //              .frame(sys_frame),
                 .reset(cfg_bits[0][8]),
@@ -366 +391 @@
         counter rmt_counter_1 (
                 .clock(sys_clock),
-                .frame((sys_frame) & (~amp_flag[1][1])),
+                .frame((sys_frame) & (~amp_mux_flag[1][1])),
 //              .frame(sys_frame),
                 .reset(cfg_bits[0][12]),
@@ -400 +425 @@
                 .sclr(((sys_frame) & (cnt_good[2]) & (~cnt_good[1])) | (cfg_bits[0][11])),
                 .clock(sys_clock),
-                .cnt_en((sys_frame) & (amp_flag[1][0]) & (cnt_good[1]) & (cnt_good[2]) & (cfg_bits[16][1])),
+                .cnt_en((sys_frame) & (amp_mux_flag[1][0]) & (cnt_good[1]) & (cnt_good[2]) & (cfg_bits[16][1])),
                 .q(cnt_bits_wire));