diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-10 19:10:10 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-10 19:10:10 -0700 |
| commit | e8dc93363a60ad94b4777a5a8d64424c1273ed3e (patch) | |
| tree | f5885cf35b25e4012fc5e397398ad3b16e9d3f7f /usrp2/top/N2x0 | |
| parent | 510632d8968eb95d383da4cf2d72184d66da0bee (diff) | |
| download | uhd-e8dc93363a60ad94b4777a5a8d64424c1273ed3e.tar.gz uhd-e8dc93363a60ad94b4777a5a8d64424c1273ed3e.tar.bz2 uhd-e8dc93363a60ad94b4777a5a8d64424c1273ed3e.zip | |
usrp: work on meeting timing constraints
* fifo ctrl register the vita ticks and use late
* vita de/framer make nchans const since we dont change it
* simplify readback muxes to minimal usage
Diffstat (limited to 'usrp2/top/N2x0')
| -rw-r--r-- | usrp2/top/N2x0/u2plus_core.v | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usrp2/top/N2x0/u2plus_core.v b/usrp2/top/N2x0/u2plus_core.v index 703e157cc..e2539e183 100644 --- a/usrp2/top/N2x0/u2plus_core.v +++ b/usrp2/top/N2x0/u2plus_core.v @@ -456,11 +456,11 @@ module u2plus_core (.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), - .word00(spi_readback),.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]), + .word00(spi_readback),.word01(32'hffff_ffff),.word02(32'hffff_ffff),.word03(32'hffff_ffff), + .word04(32'hffff_ffff),.word05(32'hffff_ffff),.word06(32'hffff_ffff),.word07(32'hffff_ffff), + .word08(status),.word09(32'hffff_ffff),.word10(32'hffff_ffff), .word11(vita_time[31:0]),.word12(compat_num),.word13(irq_readback), - .word14(vita_time_pps[63:32]),.word15(vita_time_pps[31:0]) + .word14(32'hffff_ffff),.word15(32'hffff_ffff) ); // ///////////////////////////////////////////////////////////////////////// @@ -522,10 +522,10 @@ module u2plus_core .in_data(sfc_rd_data), .in_valid(sfc_rd_valid), .in_ready(sfc_rd_ready), .out_data(sfc_wr_data), .out_valid(sfc_wr_valid), .out_ready(sfc_wr_ready), .strobe(set_stb_dsp1), .addr(set_addr_dsp1), .data(set_data_dsp1), - .word00(spi_readback),.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(irq_readback), + .word00(spi_readback),.word01(32'hffff_ffff),.word02(32'hffff_ffff),.word03(32'hffff_ffff), + .word04(32'hffff_ffff),.word05(32'hffff_ffff),.word06(32'hffff_ffff),.word07(32'hffff_ffff), + .word08(32'hffff_ffff),.word09(gpio_readback),.word10(vita_time[63:32]), + .word11(vita_time[31:0]),.word12(32'hffff_ffff),.word13(irq_readback), .word14(vita_time_pps[63:32]),.word15(vita_time_pps[31:0]), .debug(sfc_debug) ); |