Merge branch 'master' of hydra:GIS_Embedded_Logic/EL-GENERIC-IP

This commit is contained in:
gianmarcogirau 2020-04-20 16:11:03 +01:00
commit 786327d340

View file

@ -118,7 +118,7 @@ entity pixel_buffer_0 is
ip_id_ip_number : out std_logic_vector(7 downto 0) := 8x"1c";
ip_id_mfr_number : out std_logic_vector(7 downto 0) := 8x"00";
ip_ver_minor_number : out std_logic_vector(7 downto 0) := 8x"02";
ip_ver_minor_number : out std_logic_vector(7 downto 0) := 8x"03";
ip_ver_major_number : out std_logic_vector(7 downto 0) := 8x"00";
diag_word_count : out std_logic_vector(6 downto 0)
@ -143,7 +143,7 @@ architecture rtl of pixel_buffer_0 is
signal wr_ptr_start : std_logic_vector(PX_DEPTH_LOG2 downto 0);
signal wr_ptr_plus1 : std_logic_vector(PX_DEPTH_LOG2 downto 0);
signal buf_word_count : std_logic_vector(3 downto 0);
signal buf_word_count : std_logic_vector(PX_DEPTH_LOG2 downto 0);
signal pixel_buf_wr_shft : std_logic_vector(MAX_OP_WIDTH - 1 downto 0);
signal wren : std_logic_vector(MAX_OP_WIDTH - 1 downto 0);
@ -334,8 +334,8 @@ begin
-- Update buffer input state when ever we get a strobe
if wr_req_int = '1' and error = '0' then
-- If the buffer 32 bit word count reached 3*bpp - 1, then rollover to 0
if buf_word_count = word_wrap(3 downto 0) then
-- If the buffer 32 bit word count reached 4*SHIFT_DEPTH/32-1, then rollover to 0
if buf_word_count = word_wrap then
buf_word_count <= (others => '0');