Skip to content
Snippets Groups Projects
Commit 70c19c30 authored by Demba GANDEGA's avatar Demba GANDEGA
Browse files

ope

parent ed0ebbc5
No related branches found
No related tags found
No related merge requests found
...@@ -138,7 +138,6 @@ begin ...@@ -138,7 +138,6 @@ begin
if I_initAddress = '1' then if I_initAddress = '1' then
SR_readAddress <= 0; SR_readAddress <= 0;
elsif I_incrAddress = '1' then elsif I_incrAddress = '1' then
<<<<<<< HEAD
if SR_readAddress = 15 then if SR_readAddress = 15 then
SR_readAddress <= 0; -- Remise à zéro après la dernière adresse SR_readAddress <= 0; -- Remise à zéro après la dernière adresse
else else
...@@ -146,12 +145,7 @@ begin ...@@ -146,12 +145,7 @@ begin
end if; end if;
end if; end if;
end if; end if;
=======
SR_readAddress <= SR_readAddress + 1;
end if;
end if;
>>>>>>> a53fdce51ad497de249e58fc639a32572b562e23
end process incr_address; end process incr_address;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment