Initial revision

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/branches/EMAC_BRANCH_DMA@1035 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
2013-09-22 10:56:52 +00:00
parent b6a0780463
commit 6277b516d0
4 changed files with 350 additions and 14 deletions
+106
View File
@@ -53,6 +53,18 @@ ARCHITECTURE behavior OF tb_emac_top_jb IS
signal status_reg : unsigned(31 downto 0) := (others => '0');
signal size_reg : unsigned(31 downto 0) := (others => '0');
-- Master
signal CYC_O : std_logic;
signal STB_O : std_logic;
signal WE_O : std_logic;
signal SEL_O : unsigned(3 downto 0) := (others => '1');
signal ACK_I : std_logic := '0';
signal MRDY_O : std_logic := '1';
signal SRDY_I : std_logic := '1';
signal ADDR_O : unsigned(31 downto 0) := (others => '-');
signal MDAT_I : unsigned(31 downto 0) := (others => '-');
signal MDAT_O : unsigned(31 downto 0) := (others => '-');
-- MII signals
signal mii_rx_clk_board : std_logic := '1';
signal mii_tx_clk_board : std_logic := '1';
@@ -90,8 +102,86 @@ ARCHITECTURE behavior OF tb_emac_top_jb IS
constant TX_SIZE_REG_ADDR : unsigned(31 downto 0) := X"0000_000C";
constant DATA_REG_ADDR : unsigned(31 downto 0) := X"0000_8000";
-- 64Bit RAM
signal MDAT_I_64 : unsigned(63 downto 0) := (others => '-');
signal MDAT_O_64 : unsigned(63 downto 0) := (others => '-');
type ram_t is array (0 to 511) of unsigned(63 downto 0);
signal ram64 : ram_t;
BEGIN
MDAT_I <= MDAT_I_64(31 downto 0);
MDAT_O_64 <= MDAT_O & MDAT_O;
process(CLK)
variable res: unsigned(63 downto 0);
variable ram_data : unsigned(63 downto 0);
variable data8: unsigned(7 downto 0);
begin
if rising_edge(CLK) then
if RST = '1' then
data8 := X"00";
for i in 0 to 255 loop
ram_data(7 downto 0) := data8;
data8 := data8 + 1;
ram_data(15 downto 8) := data8;
data8 := data8 + 1;
ram_data(23 downto 16) := data8;
data8 := data8 + 1;
ram_data(31 downto 24) := data8;
data8 := data8 + 1;
ram_data(39 downto 32) := data8;
data8 := data8 + 1;
ram_data(47 downto 40) := data8;
data8 := data8 + 1;
ram_data(55 downto 48) := data8;
data8 := data8 + 1;
ram_data(63 downto 56) := data8;
data8 := data8 + 1;
ram64(i) <= ram_data;
end loop;
else
ACK_I <= '0';
if (CYC_O and STB_O) = '1' then
if WE_O = '0' then
ACK_I <= '1';
ram_data := ram64(to_integer(ADDR_O(31 downto 3)));
if ADDR_O(2) = '0' then
res := ram_data;
else
res := ram_data(31 downto 0) & ram_data(63 downto 32);
end if;
else -- WE=1
ram_data := ram64(to_integer(ADDR_O(31 downto 3)));
-- ram_data := (others => '-');
if ADDR_O(2) = '0' then
if SEL_O = "11111111" then
ram64(to_integer(ADDR_O(31 downto 3))) <= MDAT_O_64;
elsif SEL_O = "00001111" then
ram64(to_integer(ADDR_O(31 downto 3))) <= ram_data(63 downto 32) & MDAT_O_64(31 downto 0);
elsif SEL_O = "11110000" then
ram64(to_integer(ADDR_O(31 downto 3))) <= MDAT_O_64(63 downto 32) & ram_data(31 downto 0);
end if;
else
if SEL_O = "11111111" then
ram64(to_integer(ADDR_O(31 downto 3))) <= MDAT_O_64(31 downto 0) & MDAT_O_64(63 downto 32);
elsif SEL_O = "00001111" then
ram64(to_integer(ADDR_O(31 downto 3))) <= MDAT_O_64(31 downto 0) & ram_data(31 downto 0);
elsif SEL_O = "11110000" then
ram64(to_integer(ADDR_O(31 downto 3))) <= ram_data(63 downto 32) & MDAT_O_64(63 downto 32);
end if;
end if;
end if;
end if;
MDAT_I_64 <= res;
end if;
end if;
end process;
inst_emac_top_jb : entity work.emac_top_jb
GENERIC MAP
(
@@ -101,6 +191,7 @@ inst_emac_top_jb : entity work.emac_top_jb
)
PORT MAP
(
-- JBUS Slave signals
CLK_I => CLK,
RST_I => RST,
INT_O => INT_O,
@@ -114,6 +205,19 @@ inst_emac_top_jb : entity work.emac_top_jb
ADDR_I => ADDR_I,
DAT_I => DAT_I,
DAT_O => DAT_O,
-- JBUS Master signals
CYC_O => CYC_O,
STB_O => STB_O,
WE_O => WE_O,
SEL_O => SEL_O,
ACK_I => ACK_I,
SRDY_I => SRDY_I,
MRDY_O => MRDY_O,
ADDR_O => ADDR_O,
MDAT_I => MDAT_I,
MDAT_O => MDAT_O,
mii_rx_clk => mii_rx_clk_board,
mii_rx_dv => mii_rx_dv,
mii_rx_er => mii_rx_er,
@@ -388,6 +492,7 @@ STIMULUS: process
variable size, num_words : natural;
begin
return;
emac_action <= emac_wait_data;
-- check if data available
@@ -473,6 +578,7 @@ STIMULUS: process
procedure emac_free is
begin
return;
-- RX- DEALLOCATION
emac_action <= emac_free;