read in type field

This commit is contained in:
Mario Hüttel 2018-04-13 21:28:02 +02:00
parent 9558851e8b
commit 763edd1900

36
top.vhd
View File

@ -40,11 +40,13 @@ architecture RTL of top is
-- simulation -- simulation
constant STARTUPDELAY : integer := 50000000; constant STARTUPDELAY : integer := 50000000;
constant DEFMAC : std_logic_vector(47 downto 0) := x"00DEADBEEF00"; constant DEFMAC : std_logic_vector(47 downto 0) := x"00DEADBEEF00";
constant PIPE_PKG : std_logic_vector(15 downto 0) := x"AA00";
constant FIN_PKG : std_logic_vector(15 downto 0) := x"55AA";
type smi_state_t is (IDLE, STROBE); type smi_state_t is (IDLE, STROBE);
type smi_init_state_t is (SMI_POR, SMI_PORDELAY, RESET, INIT, DELAY, INIT_COMPLETE); type smi_init_state_t is (SMI_POR, SMI_PORDELAY, RESET, INIT, DELAY, INIT_COMPLETE);
type ws_send_t is (WS_READY, WS_SYNC, WS_RED, WS_GREEN, WS_BLUE, WS_PIPE, WS_POST); type ws_send_t is (WS_READY, WS_SYNC, WS_RED, WS_GREEN, WS_BLUE, WS_PIPE, WS_POST);
type receive_t is (PRE, DESTMAC, HEADER, RECV, WAITFORACK); type receive_t is (PRE, DESTMAC, SRCMAC, TYPEFIELD, RECV, WAITFORACK);
signal rst : std_logic; signal rst : std_logic;
signal dat_cnt_s : unsigned(3 downto 0); signal dat_cnt_s : unsigned(3 downto 0);
@ -77,6 +79,7 @@ architecture RTL of top is
signal recv_state : receive_t; signal recv_state : receive_t;
signal mac : std_logic_vector(47 downto 0); signal mac : std_logic_vector(47 downto 0);
signal recv_cnt : integer range 0 to 15; signal recv_cnt : integer range 0 to 15;
signal pkg_type : std_logic_vector(15 downto 0);
-- --
signal ws_busy : std_logic; signal ws_busy : std_logic;
signal ws_strb : std_logic; signal ws_strb : std_logic;
@ -246,6 +249,7 @@ begin -- architecture RTL
led1 <= '1'; led1 <= '1';
led2 <= '1'; led2 <= '1';
recv_cnt <= 0; recv_cnt <= 0;
pkg_type <= (others => '0');
mac <= (others => '0'); mac <= (others => '0');
elsif rising_edge(clk) then -- rising clock edge elsif rising_edge(clk) then -- rising clock edge
fifo_rst <= '0'; fifo_rst <= '0';
@ -254,6 +258,7 @@ begin -- architecture RTL
when PRE => when PRE =>
if sof = '1' then if sof = '1' then
recv_cnt <= 0; recv_cnt <= 0;
pkg_type <= (others => '0');
mac <= (others => '0'); mac <= (others => '0');
recv_state <= DESTMAC; recv_state <= DESTMAC;
led1 <= '1'; led1 <= '1';
@ -266,28 +271,35 @@ begin -- architecture RTL
elsif eth_strb = '1' then elsif eth_strb = '1' then
recv_cnt <= recv_cnt + 1; recv_cnt <= recv_cnt + 1;
mac <= mac(39 downto 0) & eth_dat; mac <= mac(39 downto 0) & eth_dat;
if recv_cnt = 5 then if recv_cnt = 5 and (mac(39 downto 0) & eth_dat) = DEFMAC then
recv_cnt <= 0; recv_cnt <= 0;
recv_state <= HEADER; recv_state <= SRCMAC;
end if; end if;
end if; end if;
when HEADER => when SRCMAC =>
led1 <= '0';
if eof = '1' then if eof = '1' then
recv_state <= PRE; recv_state <= PRE;
elsif eth_strb = '1' then elsif eth_strb = '1' then
recv_cnt <= recv_cnt + 1; recv_cnt <= recv_cnt + 1;
if recv_cnt = 7 then if recv_cnt 5 then -- SRC_MAC received
if mac = DEFMAC then recv_state <= TYPEFIELD
recv_state <= RECV; recv_cnt <= 0;
dat_cnt_s <= (others => '0'); end if;
else end if;
recv_state <= PRE;
when TYPEFIELD =>
if eof = '1' then
recv_state <= PRE;
elsif eth_strb = '1' then
recv_cnt <= recv_cnt + 1;
pkg_type <= pkg_type(7 downto 0) & eth_dat;
if recv_cnt = 1 then -- Type received
recv_cnt <= 0;
recv_state <= RECV;
end if; end if;
end if; end if;
end if;
when RECV => when RECV =>
led2 <= '0'; led2 <= '0';
if eth_strb = '1' and fifo_full /= '1' then if eth_strb = '1' and fifo_full /= '1' then