ad9643- iqcor iqsel changes

main
Rejeesh Kutty 2015-07-24 08:34:52 -04:00
parent 649297a0e3
commit 144b8f7383
1 changed files with 7 additions and 11 deletions

View File

@ -34,8 +34,6 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// *************************************************************************** // ***************************************************************************
// *************************************************************************** // ***************************************************************************
// ***************************************************************************
// ***************************************************************************
// ADC channel- // ADC channel-
`timescale 1ns/100ps `timescale 1ns/100ps
@ -111,8 +109,7 @@ module axi_ad9643_channel (
// internal signals // internal signals
wire [15:0] adc_dfmt_data_s; wire [15:0] adc_dfmt_data_s;
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 adc_dfmt_se_s; wire adc_dfmt_se_s;
@ -128,9 +125,6 @@ module axi_ad9643_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_ad9643_pnmon i_pnmon ( axi_ad9643_pnmon i_pnmon (
.adc_clk (adc_clk), .adc_clk (adc_clk),
.adc_data (adc_data), .adc_data (adc_data),
@ -163,22 +157,24 @@ module axi_ad9643_channel (
.valid (1'b1), .valid (1'b1),
.data (adc_dfmt_data_s), .data (adc_dfmt_data_s),
.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),