jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- added reset register bit for RX/TX

Browse Source 
Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/


git-svn-id: http://moon:8086/svn/vhdl/trunk@838 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2010-03-28 17:05:39 +00:00
parent 89b2cdc6f9
commit 2ca53be113
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/emac/src/emac_top_jb.vhd
+7 -1
View File
@@ -76,8 +76,10 @@ registers_write:
tx_din_vld <= '0'; tx_din_vld <= '0';
tx_ctrl_in.pkt_alloc_en <= '0'; tx_ctrl_in.pkt_alloc_en <= '0';
tx_ctrl_in.pkt_commit_en <= '0'; tx_ctrl_in.pkt_commit_en <= '0';
tx_ctrl_in.reset <= '0';
rx_ctrl_in.pkt_free_en <= '0'; rx_ctrl_in.pkt_free_en <= '0';
rx_ctrl_in.pkt_req_en <= '0'; rx_ctrl_in.pkt_req_en <= '0';
rx_ctrl_in.reset <= '0';
if RST_I = '1' then if RST_I = '1' then
rx_int_en <= '0'; rx_int_en <= '0';
tx_int_en <= '0'; tx_int_en <= '0';
@@ -88,8 +90,10 @@ registers_write:
when "0000" => when "0000" =>
tx_ctrl_in.tx_er <= DAT_I(31); tx_ctrl_in.tx_er <= DAT_I(31);
tx_ctrl_in.reset <= DAT_I(27);
tx_ctrl_in.pkt_alloc_en <= DAT_I(25); tx_ctrl_in.pkt_alloc_en <= DAT_I(25);
tx_ctrl_in.pkt_commit_en <= DAT_I(24); tx_ctrl_in.pkt_commit_en <= DAT_I(24);
rx_ctrl_in.reset <= DAT_I(23);
rx_ctrl_in.pkt_free_en <= DAT_I(17); rx_ctrl_in.pkt_free_en <= DAT_I(17);
rx_ctrl_in.pkt_req_en <= DAT_I(16); rx_ctrl_in.pkt_req_en <= DAT_I(16);
tx_int_en <= DAT_I(5); tx_int_en <= DAT_I(5);
@@ -125,9 +129,11 @@ registers_read:
DAT_O(30) <= mii_rx_er; DAT_O(30) <= mii_rx_er;
DAT_O(29) <= mii_col; DAT_O(29) <= mii_col;
DAT_O(28) <= mii_crs; DAT_O(28) <= mii_crs;
DAT_O(27) <= tx_ctrl_out.reset_busy;
DAT_O(25) <= tx_ctrl_out.pkt_alloc_req; DAT_O(25) <= tx_ctrl_out.pkt_alloc_req;
DAT_O(24) <= tx_ctrl_out.pkt_done; DAT_O(24) <= tx_ctrl_out.pkt_done;
DAT_O(23) <= rx_ctrl_out.pkt_lost; DAT_O(23) <= rx_ctrl_out.reset_busy;
DAT_O(17) <= rx_ctrl_out.pkt_lost;
DAT_O(16) <= rx_ctrl_out.pkt_avail; DAT_O(16) <= rx_ctrl_out.pkt_avail;
DAT_O(5) <= tx_int_en; DAT_O(5) <= tx_int_en;
DAT_O(4) <= rx_int_en; DAT_O(4) <= rx_int_en;
lib/emac/src/emac_types.vhd
+4
View File
@@ -19,15 +19,18 @@ package emac_types is
tx_size : unsigned(15 downto 0); tx_size : unsigned(15 downto 0);
pkt_commit_en : std_logic; pkt_commit_en : std_logic;
pkt_alloc_en : std_logic; pkt_alloc_en : std_logic;
reset : std_logic;
end record; end record;
type tx_ctrl_out_t is record type tx_ctrl_out_t is record
tx_size : unsigned(15 downto 0); tx_size : unsigned(15 downto 0);
pkt_done : std_logic; pkt_done : std_logic;
pkt_alloc_req : std_logic; pkt_alloc_req : std_logic;
reset_busy : std_logic;
end record; end record;
type rx_ctrl_in_t is record type rx_ctrl_in_t is record
reset : std_logic;
pkt_read_en : std_logic; pkt_read_en : std_logic;
pkt_req_en : std_logic; pkt_req_en : std_logic;
pkt_free_en : std_logic; pkt_free_en : std_logic;
@@ -38,6 +41,7 @@ package emac_types is
pkt_avail : std_logic; pkt_avail : std_logic;
pkt_lost : std_logic; pkt_lost : std_logic;
rx_size : unsigned(15 downto 0); rx_size : unsigned(15 downto 0);
reset_busy : std_logic;
end record; end record;
-- Functions -- Functions