Discovery start

diff --git a/gbe_hub/trb3sc_gbe_hub.prj b/gbe_hub/trb3sc_gbe_hub.prj
index 36a3b5a4746106cd6bf8990cd124c6d9f42de2c4..f56f38b470baff7dd8e8581f71621cae9b6e2277 100644 (file)
--- a/gbe_hub/trb3sc_gbe_hub.prj
+++ b/gbe_hub/trb3sc_gbe_hub.prj
@@ -181,9 +181,7 @@ add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_frame_receiver.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_receive_control.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_main_control.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_mac_control.vhd"
-#add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_protocol_prioritizer.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_protocol_selector.vhd"
-#add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_type_validator.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_frame_constr.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_transmit_control.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/gbe_response_constructor_ARP.vhd"
@@ -191,8 +189,7 @@ add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/gbe_response_constructo
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/gbe_response_constructor_DHCP.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/gbe_response_constructor_SCTRL.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/gbe_response_constructor_Forward.vhd"
-
-#add_file -vhdl -lib work "../../trbnet/gbe_trb/base/parser.vhd"
+add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/gbe_response_constructor_Discovery.vhd"
 
 add_file -vhdl -lib work "../../trbnet/gbe_trb/ipcores/ecp3/fifo_8kx9.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/ipcores/ecp3/fifo_4096x9.vhd"

diff --git a/gbe_hub/trb3sc_gbe_hub.vhd b/gbe_hub/trb3sc_gbe_hub.vhd
index a8f57617be7fab3cfe7acdf7ca889d57fd735513..fb0b753e89e3b54a310db325e2e5640ce99b39ce 100644 (file)
--- a/gbe_hub/trb3sc_gbe_hub.vhd
+++ b/gbe_hub/trb3sc_gbe_hub.vhd
@@ -448,7 +448,8 @@ begin
       LINK_HAS_DHCP             => '1',
       LINK_HAS_ARP              => '1',
       LINK_HAS_PING             => '1',
-      LINK_HAS_FWD              => '0'
+      LINK_HAS_FWD              => '0',
+      LINK_HAS_DISCOVERY        => '1'
     )
     port map(
       CLK_125_IN               => master_clk,
@@ -1062,7 +1063,7 @@ begin
   LED_SFP_GREEN(1)   <= not status_raw(13 * 8 + 7); --'0'; -- D1
   LED_SFP_RED(1)     <= not status_raw(13 * 8 + 2); --'0';
   
-  LED_WHITE(1)       <= not oob_3_reg(0); --additional_reg(31); --'0';
+  LED_WHITE(1)       <= not debug_wrapper(31); --oob_3_reg(0); --'0';
   LED_WHITE(0)       <= not status(0); --'0';
 
   LED_RJ_GREEN(0)    <= not status_raw(0 * 8 + 7); -- A0