[Commit-gnuradio] [gnuradio] 67/148: reorder the memory map

[git]

This is an automated email from the git hooks/post-receive script.

nwest pushed a commit to annotated tag old_usrp_devel_udp
in repository gnuradio.

commit 6ce6ca649663f7fb01439c4911cb25cedb7a7531
Author: Matt Ettus <address@hidden>
Date:   Fri Dec 11 18:38:47 2009 -0800

    reorder the memory map
---
 usrp2/fpga/vrt/vita_tx_control.v  | 2 +-
 usrp2/fpga/vrt/vita_tx_deframer.v | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usrp2/fpga/vrt/vita_tx_control.v b/usrp2/fpga/vrt/vita_tx_control.v
index 418bd18..689acd7 100644
--- a/usrp2/fpga/vrt/vita_tx_control.v
+++ b/usrp2/fpga/vrt/vita_tx_control.v
@@ -42,7 +42,7 @@ module vita_tx_control
    reg [2:0] ibs_state;
 
    wire      clear_state;
-   setting_reg #(.my_addr(BASE+3)) sr
+   setting_reg #(.my_addr(BASE+1)) sr
      (.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr),
       .in(set_data),.out(),.changed(clear_state));
    
diff --git a/usrp2/fpga/vrt/vita_tx_deframer.v 
b/usrp2/fpga/vrt/vita_tx_deframer.v
index a06d9ce..49428ea 100644
--- a/usrp2/fpga/vrt/vita_tx_deframer.v
+++ b/usrp2/fpga/vrt/vita_tx_deframer.v
@@ -22,7 +22,7 @@ module vita_tx_deframer
     );
 
    wire [1:0] numchan;
-   setting_reg #(.my_addr(BASE+8), .at_reset(0)) sr_numchan
+   setting_reg #(.my_addr(BASE), .at_reset(0)) sr_numchan
      (.clk(clk),.rst(reset),.strobe(set_stb),.addr(set_addr),
       .in(set_data),.out(numchan),.changed());