summaryrefslogtreecommitdiffstats
path: root/usrp2/control_lib
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2010-07-19 13:34:49 -0700
committerNick Foster <nick@nerdnetworks.org>2010-07-19 13:34:49 -0700
commit219934cb7ab33356c7c53409a9c16da6097135dc (patch)
tree4aa0d49aad55c3dc15556ebb86c063096c1da38c /usrp2/control_lib
parent2e1222cc4228307ff762ff114b773956ef1937f3 (diff)
parented11f715c45ad129600e20849254e3899407002a (diff)
downloaduhd-219934cb7ab33356c7c53409a9c16da6097135dc.tar.gz
uhd-219934cb7ab33356c7c53409a9c16da6097135dc.tar.bz2
uhd-219934cb7ab33356c7c53409a9c16da6097135dc.zip
Merge branch 'u2p' of ettus.sourcerepo.com:ettus/fpgapriv into u2p
Diffstat (limited to 'usrp2/control_lib')
-rw-r--r--usrp2/control_lib/bootram.v6
1 files changed, 5 insertions, 1 deletions
diff --git a/usrp2/control_lib/bootram.v b/usrp2/control_lib/bootram.v
index 5e527de90..668012504 100644
--- a/usrp2/control_lib/bootram.v
+++ b/usrp2/control_lib/bootram.v
@@ -21,8 +21,12 @@ module bootram
wire [31:0] DOB0, DOB1, DOB2, DOB3;
wire ENB0, ENB1, ENB2, ENB3;
wire [3:0] WEB;
+
+ reg [1:0] delayed_if_bank;
+ always @(posedge clk)
+ delayed_if_bank <= if_adr[12:11];
- assign if_data = if_adr[12] ? (if_adr[11] ? DOA3 : DOA2) : (if_adr[11] ? DOA1 : DOA0);
+ assign if_data = delayed_if_bank[1] ? (delayed_if_bank[0] ? DOA3 : DOA2) : (delayed_if_bank[0] ? DOA1 : DOA0);
assign dwb_dat_o = dwb_adr_i[12] ? (dwb_adr_i[11] ? DOB3 : DOB2) : (dwb_adr_i[11] ? DOB1 : DOB0);
always @(posedge clk)