This commit was manufactured by cvs2svn to create tag 'EMAC_R3'.

git-svn-id: http://moon:8086/svn/vhdl/tags/EMAC_R3@900 cc03376c-175c-47c8-b038-4cd826a8556b

lib/emac/sim/tb_emac_top_jb.wdo

@@ -159,6 +159,8 @@ add wave -noupdate -format Literal -radix hexadecimal /tb_emac_top_jb/inst_emac_
 add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/ram_en_b
 add wave -noupdate -format Literal -radix hexadecimal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/ram_addr_b
 add wave -noupdate -format Literal -radix hexadecimal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/ram_dout_b
+add wave -noupdate -format Literal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/ifg_cnt
+add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/ifg_idle
 add wave -noupdate -format Literal -radix hexadecimal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso32_din
 add wave -noupdate -format Literal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso32_din_be
 add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso32_din_rdy
@@ -166,11 +168,6 @@ add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/p
 add wave -noupdate -format Literal -radix hexadecimal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso32_dout
 add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso32_dout_vld
 add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso32_dout_en
-add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/mii_fifo_we
-add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/mii_fifo_re
-add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/mii_fifo_full
-add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/mii_fifo_empty
-add wave -noupdate -format Literal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/mii_fifo_re_dly
 add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso8_din_vld
 add wave -noupdate -format Literal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso8_din
 add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/piso8_dout_vld
@@ -190,7 +187,7 @@ add wave -noupdate -format Literal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx
 add wave -noupdate -format Logic /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/mem_free_req
 add wave -noupdate -format Literal /tb_emac_top_jb/inst_emac_top_jb/inst_emac_tx/mem_free_ack
 TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 1} {242561800 ps} 0} {{Cursor 2} {49999967706 ps} 0} {{Cursor 3} {42725669958 ps} 0} {{Cursor 4} {16290550071 ps} 0} {{Cursor 5} {4181100 ps} 0}
+WaveRestoreCursors {{Cursor 1} {11284359462 ps} 0} {{Cursor 2} {49999967706 ps} 0} {{Cursor 3} {49999529250 ps} 0}
 configure wave -namecolwidth 150
 configure wave -valuecolwidth 100
 configure wave -justifyvalue left
@@ -204,4 +201,4 @@ configure wave -gridperiod 100
 configure wave -griddelta 40
 configure wave -timeline 1
 update
-WaveRestoreZoom {0 ps} {52500 us}
+WaveRestoreZoom {11283753554 ps} {11286295500 ps}

lib/emac/src/crc32.vhd

@@ -50,12 +50,11 @@ begin
 process(clk)
 begin
 	if rising_edge(clk) then
+		crc32_vld	<= not rst and din_vld;
 		if rst = '1' then
 			crc0		<= crc32_init;
-			crc32_vld	<= '0';
 		elsif din_vld = '1' then	
 			crc0		<= crc2;
-			crc32_vld	<= '1';
 		end if;
 	end if;
 end process;

lib/emac/src/emac_tx.vhd

@@ -116,9 +116,13 @@ ARCHITECTURE behavior OF emac_tx IS
 	signal mii_fifo_re		: std_logic;
 	signal mii_fifo_full	: std_logic;
 	signal mii_fifo_empty	: std_logic;
-	signal mii_fifo_re_dly	: unsigned(23 downto 0);
+	signal mii_fifo_re_dly	: unsigned(7 downto 0);
 
-	signal mii_bsy			: std_logic;
+	subtype ifg_cnt_t is natural range 0 to 23;		-- 10/100 mbps
+--	subtype ifg_cnt_t is natural range 0 to 11;		-- 1000 mbps
+
+	signal ifg_cnt			: ifg_cnt_t;
+	signal ifg_idle			: std_logic;
 
 	type host_state_t is (host_init, host_idle, host_alloc, host_setup, host_arm, host_fill, host_commit);
 	signal host_s, host_sn : host_state_t;
@@ -336,7 +340,6 @@ mem_free_counter:
 		end if;
 	end process;	
 
-------------------------------------------------------------------
 mem_free_mii:
 	process(mii_tx_clk)
 	begin
@@ -353,7 +356,6 @@ mem_free_mii:
 		end if;
 	end process;	
 
-------------------------------------------------------------------
 mem_free_host:
 	process(clk)
 	begin
@@ -371,6 +373,15 @@ mem_free_host:
 		end if;
 	end process;	
 
+host2xfer_sync_register:
+	process(mii_tx_clk)
+	begin
+		if rising_edge(mii_tx_clk) then
+			Gbps_en			<= ctrl_in.Gbps_en;
+			fcs_gen_en		<= ctrl_in.fcs_gen_en;
+		end if;	
+	end process;	
+
 ------------------------------------------------------------------
 -- Fill stuff
 ------------------------------------------------------------------
@@ -400,7 +411,6 @@ fill_counter:
 		end if;
 	end process;	
 
-------------------------------------------------------------------
 fill_pointer:
 	process(clk)
 	begin
@@ -416,14 +426,20 @@ fill_pointer:
 ------------------------------------------------------------------
 -- Transfer stuff
 ------------------------------------------------------------------
-host2xfer_sync_register:
+interframe_gap_counter:
 	process(mii_tx_clk)
 	begin
 		if rising_edge(mii_tx_clk) then
