DHCP seems to work now, PING/ARP fails

diff --git a/gbe_hub/structure.txt b/gbe_hub/structure.txt
index bcbdff0dd48cea91345258d3428ab3088341d864..24b831f408bd5c04425429ff7857bd16cc0d2685 100644 (file)
--- a/gbe_hub/structure.txt
+++ b/gbe_hub/structure.txt
@@ -5,7 +5,7 @@ trb3sc_gbe_hub ++> clock_reset_handler ++> reset_handler
                |                                          |                                              ++> gbe_response_constructor_DHCP
                |                                          |                                              ++> gbe_response_constructor_Ping
                |                                          |                                              ++> gbe_response_constructor_SCTRL
-               |                                          |                                              +-> gbe_response_constructor_Forward
+               |                                          |                                              ++> gbe_response_constructor_Forward
                |                                          +-> gbe_transmit_control
                |                                          +-> gbe_frame_constr
                |                                          +-> gbe_receive_control +-> gbe_protocol_prioritizer
@@ -27,7 +27,7 @@ trb3sc_gbe_hub ++> clock_reset_handler ++> reset_handler
                |                                       |                                +-> i2c_sendb
                |                                       +-> trb_net_i2cwire2 +-> i2c_slim2 +-> i2c_gstart2
                |                                                                          +-> i2c_sendb2 
-               +-> trb_net16_regio_bus_handler_record +-> ???
+               +-> trb_net16_regio_bus_handler_record
                +-> tomcat_tools +-> trb_net16_regio_bus_handler_record
                |                +-> spi_flash_and_fpga_reload_record +-> trb_net16_regio_bus_handler
                |                |                                    +-> spi_master +-> spi_slim
@@ -40,5 +40,41 @@ trb3sc_gbe_hub ++> clock_reset_handler ++> reset_handler
                |                |             +-> fifo_9x2k_oreg
                |                +-> i2c_slim2 +-> i2c_gstart2
                |                              +-> i2c_sendb2
-               +-> gbe_med_fifo +-> ???
+               +-> gbe_med_fifo +-> serdes_gbe_4ch_ds
+               |                +-> gbe_sci_reader
+               |                +-> signal_sync
+               |                +-> inserter +-> fifo_inserter
+               |                +-> remover +-> fifo_remover
+               |                +-> sgmii_gbe_pcs42
+               |                +-> tsmac41
+               |                +-> gbe_mac_control
+               |                +-> gbe_lsm
+               |                +-> gbe_rx_rb +-> rb_4k_9
+               |                +-> gbe_tx_fifo +-> fifo_4k_9
                +-> gbe_tx_reset
+
+
+               
+               
+======================================================================================================================
+gbe_frame_receiver FIFO usage:
+
+4096x9 ->  8bit -> frame data
+           1bit -> end of frame bit
+
+512x32 -> 16bit -> fr_frame_size
+          16bit -> fr_frame_proto (fr_frame_type)
+
+512x72 -> 48bit -> fr_src_mac
+          16bit -> fr_src_udp
+           8bit -> UNUSED
+
+512x72 -> 48bit -> fr_dst_mac
+          16bit -> fr_dst_udp
+           8bit -> UNUSED
+
+512x72 -> 32bit -> fr_src_ip
+          32bit -> fr_dst_ip
+           8bit -> fr_ip_proto
+
+          

diff --git a/gbe_hub/trb3sc_gbe_hub.prj b/gbe_hub/trb3sc_gbe_hub.prj
index edf7088dd12be825e65e7b42a9fcace7006c23d6..ebe501cf0b00ba50157958cc4f3c6b96709ab531 100644 (file)
--- a/gbe_hub/trb3sc_gbe_hub.prj
+++ b/gbe_hub/trb3sc_gbe_hub.prj
@@ -157,7 +157,7 @@ add_file -vhdl -lib work "../../trbnet/gbe_trb_ecp3/media/gbe_med_fifo.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb_ecp3/media/serdes_gbe_4ch_ds.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_sci_reader.vhd"
 add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/med_sync_define_RS.vhd"
-add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_rx_reset_RS.vhd"
+add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/gbe_rx_reset.vhd"
 add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/gbe_tx_reset.vhd"
 
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/inserter.vhd"
@@ -166,10 +166,10 @@ add_file -vhdl -lib work "../../trbnet/gbe_trb_ecp3/cores/fifo_inserter.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb_ecp3/cores/fifo_remover.vhd"
 
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_rx_rb.vhd"
-add_file -vhdl -lib work "../../trbnet/gbe_trb/base/tx_fifo.vhd"
+add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_tx_fifo.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_lsm.vhd"
-add_file -vhdl -lib work "../../trbnet/gbe_trb/base/scatter_ports.vhd"
-add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gather_ports.vhd"
+#add_file -vhdl -lib work "../../trbnet/gbe_trb/base/scatter_ports.vhd"
+#add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gather_ports.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/gbe_sgl_ctrl.vhd"
 
 add_file -vhdl -lib work "../../trbnet/gbe_trb_ecp3/cores/rb_4k_9.vhd"

diff --git a/gbe_hub/trb3sc_gbe_hub.vhd b/gbe_hub/trb3sc_gbe_hub.vhd
index 777c5506504a10b86071adabb5965086c1f2f582..553669a8f900f5a8ae9e6ce389a9ade121ab6910 100644 (file)
--- a/gbe_hub/trb3sc_gbe_hub.vhd
+++ b/gbe_hub/trb3sc_gbe_hub.vhd
@@ -6,10 +6,8 @@ library work;
 use work.version.all;
 use work.config.all;
 use work.trb_net_std.all;
-use work.trb_net_components.all;
-use work.trb3_components.all;
+--use work.trb_net_components.all;
 use work.version.all;
---use work.trb_net_gbe_components.all;
 use work.med_sync_define_RS.all;
 
 -- BUG: backplane handling!!!
@@ -420,7 +418,7 @@ begin
   -- 8 : fifo_eof
   -- 7..0: data
   
-  DBG(31 downto 0)  <= debug_pcsd(31 downto 0);
+--  DBG(31 downto 0)  <= debug_pcsd(31 downto 0);
   DBG(32)           <= '0';
   DBG(33)           <= master_clk;
   
@@ -495,7 +493,7 @@ begin
       MAKE_RESET_OUT           => reset_via_gbe,
       -- debug
       STATUS_OUT               => status,
-      DEBUG_OUT                => open
+      DEBUG_OUT                => DBG(31 downto 0) --open
     );
   
 -------------------------------------------------------------------------------