Changeset 63 for trunk/MultiChannelUSB/Paella.v

Timestamp:

Sep 23, 2009, 9:46:50 PM (15 years ago)

Author:

demin

Message:

add parameters for number of channels and channel resolution

File:

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

trunk/MultiChannelUSB/Paella.v

@@ -7 +7 @@
                 inout   wire    [6:0]   CON_A,
                 inout   wire    [15:0]  CON_B,
-                inout   wire    [12:0]  CON_C,
+                input   wire    [12:0]  CON_C,
                 input   wire    [1:0]   CON_BCLK,
                 input   wire    [1:0]   CON_CCLK,
@@ -51 +51 @@
         assign  CON_A           =       7'bz;
         assign  CON_B           =       16'bz;
-        assign  CON_C           =       13'bz;
         assign  USB_PA0         =       1'bz;
         assign  USB_PA1         =       1'bz;
@@ -129 +128 @@
     wire        [1:0]   uwt_flag [3:0];
     
+    wire        [16:0]  osc_thrs [3:0];
+    wire                        adc_pola [3:0];
+
+    assign      osc_thrs[0] = 16'd40;
+    assign      osc_thrs[1] = 16'd300;
+    assign      osc_thrs[2] = 16'd40;
+    assign      osc_thrs[3] = 16'd1650;
+
+    assign      adc_pola[0] = 1'b1;
+    assign      adc_pola[1] = 1'b1;
+    assign      adc_pola[2] = 1'b1;
+    assign      adc_pola[3] = 1'b0;
+
     assign      adc_clk[0] = ADC_FCO;
     assign      adc_clk[1] = ADC_FCO;
     assign      adc_clk[2] = ADC_FCO;
-    
-    assign      adc_clk[3] = CON_B[0];
-    assign      adc_data[3] = CON_B[12:1];
+
+    assign      adc_clk[3] = ADC_FCO;
+/*    
+    assign      adc_clk[3] = CON_CCLK[0];
+    assign      adc_data[3] = CON_C[11:0];
+*/
+        adc_para adc_para_unit (
+                .lvds_dco(ADC_DCO),
+                .lvds_fco(ADC_FCO),
+                .para_data_ready(CON_CCLK[0]),
+                .para_data(CON_C[11:0]),
+                .adc_data(adc_data[3]));
+
 /* 
         wire                    adc_pll_clk;
@@ -147 +169 @@
 
         test test_unit(
-                .inclk0(CLK_50MHz),
+                .clk(CLK_50MHz),
                 .tst_clk(tst_adc_clk),
                 .tst_data(tst_adc_data));
@@ -168 +190 @@
 */
 
-        adc_lvds adc_lvds_unit (
+        adc_lvds #(
+                .size(3),
+                .width(12)) adc_lvds_unit (
                 .lvds_dco(ADC_DCO),
 //              .lvds_dco(adc_pll_clk),
                 .lvds_fco(ADC_FCO),
                 .lvds_d(ADC_D),
-                .adc_db(adc_data[2]),
-                .adc_dc(adc_data[1]),
-                .adc_dd(adc_data[0]));
+                .adc_data({     adc_data[0],
+                                        adc_data[1],
+                                        adc_data[2]}));
  
         genvar i;
         generate
-                for (i = 2; i < 4; i = i + 1)
+                for (i = 1; i < 4; i = i + 1)
                 begin : MCA_CHAIN
                         adc_fifo adc_fifo_unit (
                                 .adc_clk(adc_clk[i]),
                                 .adc_data(adc_data[i]),
+                                .polarity(adc_pola[i]),
                                 .clk(CLK_50MHz),
                                 .ready(adc_data_ready[i]),
@@ -203 +228 @@
                                 .reset(hst_reset[i]),
                                 .data_ready(adc_data_ready[i]),
-//                              .data(raw_data[i]),
-                                .data(uwt_data[i]),
+                                .data(raw_data[i]),
+//                              .data(uwt_data[i]),
                                 .address(hst_addr[i]),
                                 .q(hst_q[i]));
@@ -222 +247 @@
                                 .raw_data(raw_data[i]),
                                 .uwt_data(uwt_data[i]),
-                                .threshold(16'd40),
+                                .threshold(osc_thrs[i]),
                                 .address(osc_addr[i]),
                                 .start_address(osc_start_addr[i]),