hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fpga_master' into uhd_master

Browse Source
This commit is contained in:
Josh Blum 2011-10-12 10:14:42 -07:00
commit 5f2ed309ab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fpga/usrp2/top/B100/u1plus_core.v
View File

@ -341,7 +341,7 @@ module u1plus_core
assign test_rate = xfer_rate[7:0];
assign test_len = reg_test[15:0];
assign { debug_led[2],debug_led[0],debug_led[1] } = reg_leds; // LEDs are arranged funny on board
assign debug_led = {run_tx, (run_rx0 | run_rx1), cgen_st_ld};
assign { cgen_sync_b, cgen_ref_sel } = reg_cgen_ctrl;
assign s0_dat_miso = (s0_adr[6:0] == REG_LEDS) ? reg_leds :

2
fpga/usrp2/top/E1x0/u1e_core.v
View File

@ -335,7 +335,7 @@ module u1e_core
assign test_ctrl = xfer_rate[11:8];
assign test_rate = xfer_rate[7:0];
assign { debug_led[3:0] } = ~{run_rx0 | run_rx1,run_tx,reg_leds[1:0]};
assign { debug_led[3:0] } = ~{1'b1, run_tx, run_rx0 | run_rx1, cgen_st_ld};
assign { cgen_sync_b, cgen_ref_sel } = reg_cgen_ctrl;
assign s0_dat_miso = (s0_adr[6:0] == REG_LEDS) ? reg_leds :