aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2011-02-25 13:46:03 -0500
committerPhilip Balister <philip@opensdr.com>2011-02-25 13:46:03 -0500
commit87f8f6fca6742a4263b636aa5632f228fccd18f2 (patch)
tree4286969f0d9d79b8c24f80f44378654b7e297672
parentee50f438752a4beb780c3340026e2f29c1c32a3e (diff)
downloaduhd-87f8f6fca6742a4263b636aa5632f228fccd18f2.tar.gz
uhd-87f8f6fca6742a4263b636aa5632f228fccd18f2.tar.bz2
uhd-87f8f6fca6742a4263b636aa5632f228fccd18f2.zip
timed tester : Bring out src/dst flags for rx chain for testing.
-rw-r--r--usrp2/gpmc/gpmc_async.v12
-rw-r--r--usrp2/top/u1e/u1e_core.v4
2 files changed, 15 insertions, 1 deletions
diff --git a/usrp2/gpmc/gpmc_async.v b/usrp2/gpmc/gpmc_async.v
index 7d38c66cb..053df5b18 100644
--- a/usrp2/gpmc/gpmc_async.v
+++ b/usrp2/gpmc/gpmc_async.v
@@ -129,7 +129,7 @@ module gpmc_async
.wb_sel_o(wb_sel_o), .wb_cyc_o(wb_cyc_o), .wb_stb_o(wb_stb_o), .wb_we_o(wb_we_o),
.wb_ack_i(wb_ack_i) );
- assign debug = pkt_count;
+// assign debug = pkt_count;
// ////////////////////////////////////////////
// Test support, traffic generator, loopback, etc.
@@ -213,4 +213,14 @@ module gpmc_async
// FIXME -- make sure packet completes before we shutoff
// FIXME -- handle overrun and underrun
+wire [0:17] dummy18;
+
+assign debug = {dummy18, timedrx_src_rdy_int, timedrx_dst_rdy_int,
+ timedrx_src_rdy, timedrx_dst_rdy,
+ testrx_src_rdy, testrx_dst_rdy,
+ rx_src_rdy, rx_dst_rdy,
+ rx36_src_rdy, rx36_dst_rdy,
+ rx18_src_rdy, rx18_dst_rdy,
+ rx18b_src_rdy, rx18b_dst_rdy};
+
endmodule // gpmc_async
diff --git a/usrp2/top/u1e/u1e_core.v b/usrp2/top/u1e/u1e_core.v
index 174a2a3f8..a5a477202 100644
--- a/usrp2/top/u1e/u1e_core.v
+++ b/usrp2/top/u1e/u1e_core.v
@@ -408,10 +408,14 @@ module u1e_core
assign debug_clk = { EM_CLK, clk_fpga };
+/*
assign debug = { { rx_have_data, tx_have_space, EM_NCS6, EM_NCS5, EM_NCS4, EM_NWE, EM_NOE, rx_overrun },
{ tx_src_rdy, tx_src_rdy_int, tx_dst_rdy, tx_dst_rdy_int, rx_src_rdy, rx_src_rdy_int, rx_dst_rdy, rx_dst_rdy_int },
{ EM_D } };
+*/
+ assign debug = debug_gpmc;
+
assign debug_gpio_0 = { {run_tx, strobe_tx, run_rx, strobe_rx, tx_i[11:0]},
{2'b00, tx_src_rdy, tx_dst_rdy, tx_q[11:0]} };