electronics/trashernet-soc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpga: Test Trashernet TX

Browse Source
This commit is contained in:
Markus Koch 2024-07-07 15:31:41 +02:00
parent 4057f5239e
commit e1672bb712
1 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
fpga/hdl/design/trashernet_phy_wb.vhd
View File

@ -51,10 +51,12 @@ architecture RTL of trashernet_phy_wb is
signal status_register : std_logic_vector(31 downto 0); signal status_register : std_logic_vector(31 downto 0);
signal rx_fifo_read : std_logic; signal rx_fifo_read : std_logic;
signal rx_fifo_full : std_logic;
signal rx_fifo_empty : std_logic;
signal rx_fifo_data : std_logic_vector(7 downto 0); signal rx_fifo_data : std_logic_vector(7 downto 0);
signal rx_fifo_usage : integer range 0 to 2047;
signal tx_fifo_write : std_logic;
signal tx_fifo_commit : std_logic;
signal tx_fifo_empty : std_logic;
signal tx_fifo_data : std_logic_vector(7 downto 0);
begin begin
trashernet_phy_inst : entity trashernet.trashernet_phy_cdc trashernet_phy_inst : entity trashernet.trashernet_phy_cdc
generic map( generic map(
@ -84,40 +86,69 @@ begin
write => phy_out.rx_data_valid, write => phy_out.rx_data_valid,
commit => not phy_out.rx_active, commit => not phy_out.rx_active,
abort => '0', abort => '0',
full => rx_fifo_full, full => open,
data_out => rx_fifo_data, data_out => rx_fifo_data,
data_first => open, data_first => open,
empty => rx_fifo_empty, empty => open,
read => rx_fifo_read, read => rx_fifo_read,
usage => rx_fifo_usage usage => open
);
tx_fifo_inst : entity generics.fifo_block
generic map(
SIZE => 2047
)
port map(
clk => clk,
rst_a => '0',
clr => rst,
data_in => wb_i.dat(7 downto 0),
write => tx_fifo_write,
commit => tx_fifo_commit,
abort => '0',
full => open,
data_out => tx_fifo_data,
data_first => open,
empty => tx_fifo_empty,
read => phy_out.tx_data_ack,
usage => open
); );
wb_adr <= unsigned(wb_i.adr(wb_adr'range)); wb_adr <= unsigned(wb_i.adr(wb_adr'range));
wbif : process(clk, rst) is wbif : process(clk, rst) is
variable bytes_rxd : unsigned(15 downto 0);
begin begin
if rst then if rst then
wb_o.ack <= '0'; wb_o.ack <= '0';
rx_fifo_read <= '0'; rx_fifo_read <= '0';
bytes_rxd := (others => '0'); tx_fifo_write <= '0';
tx_fifo_commit <= '0';
elsif rising_edge(clk) then elsif rising_edge(clk) then
wb_o.ack <= '0'; wb_o.ack <= '0';
rx_fifo_read <= '0'; rx_fifo_read <= '0';
tx_fifo_write <= '0';
tx_fifo_commit <= '0';
if (phy_out.rx_data_valid = '1') then
bytes_rxd := bytes_rxd + 1;
end if;
if (wb_i.cyc and wb_i.stb) then if (wb_i.cyc and wb_i.stb) then
wb_o.ack <= '1'; wb_o.ack <= '1';
if wb_adr = 0 then if wb_adr = 0 then
wb_o.dat <= status_register; wb_o.dat <= status_register;
if wb_o.ack = '0' then
if wb_i.we = '1' then
tx_fifo_commit <= '1';
end if;
end if;
else else
wb_o.dat <= (others => '0'); wb_o.dat <= (others => '0');
if wb_o.ack = '0' then if wb_o.ack = '0' then
if wb_i.we = '1' then
tx_fifo_write <= '1';
else
rx_fifo_read <= '1'; rx_fifo_read <= '1';
end if; end if;
end if;
wb_o.dat(7 downto 0) <= rx_fifo_data; wb_o.dat(7 downto 0) <= rx_fifo_data;
end if; end if;
end if; end if;
@ -128,8 +159,8 @@ begin
wb_o.rty <= '1'; wb_o.rty <= '1';
wb_o.stall <= '0'; wb_o.stall <= '0';
phy_in.tx_data_en <= '0'; phy_in.tx_data_en <= not tx_fifo_empty; -- FIXME: this does not care about inter-packet gaps indicated by `data_first`
phy_in.tx_data <= (others => '0'); phy_in.tx_data <= tx_fifo_data;
status_register <= (x"0000" & x"000" & "000" & phy_out.carrier_detect); status_register <= (x"0000" & x"000" & "000" & phy_out.carrier_detect);
end architecture RTL; end architecture RTL;