ad9652- iqcor iqsel changes

main
Rejeesh Kutty 2015-07-24 08:35:13 -04:00
parent 144b8f7383
commit caca364c61
1 changed files with 7 additions and 9 deletions

View File

@ -110,8 +110,7 @@ module axi_ad9652_channel (
// internal signals // internal signals
wire [15:0] adc_dcfilter_data_i_s; wire [15:0] adc_dcfilter_data_s;
wire [15:0] adc_dcfilter_data_q_s;
wire adc_iqcor_enb_s; wire adc_iqcor_enb_s;
wire adc_dcfilt_enb_s; wire adc_dcfilt_enb_s;
wire [15:0] adc_dcfilt_offset_s; wire [15:0] adc_dcfilt_offset_s;
@ -124,9 +123,6 @@ module axi_ad9652_channel (
// iq correction inputs // iq correction inputs
assign adc_dcfilter_data_i_s = (IQSEL == 1) ? adc_dcfilter_data_in : adc_dcfilter_data_out;
assign adc_dcfilter_data_q_s = (IQSEL == 1) ? adc_dcfilter_data_out : adc_dcfilter_data_in;
axi_ad9652_pnmon i_pnmon ( axi_ad9652_pnmon i_pnmon (
.adc_clk (adc_clk), .adc_clk (adc_clk),
.adc_data (adc_data), .adc_data (adc_data),
@ -143,22 +139,24 @@ module axi_ad9652_channel (
.valid (1'b1), .valid (1'b1),
.data (adc_data), .data (adc_data),
.valid_out (), .valid_out (),
.data_out (adc_dcfilter_data_out), .data_out (adc_dcfilter_data_s),
.dcfilt_enb (adc_dcfilt_enb_s), .dcfilt_enb (adc_dcfilt_enb_s),
.dcfilt_coeff (adc_dcfilt_coeff_s), .dcfilt_coeff (adc_dcfilt_coeff_s),
.dcfilt_offset (adc_dcfilt_offset_s)); .dcfilt_offset (adc_dcfilt_offset_s));
end end
endgenerate endgenerate
assign adc_dcfilter_data_out = adc_dcfilter_data_s;
generate generate
if (DP_DISABLE == 1) begin if (DP_DISABLE == 1) begin
assign adc_iqcor_data = (IQSEL == 1) ? adc_dcfilter_data_q_s : adc_dcfilter_data_i_s; assign adc_iqcor_data = adc_dcfilter_data_s;
end else begin end else begin
ad_iqcor #(.IQSEL(IQSEL)) i_ad_iqcor ( ad_iqcor #(.IQSEL(IQSEL)) i_ad_iqcor (
.clk (adc_clk), .clk (adc_clk),
.valid (1'b1), .valid (1'b1),
.data_i (adc_dcfilter_data_i_s), .data_in (adc_dcfilter_data_s),
.data_q (adc_dcfilter_data_q_s), .data_iq (adc_dcfilter_data_in),
.valid_out (), .valid_out (),
.data_out (adc_iqcor_data), .data_out (adc_iqcor_data),
.iqcor_enable (adc_iqcor_enb_s), .iqcor_enable (adc_iqcor_enb_s),