diff options
author | Josh Blum <josh@joshknows.com> | 2011-11-29 06:07:33 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-11-29 06:07:33 -0800 |
commit | 322fb97547c5407a58d126d98c79d40e153aa7ff (patch) | |
tree | cf82b35d6f34c93b3c0b690d6077effd67a05db6 /fpga/usrp2/top/N2x0 | |
parent | 6b46d2ce6e2038e57b1ea23df4d37edee6f58ccc (diff) | |
parent | 5f520de104cd5ee5ebc42d4e88dc606720953d49 (diff) | |
download | uhd-322fb97547c5407a58d126d98c79d40e153aa7ff.tar.gz uhd-322fb97547c5407a58d126d98c79d40e153aa7ff.tar.bz2 uhd-322fb97547c5407a58d126d98c79d40e153aa7ff.zip |
Merge branch 'fpga_master' into uhd_master
Diffstat (limited to 'fpga/usrp2/top/N2x0')
-rw-r--r-- | fpga/usrp2/top/N2x0/u2plus_core.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpga/usrp2/top/N2x0/u2plus_core.v b/fpga/usrp2/top/N2x0/u2plus_core.v index ba9569778..3ead0db8e 100644 --- a/fpga/usrp2/top/N2x0/u2plus_core.v +++ b/fpga/usrp2/top/N2x0/u2plus_core.v @@ -435,7 +435,7 @@ module u2plus_core // Buffer Pool Status -- Slave #5 //compatibility number -> increment when the fpga has been sufficiently altered - localparam compat_num = {16'd8, 16'd1}; //major, minor + localparam compat_num = {16'd8, 16'd2}; //major, minor wb_readback_mux buff_pool_status (.wb_clk_i(wb_clk), .wb_rst_i(wb_rst), .wb_stb_i(s5_stb), @@ -444,7 +444,7 @@ module u2plus_core .word00(32'b0),.word01(32'b0),.word02(32'b0),.word03(32'b0), .word04(32'b0),.word05(32'b0),.word06(32'b0),.word07(32'b0), .word08(status),.word09(gpio_readback),.word10(vita_time[63:32]), - .word11(vita_time[31:0]),.word12(compat_num),.word13({18'b0, button, 13'b0}), + .word11(vita_time[31:0]),.word12(compat_num),.word13({18'b0, button, 1'b0, clk_status, serdes_link_up, 10'b0}), .word14(vita_time_pps[63:32]),.word15(vita_time_pps[31:0]) ); |