Changeset 184 for trunk/3DEES/Paella.v

Timestamp:

Jan 27, 2014, 3:49:22 PM (11 years ago)

Author:

demin

Message:

fix classifier

File:

• trunk/3DEES/Paella.v (modified) (5 diffs)

trunk/3DEES/Paella.v

@@ -94 +94 @@
 
         wire                    cls_flag;
-        wire    [5:0]   cls_data;
+        wire    [6:0]   cls_data;
 
         wire    [1:0]   amp_mux_flag [2:0];
@@ -200 +200 @@
                         assign int_mux_data[j] = {
 //                              {4'd0, cls_flag, 7'd0},
-                                {6'd0, cls_data},
+                                {5'd0, cls_data},
                                 {4'd0, amp_flag[j][0], 7'd0},
                                 amp_data[j][11:0],
@@ -292 +292 @@
                                 .reset(1'b0),
 //                              .del_data({6'd0, 6'd32, 6'd32, 6'd32}),
-                                .del_data({6'd0, cfg_bits[35+6*j][5:0], cfg_bits[33+6*j][5:0], cfg_bits[31+6*j][5:0]}),
+                                .del_data({6'd0, cfg_bits[39+6*j][5:0], cfg_bits[37+6*j][5:0], cfg_bits[35+6*j][5:0]}),
                                 .amp_data({6'd0, 6'd20, 6'd20, 6'd20}),
 //                              .tau_data({16'd0, 16'd19835, 16'd19835, 16'd19835}),
 // exp(-32/1000)*1024*20
-                                .tau_data({16'd0, cfg_bits[34+6*j], cfg_bits[32+6*j], cfg_bits[30+6*j]}),
+                                .tau_data({16'd0, cfg_bits[38+6*j], cfg_bits[36+6*j], cfg_bits[34+6*j]}),
                                 .inp_data({
                                         19'd0, cic_data[j*3+2][18:0], cic_data[j*3+1][18:0], cic_data[j*3+0][18:0]}),
@@ -340 +340 @@
 //                      12'd20, 12'd20, 12'd20, 12'd20, 12'd2000, 12'd20,
 //                      12'd20, 12'd2000, 12'd2000, 12'd20, 12'd1000, 12'd1000}),
-                .cfg_data({cfg_bits[29][11:0], cfg_bits[28][11:0],
+                .cfg_data({cfg_bits[33][11:0], cfg_bits[32][11:0],
+                        cfg_bits[31][11:0], cfg_bits[30][11:0], cfg_bits[29][11:0], cfg_bits[28][11:0],
                         cfg_bits[27][11:0], cfg_bits[26][11:0], cfg_bits[25][11:0], cfg_bits[24][11:0], 
                         cfg_bits[23][11:0], cfg_bits[22][11:0], cfg_bits[21][11:0], cfg_bits[20][11:0],
@@ -356 +357 @@
                 .reset(cfg_bits[0][5]),
                 .hst_good(cls_flag & cfg_bits[6][0]),
-                .hst_data(cls_data),
+                .hst_data(cls_data[5:0]),
                 .bus_ssel(bus_ssel[2]),
                 .bus_wren(bus_wren),