From d69ccebbde678c77d71c2e789e9cc17ef606e05f Mon Sep 17 00:00:00 2001 From: Rejeesh Kutty Date: Wed, 5 Nov 2014 11:58:15 -0500 Subject: [PATCH] ad9234: full 16bit samples --- library/axi_ad9234/axi_ad9234_channel.v | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/library/axi_ad9234/axi_ad9234_channel.v b/library/axi_ad9234/axi_ad9234_channel.v index 000d19e52..90bed3e0e 100644 --- a/library/axi_ad9234/axi_ad9234_channel.v +++ b/library/axi_ad9234/axi_ad9234_channel.v @@ -107,9 +107,6 @@ module axi_ad9234_channel ( wire adc_pn_oos_s; wire adc_pn_err_s; - wire adc_dfmt_enable_s; - wire adc_dfmt_type_s; - wire adc_dfmt_se_s; wire [ 3:0] adc_pnseq_sel_s; // instantiations @@ -121,20 +118,7 @@ module axi_ad9234_channel ( .adc_pn_err (adc_pn_err_s), .adc_pnseq_sel (adc_pnseq_sel_s)); - genvar n; - generate - for (n = 0; n < 4; n = n + 1) begin: g_ad_datafmt_1 - ad_datafmt #(.DATA_WIDTH(12)) i_ad_datafmt ( - .clk (adc_clk), - .valid (1'b1), - .data (adc_data[n*12+11:n*12]), - .valid_out (), - .data_out (adc_dfmt_data[n*16+15:n*16]), - .dfmt_enable (adc_dfmt_enable_s), - .dfmt_type (adc_dfmt_type_s), - .dfmt_se (adc_dfmt_se_s)); - end - endgenerate + assign adc_dfmt_data = adc_data; up_adc_channel #(.PCORE_ADC_CHID(CHID)) i_up_adc_channel ( .adc_clk (adc_clk), @@ -142,9 +126,9 @@ module axi_ad9234_channel ( .adc_enable (adc_enable), .adc_iqcor_enb (), .adc_dcfilt_enb (), - .adc_dfmt_se (adc_dfmt_se_s), - .adc_dfmt_type (adc_dfmt_type_s), - .adc_dfmt_enable (adc_dfmt_enable_s), + .adc_dfmt_se (), + .adc_dfmt_type (), + .adc_dfmt_enable (), .adc_dcfilt_offset (), .adc_dcfilt_coeff (), .adc_iqcor_coeff_1 (),