From 026fad8853155440eebda275014d3b3e8307d088 Mon Sep 17 00:00:00 2001 From: Rejeesh Kutty Date: Thu, 27 Aug 2015 11:41:26 -0400 Subject: [PATCH] fmcomm2- enable/txnrx- through devif --- projects/fmcomms2/zc706/system_top.v | 53 ++++++++++------------------ 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/projects/fmcomms2/zc706/system_top.v b/projects/fmcomms2/zc706/system_top.v index aeb14f5d4..00fba414d 100644 --- a/projects/fmcomms2/zc706/system_top.v +++ b/projects/fmcomms2/zc706/system_top.v @@ -34,8 +34,6 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // *************************************************************************** // *************************************************************************** -// *************************************************************************** -// *************************************************************************** `timescale 1ns/100ps @@ -92,6 +90,7 @@ module system_top ( enable, txnrx, + tdd_sync_out, tdd_sync_in, @@ -164,6 +163,7 @@ module system_top ( output enable; output txnrx; + output tdd_sync_out; input tdd_sync_in; @@ -212,30 +212,19 @@ module system_top ( wire [31:0] dac_gpio_input; wire [31:0] dac_gpio_output; - wire tdd_enabled_s; - wire gpio_enable; - wire gpio_txnrx; - wire enable_s; - wire txnrx_s; - - assign enable = (tdd_enabled_s == 1'b1) ? enable_s : gpio_enable; - assign txnrx = (tdd_enabled_s == 1'b1) ? txnrx_s : gpio_txnrx; - // instantiations - ad_iobuf #(.DATA_WIDTH(19)) i_iobuf ( - .dio_t (gpio_t[50:32]), - .dio_i (gpio_o[50:32]), - .dio_o (gpio_i[50:32]), - .dio_p ({ gpio_muxout_tx, - gpio_muxout_rx, - gpio_txnrx, - gpio_enable, - gpio_resetb, - gpio_sync, - gpio_en_agc, - gpio_ctl, - gpio_status})); + ad_iobuf #(.DATA_WIDTH(17)) i_iobuf ( + .dio_t ({gpio_t[50:49], gpio_t[46:32]}), + .dio_i ({gpio_o[50:49], gpio_o[46:32]}), + .dio_o ({gpio_i[50:49], gpio_i[46:32]}), + .dio_p ({ gpio_muxout_tx, // 50:50 + gpio_muxout_rx, // 49:49 + gpio_resetb, // 46:46 + gpio_sync, // 45:45 + gpio_en_agc, // 44:44 + gpio_ctl, // 43:40 + gpio_status})); // 39:32 ad_iobuf #(.DATA_WIDTH(15)) i_iobuf_bd ( .dio_t (gpio_t[14:0]), @@ -243,11 +232,6 @@ module system_top ( .dio_o (gpio_i[14:0]), .dio_p (gpio_bd)); - //======================================================== - // debug syncronization pulses - - //======================================================== - system_wrapper i_system_wrapper ( .ddr_addr (ddr_addr), .ddr_ba (ddr_ba), @@ -264,7 +248,7 @@ module system_top ( .ddr_ras_n (ddr_ras_n), .ddr_reset_n (ddr_reset_n), .ddr_we_n (ddr_we_n), - .enable (enable_s), + .enable (enable), .fixed_io_ddr_vrn (fixed_io_ddr_vrn), .fixed_io_ddr_vrp (fixed_io_ddr_vrp), .fixed_io_mio (fixed_io_mio), @@ -318,16 +302,17 @@ module system_top ( .spi1_sdi_i (1'b0), .spi1_sdo_i (spi_udc_data), .spi1_sdo_o (spi_udc_data), + .tdd_sync_in (tdd_sync_in), + .tdd_sync_out (tdd_sync_out), .tx_clk_out_n (tx_clk_out_n), .tx_clk_out_p (tx_clk_out_p), .tx_data_out_n (tx_data_out_n), .tx_data_out_p (tx_data_out_p), .tx_frame_out_n (tx_frame_out_n), .tx_frame_out_p (tx_frame_out_p), - .txnrx (txnrx_s), - .tdd_enabled (tdd_enabled_s), - .tdd_sync_out(tdd_sync_out), - .tdd_sync_in(tdd_sync_in)); + .txnrx (txnrx), + .up_enable (gpio_o[47]), + .up_txnrx (gpio_o[48])); endmodule