small changes

diff --git a/gbe_hub/structure.txt b/gbe_hub/structure.txt
index 24b831f408bd5c04425429ff7857bd16cc0d2685..0024431ff1bf495d514a0c2a8adba7cb11793671 100644 (file)
--- a/gbe_hub/structure.txt
+++ b/gbe_hub/structure.txt
@@ -8,10 +8,8 @@ trb3sc_gbe_hub ++> clock_reset_handler ++> reset_handler
                |                                          |                                              ++> gbe_response_constructor_Forward
                |                                          +-> gbe_transmit_control
                |                                          +-> gbe_frame_constr
-               |                                          +-> gbe_receive_control +-> gbe_protocol_prioritizer
-               |                                          +-> gbe_frame_receiver +-> gbe_type_validator
-               |                                                                 +-> fifo_4096x9
-               |                                                                 +-> fifo_512x32
+               |                                          +-> gbe_receive_control
+               |                                          +-> gbe_frame_receiver +-> fifo_4096x9
                |                                                                 +-> fifo_512x72
                +-> trb_net16_endpoint_standalone_sctrl +-> trb_net16_api_base +-> trb_net16_term
                |                                       |                      +-> trb_net16_sbuf
@@ -63,7 +61,7 @@ gbe_frame_receiver FIFO usage:
            1bit -> end of frame bit
 
 512x32 -> 16bit -> fr_frame_size
-          16bit -> fr_frame_proto (fr_frame_type)
+          16bit -> UNUSED
 
 512x72 -> 48bit -> fr_src_mac
           16bit -> fr_src_udp
@@ -71,10 +69,11 @@ gbe_frame_receiver FIFO usage:
 
 512x72 -> 48bit -> fr_dst_mac
           16bit -> fr_dst_udp
-           8bit -> UNUSED
+           6bit -> proto_select
+           2bit -> UNUSED
 
 512x72 -> 32bit -> fr_src_ip
           32bit -> fr_dst_ip
-           8bit -> fr_ip_proto
+           8bit -> UNUSED
 
           

diff --git a/gbe_hub/trb3sc_gbe_hub.prj b/gbe_hub/trb3sc_gbe_hub.prj
index ebe501cf0b00ba50157958cc4f3c6b96709ab531..28e3fe50ac489c390e44b42ec05050334354d06b 100644 (file)
--- a/gbe_hub/trb3sc_gbe_hub.prj
+++ b/gbe_hub/trb3sc_gbe_hub.prj
@@ -168,8 +168,6 @@ 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/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/gbe_sgl_ctrl.vhd"
 
 add_file -vhdl -lib work "../../trbnet/gbe_trb_ecp3/cores/rb_4k_9.vhd"
@@ -183,9 +181,9 @@ 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_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_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"