[Commit-gnuradio] r8253 - usrp2/trunk/fpga/top/u2_basic

[matt]

Author: matt
Date: 2008-04-23 15:01:46 -0600 (Wed, 23 Apr 2008)
New Revision: 8253

Modified:
   usrp2/trunk/fpga/top/u2_basic/u2_basic.v
Log:
combine leds


Modified: usrp2/trunk/fpga/top/u2_basic/u2_basic.v
===================================================================
--- usrp2/trunk/fpga/top/u2_basic/u2_basic.v    2008-04-23 21:01:05 UTC (rev 
8252)
+++ usrp2/trunk/fpga/top/u2_basic/u2_basic.v    2008-04-23 21:01:46 UTC (rev 
8253)
@@ -12,8 +12,7 @@
    input pps_in,
    
    // Misc, debug
-   output led1,
-   output led2,
+   output [7:0] leds,
    output [31:0] debug,
    output [1:0] debug_clk,
 
@@ -380,11 +379,10 @@
    assign       s7_dat_i = 32'd0;
 
    // Output control lines
-   wire [7:0]   clock_outs, serdes_outs, adc_outs, misc_outs;
+   wire [7:0]   clock_outs, serdes_outs, adc_outs;
    assign       {clock_ready, clk_en[1:0], clk_sel[1:0]} = clock_outs[4:0];
    assign       {ser_enable, ser_prbsen, ser_loopen, ser_rx_en} = 
serdes_outs[3:0];
    assign       {adc_oe_a, adc_on_a, adc_oe_b, adc_on_b } = adc_outs[3:0];
-   assign       {led2, led1} = misc_outs[1:0];
 
    wire         phy_reset;
    assign       PHY_RESETn = ~phy_reset;
@@ -396,7 +394,7 @@
    setting_reg #(.my_addr(2)) sr_adc 
(.clk(wb_clk),.rst(wb_rst),.strobe(set_stb),.addr(set_addr),
                                      .in(set_data),.out(adc_outs),.changed());
    setting_reg #(.my_addr(3)) sr_led 
(.clk(wb_clk),.rst(wb_rst),.strobe(set_stb),.addr(set_addr),
-                                     .in(set_data),.out(misc_outs),.changed());
+                                     .in(set_data),.out(leds),.changed());
    setting_reg #(.my_addr(4)) sr_phy 
(.clk(wb_clk),.rst(wb_rst),.strobe(set_stb),.addr(set_addr),
                                      .in(set_data),.out(phy_reset),.changed());