-			Gbps_en			<= ctrl_in.Gbps_en;
-			fcs_gen_en		<= ctrl_in.fcs_gen_en;
-		end if;	
-	end process;	
+			ifg_idle	<= '0';
+			if reset_en = '1' or mii_fifo_empty = '0' then
+				ifg_cnt 	<= ifg_cnt_t'high;
+			elsif ifg_cnt /= 0 then
+				ifg_cnt		<= ifg_cnt - 1;
+			else
+				ifg_idle	<= '1';
+			end if;
+		end if;
+	end process;
 
 ------------------------------------------------------------------
 xfer_counter:
@@ -449,7 +465,6 @@ xfer_counter:
 			
 	end process;	
 	
-------------------------------------------------------------------
 xfer_pointer:
 	process(mii_tx_clk)
 	begin
@@ -479,7 +494,7 @@ xfer_state_next:
 	end process;	
 
 xfer_state:
-	process(xfer_s, mii_bsy, cmd_fifo_empty, piso32_din_rdy, piso32_dout_vld, xfer_bsy, fcs_gen_en)
+	process(xfer_s, ifg_idle, cmd_fifo_empty, piso32_din_rdy, piso32_dout_vld, xfer_bsy, fcs_gen_en)
 	begin
 		
 		piso32_din_vld		<= '0';
@@ -500,12 +515,12 @@ xfer_state:
 			xfer_sn 		<= xfer_idle;
 			
 		when xfer_idle =>
-			if cmd_fifo_empty = '0' and mii_bsy = '0' then
+			if cmd_fifo_empty = '0' then
 				xfer_sn 		<= xfer_start;
 			end if;
 			
 		when xfer_start =>
-			if cmd_fifo_empty = '0' then
+			if cmd_fifo_empty = '0' and ifg_idle = '1' then
 				xfer_sn 		<= xfer_preamble0;
 			end if;
 
@@ -581,7 +596,6 @@ inst_ram : entity work.dpram_1w1r
 		dout_b		=> ram_dout_b
 	);
 
-------------------------------------------------------------------
 -- Instantiate synchronous FIFO
 inst_cmd_fifo: entity work.fifo_async
 	GENERIC MAP
@@ -605,7 +619,6 @@ inst_cmd_fifo: entity work.fifo_async
 		data_r		=>  cmd_fifo_dout
 	);
 
-------------------------------------------------------------------
 inst_piso32 : entity work.piso
 	GENERIC MAP
 	(
@@ -629,7 +642,6 @@ inst_piso32 : entity work.piso
 
 	piso32_dout_en	<= not mii_fifo_full; --'1' when Gbps_en = '1' else piso8_din_rdy;
 	
-------------------------------------------------------------------
 fcs_enable_gen:
 	process(mii_tx_clk)
 	begin
@@ -641,8 +653,8 @@ fcs_enable_gen:
 			end if;
 		end if;
 	end process;	
-
-------------------------------------------------------------------
+	fcs_din_vld	<= fcs_en(fcs_en'left) and piso32_dout_vld and piso32_dout_en;
+	
 inst_fcs: entity work.crc32
 	GENERIC MAP
 	(
@@ -659,29 +671,17 @@ inst_fcs: entity work.crc32
 		
 	);
 
-	fcs_din_vld	<= fcs_en(fcs_en'left) and piso32_dout_vld and piso32_dout_en;
-
-------------------------------------------------------------------
--- ensures continous MII-data stream and also acts as Inter Frame Gap delay
 mii_fifo_re_dly_gen:
 	process(mii_tx_clk)
 	begin
 		if rising_edge(mii_tx_clk) then
-			if mii_fifo_empty = '1' then
-				if Gbps_en = '0' then
-					mii_fifo_re_dly	<= X"000000";	-- 100 mbps
-				else
-					mii_fifo_re_dly	<= X"000FFF";	-- Gigabit
-				end if;
-			else
-				mii_fifo_re_dly	<= mii_fifo_re_dly(mii_fifo_re_dly'left-1 downto 0) & not mii_fifo_empty;
-			end if;
+			mii_fifo_re_dly	<= mii_fifo_re_dly(mii_fifo_re_dly'left-1 downto 0) & not mii_fifo_empty;
 		end if;
 	end process;	
 
-	mii_bsy			<= mii_fifo_re_dly(mii_fifo_re_dly'left);
+	mii_fifo_re		<= mii_fifo_re_dly(mii_fifo_re_dly'left) when Gbps_en = '1' else (piso8_din_rdy and mii_fifo_re_dly(mii_fifo_re_dly'left));
+	mii_fifo_we		<= piso32_dout_vld;
 	
-------------------------------------------------------------------
 -- Instantiate synchronous FIFO
 inst_mii_fifo: entity work.fifo_sync
 	GENERIC MAP
@@ -704,10 +704,6 @@ inst_mii_fifo: entity work.fifo_sync
 		data_r		=>  piso8_din
 	);
 	
-	mii_fifo_re		<= mii_bsy when Gbps_en = '1' else (piso8_din_rdy and mii_bsy);
-	mii_fifo_we		<= piso32_dout_vld;
-
-------------------------------------------------------------------
 inst_piso8 : entity work.piso
 	GENERIC MAP
 	(
@@ -728,10 +724,8 @@ inst_piso8 : entity work.piso
 		dout		=> piso8_dout
 		
 	);
-
-	piso8_din_vld	<= not mii_fifo_empty and mii_bsy;
+	piso8_din_vld	<= not mii_fifo_empty and mii_fifo_re_dly(mii_fifo_re_dly'left);
 	
-------------------------------------------------------------------
 mii_output_register:
 	process(mii_tx_clk)
 	begin
@@ -747,5 +741,4 @@ mii_output_register:
 		end if;	
 	end process;	
 
-------------------------------------------------------------------
 end behavior;