diff options
| author | Matt Ettus <matt@ettus.com> | 2010-08-17 16:54:17 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-08-17 16:54:17 -0700 |
| commit | 652b82a6b0bd8694a4cdef00c7146cc367f75e7b (patch) | |
| tree | 0224924fc881fdaeeaabe94b4f7496c0d950777e | |
| parent | c4ae87f3554753877a35cab3b86cbf267fb2c035 (diff) | |
| parent | 0f0e3abe76c88bee67e278952c1db4ae59c624be (diff) | |
| download | uhd-652b82a6b0bd8694a4cdef00c7146cc367f75e7b.tar.gz uhd-652b82a6b0bd8694a4cdef00c7146cc367f75e7b.tar.bz2 uhd-652b82a6b0bd8694a4cdef00c7146cc367f75e7b.zip | |
Merge branch 'features' into tx_policy
* features:
added compat number to usrp2 readback mux
makefile dependency fix for second expansion
| -rw-r--r-- | usrp2/top/Makefile.common | 2 | ||||
| -rw-r--r-- | usrp2/top/u2_rev3/u2_core_udp.v | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/usrp2/top/Makefile.common b/usrp2/top/Makefile.common index d0435fa1e..4da64ac28 100644 --- a/usrp2/top/Makefile.common +++ b/usrp2/top/Makefile.common @@ -47,7 +47,7 @@ $(ISE_FILE): $$(SOURCES) $$(MAKEFILE_LIST) @echo $@ $(ISE_HELPER) "" -$(BIN_FILE): $(ISE_FILE) +$(BIN_FILE): $(ISE_FILE) $$(SOURCES) $$(MAKEFILE_LIST) @echo $@ $(ISE_HELPER) "Generate Programming File" touch $@ diff --git a/usrp2/top/u2_rev3/u2_core_udp.v b/usrp2/top/u2_rev3/u2_core_udp.v index b79cab5fb..124930c23 100644 --- a/usrp2/top/u2_rev3/u2_core_udp.v +++ b/usrp2/top/u2_rev3/u2_core_udp.v @@ -423,7 +423,10 @@ module u2_core cycle_count <= 0; else cycle_count <= cycle_count + 1; - + + //compatibility number -> increment when the fpga has been sufficiently altered + localparam compat_num = 32'd1; + wb_readback_mux buff_pool_status (.wb_clk_i(wb_clk), .wb_rst_i(wb_rst), .wb_stb_i(s5_stb), .wb_adr_i(s5_adr), .wb_dat_o(s5_dat_i), .wb_ack_o(s5_ack), @@ -431,7 +434,7 @@ module u2_core .word00(status_b0),.word01(status_b1),.word02(status_b2),.word03(status_b3), .word04(status_b4),.word05(status_b5),.word06(status_b6),.word07(status_b7), .word08(status),.word09({sim_mode,27'b0,clock_divider[3:0]}),.word10(vita_time[63:32]), - .word11(vita_time[31:0]),.word12(32'b0),.word13(irq),.word14(status_enc),.word15(cycle_count) + .word11(vita_time[31:0]),.word12(compat_num),.word13(irq),.word14(status_enc),.word15(cycle_count) ); // ///////////////////////////////////////////////////////////////////////// |