From f58abdcba9ab23a399d7da2687e772c6ae24f41d Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Fri, 20 May 2011 13:25:05 -0700 Subject: N210: how the heck did the PPS fix get dropped again --- usrp2/top/u2plus/u2plus.v | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usrp2/top/u2plus/u2plus.v b/usrp2/top/u2plus/u2plus.v index c0140e989..7c2270df6 100644 --- a/usrp2/top/u2plus/u2plus.v +++ b/usrp2/top/u2plus/u2plus.v @@ -348,12 +348,15 @@ module u2plus // DAC A is also inverted in schematic to facilitate clean layout always @(negedge dsp_clk) DACA <= ~dac_b_int; always @(negedge dsp_clk) DACB <= dac_a_int; + + wire pps; + assign pps = PPS_IN ^ PPS2_IN; u2plus_core u2p_c(.dsp_clk (dsp_clk), .wb_clk (wb_clk), .clock_ready (clock_ready), .clk_to_mac (CLK_TO_MAC_int2), - .pps_in (PPS_IN), + .pps_in (pps), .leds (leds_int), .debug (debug[31:0]), .debug_clk (debug_clk[1:0]), -- cgit v1.2.3 From 9b4fa86af2d0ed59d0881a3d153b309c94c7e4e5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 16 May 2011 11:55:42 -0700 Subject: u1e: incremented compat # to 4 for vita length change --- usrp2/top/u1e/u1e_core.v | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usrp2/top/u1e/u1e_core.v b/usrp2/top/u1e/u1e_core.v index 8e6d74edf..d10a3ab30 100644 --- a/usrp2/top/u1e/u1e_core.v +++ b/usrp2/top/u1e/u1e_core.v @@ -36,7 +36,7 @@ module u1e_core localparam SR_GLOBAL_RESET = 50; // 1 reg localparam SR_REG_TEST32 = 52; // 1 reg - wire [7:0] COMPAT_NUM = 8'd3; + wire [7:0] COMPAT_NUM = 8'd4; wire wb_clk = clk_fpga; wire wb_rst, global_reset; -- cgit v1.2.3