From 11376fc8fc7ae1b67dd019f2c111aa0c3e8faab3 Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Wed, 2 May 2007 15:50:56 +0000
Subject: Merged r5203:5204 from developer branch jcorgan/atr. Fixed ATR delay
enable and reduced delay width to 12 bits.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5228 221aa14e-8319-0410-a670-987f0aec2ac5
---
usrp/fpga/sdr_lib/master_control.v | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'usrp/fpga/sdr_lib/master_control.v')
diff --git a/usrp/fpga/sdr_lib/master_control.v b/usrp/fpga/sdr_lib/master_control.v
index 6befc4dfd2..3bce55f23d 100644
--- a/usrp/fpga/sdr_lib/master_control.v
+++ b/usrp/fpga/sdr_lib/master_control.v
@@ -114,7 +114,7 @@ module master_control
wire transmit_now;
wire atr_ctl;
- wire [31:0] atr_tx_delay, atr_rx_delay;
+ wire [11:0] atr_tx_delay, atr_rx_delay;
wire [15:0] atr_mask_0, atr_txval_0, atr_rxval_0, atr_mask_1, atr_txval_1, atr_rxval_1, atr_mask_2, atr_txval_2, atr_rxval_2, atr_mask_3, atr_txval_3, atr_rxval_3;
setting_reg #(`FR_ATR_MASK_0) sr_atr_mask_0(.clock(master_clk),.reset(1'b0),.strobe(serial_strobe),.addr(serial_addr),.in(serial_data),.out(atr_mask_0));
@@ -139,7 +139,7 @@ module master_control
assign atr_ctl = 1'b1;
- atr_delay atr_delay(.clk_i(master_clk),.rst_i(tx_dsp_reset),.ena_i(atr_ctl & enable_tx),.tx_empty_i(tx_empty),
+ atr_delay atr_delay(.clk_i(master_clk),.rst_i(tx_dsp_reset),.ena_i(atr_ctl),.tx_empty_i(tx_empty),
.tx_delay_i(atr_tx_delay),.rx_delay_i(atr_rx_delay),.atr_tx_o(transmit_now));
wire [15:0] atr_selected_0 = transmit_now ? atr_txval_0 : atr_rxval_0;
--
cgit v1.2.3