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

- reworked PISO and SIPO

Browse Source 
git-svn-id: http://moon:8086/svn/vhdl/trunk@1264 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2015-05-30 12:27:45 +00:00
parent 99b30ba0cc
commit 0e0a7e48a6
7 changed files with 185 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/emac/src/emac_rx.vhd
+11 -11
View File
@@ -73,14 +73,14 @@ ARCHITECTURE behavior OF emac_rx IS
signal sipo32_dout : unsigned(31 downto 0);
signal sipo32_dout_be : unsigned(3 downto 0);
signal sipo32_dout_vld : std_logic;
signal sipo32_dout_en : std_logic;
signal sipo32_shift_en : std_logic;
signal sipo32_en : std_logic;
signal sipo32_rst : std_logic;
signal sipo8_dout : unsigned(7 downto 0);
signal sipo8_rst : std_logic;
signal sipo8_dout_vld : std_logic;
signal sipo8_dout_en : std_logic;
signal sipo8_shift_en : std_logic;
signal sipo8_en : std_logic;
signal byte_count_rst : std_logic;
@@ -349,7 +349,7 @@ xfer_state_next:
end process;
xfer_state:
process(xfer_s, rx_en, sipo32_dout_en, preamble_bsy, preamble_OK, xfer_ram_full)
process(xfer_s, rx_en, sipo32_shift_en, preamble_bsy, preamble_OK, xfer_ram_full)
begin
commit_en <= '0';
@@ -390,11 +390,11 @@ xfer_state:
when xfer_setup =>
xfer_set <= '1';
sipo32_en <= rx_en;
xfer_en <= sipo32_dout_en;
xfer_en <= sipo32_shift_en;
xfer_sn <= xfer_active;
when xfer_active =>
xfer_en <= sipo32_dout_en;
xfer_en <= sipo32_shift_en;
sipo32_en <= rx_en;
if xfer_ram_full = '1' then
xfer_sn <= xfer_init;
@@ -403,8 +403,8 @@ xfer_state:
end if;
when xfer_finish =>
xfer_en <= sipo32_dout_en;
if sipo32_dout_en = '0' then
xfer_en <= sipo32_shift_en;
if sipo32_shift_en = '0' then
xfer_sn <= xfer_commit;
end if;
@@ -477,7 +477,7 @@ inst_sipo32 : entity work.sipo
dout_be => sipo32_dout_be,
dout_vld => sipo32_dout_vld,
dout => sipo32_dout,
dout_en => sipo32_dout_en
shift_en => sipo32_shift_en
);
@@ -524,7 +524,7 @@ mii_input_register:
else
sipo32_din <= sipo8_dout;
sipo32_din_vld <= sipo8_dout_vld;
rx_en <= sipo8_dout_en;
rx_en <= sipo8_shift_en;
end if;
end if;
end process;
@@ -546,11 +546,11 @@ inst_sipo_8bit : entity work.sipo
dout_be => open,
dout_vld => sipo8_dout_vld,
dout => sipo8_dout,
dout_en => sipo8_dout_en
shift_en => sipo8_shift_en
);
sipo8_rst <= reset_en or not (mii_rx_dv or sipo8_dout_en);
sipo8_rst <= reset_en or not (mii_rx_dv or sipo8_shift_en);
sipo8_en <= not mii_rx_er;
end behavior;