diff options
author | Josh Blum <josh@joshknows.com> | 2010-11-23 18:37:48 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-11-23 19:06:59 -0800 |
commit | 1fbd220503a81c6e9e5055457539628a48822f54 (patch) | |
tree | 251d04f88bc45cc8ef1bd19dd89c805977b2761e | |
parent | 0be843e19db7e96984942a3f025ae453fecd401c (diff) | |
download | uhd-1fbd220503a81c6e9e5055457539628a48822f54.tar.gz uhd-1fbd220503a81c6e9e5055457539628a48822f54.tar.bz2 uhd-1fbd220503a81c6e9e5055457539628a48822f54.zip |
packet_router: it makes more sense to connect the control flags this way now
-rw-r--r-- | usrp2/fifo/packet_router.v | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/usrp2/fifo/packet_router.v b/usrp2/fifo/packet_router.v index ba5a2378c..ee20aceee 100644 --- a/usrp2/fifo/packet_router.v +++ b/usrp2/fifo/packet_router.v @@ -70,27 +70,20 @@ module packet_router // - handshake lines for the CPU communication // - setting registers to program the inspector //////////////////////////////////////////////////////////////////// - reg cpu_out_hs_ctrl; - reg cpu_inp_hs_ctrl; - reg master_mode_flag; - reg [BUF_SIZE-1:0] cpu_inp_line_count; //setting register to misc control + handshakes wire [31:0] control; - wire control_changed; setting_reg #(.my_addr(CTRL_BASE)) sreg_ctrl( .clk(stream_clk),.rst(stream_rst), .strobe(set_stb),.addr(set_addr),.in(set_data), - .out(control),.changed(control_changed) + .out(control),.changed() ); - //grab the pertinent control settings - always @(posedge control_changed) begin - cpu_out_hs_ctrl <= control[0]; - cpu_inp_hs_ctrl <= control[1]; - master_mode_flag <= control[2]; - cpu_inp_line_count <= control[BUF_SIZE-1+16:0+16]; - end + //connect the pertinent control settings + wire cpu_out_hs_ctrl = control[0]; + wire cpu_inp_hs_ctrl = control[1]; + wire master_mode_flag = control[2]; + wire [BUF_SIZE-1:0] cpu_inp_line_count = control[BUF_SIZE-1+16:0+16]; //setting register to program the IP address wire [31:0] my_ip_addr; |