From 68371431103b3d885393b1c554669e4dd7bd592e Mon Sep 17 00:00:00 2001 From: Rejeesh Kutty Date: Fri, 23 Sep 2016 13:44:47 -0400 Subject: [PATCH] library/ adc parameter changes --- library/axi_ad6676/axi_ad6676_channel.v | 2 +- library/axi_ad9234/axi_ad9234_channel.v | 2 +- library/axi_ad9250/axi_ad9250_channel.v | 2 +- library/axi_ad9265/axi_ad9265_channel.v | 2 +- library/axi_ad9371/axi_ad9371_rx.v | 2 +- library/axi_ad9371/axi_ad9371_rx_channel.v | 4 ++-- library/axi_ad9371/axi_ad9371_rx_os.v | 2 +- library/axi_ad9434/axi_ad9434_core.v | 2 +- library/axi_ad9467/axi_ad9467_channel.v | 2 +- library/axi_ad9625/axi_ad9625_channel.v | 2 +- library/axi_ad9643/axi_ad9643_channel.v | 2 +- library/axi_ad9652/axi_ad9652_channel.v | 2 +- library/axi_ad9671/axi_ad9671_channel.v | 2 +- library/axi_ad9680/axi_ad9680_channel.v | 2 +- library/axi_ad9684/axi_ad9684_channel.v | 2 +- library/axi_generic_adc/axi_generic_adc.v | 2 +- library/axi_mc_current_monitor/axi_mc_current_monitor.v | 6 +++--- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/library/axi_ad6676/axi_ad6676_channel.v b/library/axi_ad6676/axi_ad6676_channel.v index 69b4c273c..63299c6ff 100755 --- a/library/axi_ad6676/axi_ad6676_channel.v +++ b/library/axi_ad6676/axi_ad6676_channel.v @@ -120,7 +120,7 @@ module axi_ad6676_channel ( assign adc_dfmt_data = adc_data; - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9234/axi_ad9234_channel.v b/library/axi_ad9234/axi_ad9234_channel.v index 0c3878127..6bb5c98dd 100644 --- a/library/axi_ad9234/axi_ad9234_channel.v +++ b/library/axi_ad9234/axi_ad9234_channel.v @@ -120,7 +120,7 @@ module axi_ad9234_channel ( assign adc_dfmt_data = adc_data; - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9250/axi_ad9250_channel.v b/library/axi_ad9250/axi_ad9250_channel.v index c5e6b2e6b..41c766ad9 100644 --- a/library/axi_ad9250/axi_ad9250_channel.v +++ b/library/axi_ad9250/axi_ad9250_channel.v @@ -136,7 +136,7 @@ module axi_ad9250_channel ( end endgenerate - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9265/axi_ad9265_channel.v b/library/axi_ad9265/axi_ad9265_channel.v index 7c4504b0f..cb5e76bca 100644 --- a/library/axi_ad9265/axi_ad9265_channel.v +++ b/library/axi_ad9265/axi_ad9265_channel.v @@ -159,7 +159,7 @@ module axi_ad9265_channel ( end endgenerate - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9371/axi_ad9371_rx.v b/library/axi_ad9371/axi_ad9371_rx.v index a0f5e6b12..6d37e9577 100644 --- a/library/axi_ad9371/axi_ad9371_rx.v +++ b/library/axi_ad9371/axi_ad9371_rx.v @@ -296,7 +296,7 @@ module axi_ad9371_rx ( // common processor control up_adc_common #( - .ADC_COMMON_ID ('h00), + .COMMON_ID ('h00), .ID (ID)) i_up_adc_common ( .mmcm_rst (), diff --git a/library/axi_ad9371/axi_ad9371_rx_channel.v b/library/axi_ad9371/axi_ad9371_rx_channel.v index 9c47e188b..040a6180c 100644 --- a/library/axi_ad9371/axi_ad9371_rx_channel.v +++ b/library/axi_ad9371/axi_ad9371_rx_channel.v @@ -201,8 +201,8 @@ module axi_ad9371_rx_channel ( endgenerate up_adc_channel #( - .ADC_COMMON_ID (COMMON_ID), - .ADC_CHANNEL_ID (CHANNEL_ID)) + .COMMON_ID (COMMON_ID), + .CHANNEL_ID (CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), diff --git a/library/axi_ad9371/axi_ad9371_rx_os.v b/library/axi_ad9371/axi_ad9371_rx_os.v index 8bbb1afc9..81304a5c5 100644 --- a/library/axi_ad9371/axi_ad9371_rx_os.v +++ b/library/axi_ad9371/axi_ad9371_rx_os.v @@ -213,7 +213,7 @@ module axi_ad9371_rx_os ( // common processor control up_adc_common #( - .ADC_COMMON_ID ('h20), + .COMMON_ID ('h20), .ID (ID)) i_up_adc_common ( .mmcm_rst (), diff --git a/library/axi_ad9434/axi_ad9434_core.v b/library/axi_ad9434/axi_ad9434_core.v index e0f614b40..84d6c2203 100644 --- a/library/axi_ad9434/axi_ad9434_core.v +++ b/library/axi_ad9434/axi_ad9434_core.v @@ -246,7 +246,7 @@ module axi_ad9434_core ( .up_rack (up_rack_s[0])); up_adc_channel #( - .ADC_CHANNEL_ID(0)) + .CHANNEL_ID(0)) i_adc_channel( .adc_clk (adc_clk), .adc_rst (adc_rst), diff --git a/library/axi_ad9467/axi_ad9467_channel.v b/library/axi_ad9467/axi_ad9467_channel.v index 75eb42672..4ecb883f0 100644 --- a/library/axi_ad9467/axi_ad9467_channel.v +++ b/library/axi_ad9467/axi_ad9467_channel.v @@ -127,7 +127,7 @@ module axi_ad9467_channel( .dfmt_type(adc_dfmt_type_s), .dfmt_se(adc_dfmt_se_s)); - up_adc_channel #(.ADC_CHANNEL_ID(0)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(0)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9625/axi_ad9625_channel.v b/library/axi_ad9625/axi_ad9625_channel.v index 1b9c38960..e2f8460fc 100644 --- a/library/axi_ad9625/axi_ad9625_channel.v +++ b/library/axi_ad9625/axi_ad9625_channel.v @@ -131,7 +131,7 @@ module axi_ad9625_channel ( end endgenerate - up_adc_channel #(.ADC_CHANNEL_ID(0)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(0)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9643/axi_ad9643_channel.v b/library/axi_ad9643/axi_ad9643_channel.v index 093e05da1..78072d2ad 100644 --- a/library/axi_ad9643/axi_ad9643_channel.v +++ b/library/axi_ad9643/axi_ad9643_channel.v @@ -183,7 +183,7 @@ module axi_ad9643_channel ( end endgenerate - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9652/axi_ad9652_channel.v b/library/axi_ad9652/axi_ad9652_channel.v index 1c3f5adb5..63747b9de 100644 --- a/library/axi_ad9652/axi_ad9652_channel.v +++ b/library/axi_ad9652/axi_ad9652_channel.v @@ -165,7 +165,7 @@ module axi_ad9652_channel ( end endgenerate - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9671/axi_ad9671_channel.v b/library/axi_ad9671/axi_ad9671_channel.v index 939fe8cdf..68bd4778f 100644 --- a/library/axi_ad9671/axi_ad9671_channel.v +++ b/library/axi_ad9671/axi_ad9671_channel.v @@ -135,7 +135,7 @@ module axi_ad9671_channel ( .dfmt_type (adc_dfmt_type_s), .dfmt_se (adc_dfmt_se_s)); - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9680/axi_ad9680_channel.v b/library/axi_ad9680/axi_ad9680_channel.v index de0b8094a..56b2dbe18 100644 --- a/library/axi_ad9680/axi_ad9680_channel.v +++ b/library/axi_ad9680/axi_ad9680_channel.v @@ -135,7 +135,7 @@ module axi_ad9680_channel ( end endgenerate - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_ad9684/axi_ad9684_channel.v b/library/axi_ad9684/axi_ad9684_channel.v index fe0de9d22..04b99873c 100644 --- a/library/axi_ad9684/axi_ad9684_channel.v +++ b/library/axi_ad9684/axi_ad9684_channel.v @@ -141,7 +141,7 @@ module axi_ad9684_channel ( assign adc_valid = adc_dfmt_valid_s[0] | adc_dfmt_valid_s[1]; - up_adc_channel #(.ADC_CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable), diff --git a/library/axi_generic_adc/axi_generic_adc.v b/library/axi_generic_adc/axi_generic_adc.v index b7c899abe..32d4cc389 100644 --- a/library/axi_generic_adc/axi_generic_adc.v +++ b/library/axi_generic_adc/axi_generic_adc.v @@ -154,7 +154,7 @@ generate genvar i; for (i = 0; i < NUM_OF_CHANNELS; i=i+1) begin - up_adc_channel #(.ADC_CHANNEL_ID(i)) i_up_adc_channel ( + up_adc_channel #(.CHANNEL_ID(i)) i_up_adc_channel ( .adc_clk (adc_clk), .adc_rst (adc_rst), .adc_enable (adc_enable[i]), diff --git a/library/axi_mc_current_monitor/axi_mc_current_monitor.v b/library/axi_mc_current_monitor/axi_mc_current_monitor.v index bc735f0d5..fff50d92e 100644 --- a/library/axi_mc_current_monitor/axi_mc_current_monitor.v +++ b/library/axi_mc_current_monitor/axi_mc_current_monitor.v @@ -196,7 +196,7 @@ ad7401 vbus_if( .data_rd_ready_o(), .adc_mdata_i(adc_vbus_dat_i)); -up_adc_channel #(.ADC_CHANNEL_ID(0)) i_up_adc_channel_ia( +up_adc_channel #(.CHANNEL_ID(0)) i_up_adc_channel_ia( .adc_clk(adc_clk_o), .adc_rst(adc_rst), .adc_enable(adc_enable_ia), @@ -242,7 +242,7 @@ up_adc_channel #(.ADC_CHANNEL_ID(0)) i_up_adc_channel_ia( .up_rdata (up_rdata_0_s), .up_rack (up_rack_0_s)); -up_adc_channel #(.ADC_CHANNEL_ID(1)) i_up_adc_channel_ib( +up_adc_channel #(.CHANNEL_ID(1)) i_up_adc_channel_ib( .adc_clk(adc_clk_o), .adc_rst(adc_rst), .adc_enable(adc_enable_ib), @@ -288,7 +288,7 @@ up_adc_channel #(.ADC_CHANNEL_ID(1)) i_up_adc_channel_ib( .up_rdata (up_rdata_1_s), .up_rack (up_rack_1_s)); -up_adc_channel #(.ADC_CHANNEL_ID(2)) i_up_adc_channel_vbus( +up_adc_channel #(.CHANNEL_ID(2)) i_up_adc_channel_vbus( .adc_clk(adc_clk_o), .adc_rst(adc_rst), .adc_enable(adc_enable_vbus),