HMBSI1536-180. Fix typo

This commit is contained in:
David Steele 2023-01-25 16:35:37 +00:00
commit d4658a3859

View file

@ -59,125 +59,126 @@ use work.pixel_buffer_2_pkg.all;
entity pixel_buffer_zero_gap_2 IS
generic (
MAX_OP_WIDTH : natural range 1 to 48 := 4;
SHIFT_DEPTH : integer range 1 to 1024 := 324;
SUB_HEADS : natural range 1 to 4 := 1; -- set to 1 if no sub heads
PX_DEPTH : integer range 1 to 1024 := 128;
RSVD_DEPTH : integer range 0 to 1024 := 0;
FULL_MARGIN : integer range 2 to 1024 := 8;
NUM_CHANS : integer range 1 to 4 := 2;
NO_ZERO_GAP : boolean := false;
EN_PEEK : boolean := false;
VECTORED_RDREQ : boolean := false;
DEVICE_FAMILY : string := "Cyclone V"; -- "Cyclone 10 LP"
ADD_PADDING : boolean := false -- set to true for SI1536 padding
MAX_OP_WIDTH : natural range 1 to 48 := 4;
SHIFT_DEPTH : integer range 1 to 1024 := 324;
SUB_HEADS : natural range 1 to 4 := 1; -- set to 1 if no sub heads
PX_DEPTH : integer range 1 to 1024 := 128;
RSVD_DEPTH : integer range 0 to 1024 := 0;
FULL_MARGIN : integer range 2 to 1024 := 8;
NUM_CHANS : integer range 1 to 4 := 2;
NO_ZERO_GAP : boolean := false;
EN_PEEK : boolean := false;
VECTORED_RDREQ : boolean := false;
DEVICE_FAMILY : string := "Cyclone V"; -- "Cyclone 10 LP"
ADD_PADDING : boolean := false -- set to true for SI1536 padding
);
port
(
clk : in std_logic;
rst_n : in std_logic;
clk : in std_logic;
rst_n : in std_logic;
pixel_buf_rdy : out std_logic_vector(NUM_CHANS-1 downto 0);
pixel_buf_rdy : out std_logic_vector(NUM_CHANS-1 downto 0);
last_word : in std_logic_vector(NUM_CHANS-1 downto 0);
data : in data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
wrreq : in std_logic_vector(NUM_CHANS-1 downto 0);
last_word : in std_logic_vector(NUM_CHANS-1 downto 0);
data : in data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
wrreq : in std_logic_vector(NUM_CHANS-1 downto 0);
rdreq : in std_logic;
rdreq_vec : in std_logic_vector(MAX_OP_WIDTH-1 downto 0) := (others => '0');
rdreq_rdy : out std_logic;
q : out data_array_t(NUM_CHANS-1 downto 0)(MAX_OP_WIDTH*32-1 downto 0);
rdreq : in std_logic;
rdreq_vec : in std_logic_vector(MAX_OP_WIDTH-1 downto 0) := (others => '0');
rdreq_rdy : out std_logic;
q : out data_array_t(NUM_CHANS-1 downto 0)(MAX_OP_WIDTH*32-1 downto 0);
empty : out std_logic;
full : out std_logic;
overrun : out std_logic;
underrun : out std_logic;
dbl_drop : out std_logic;
fp_drop : out std_logic;
overlap_error : out std_logic;
empty : out std_logic;
full : out std_logic;
overrun : out std_logic;
underrun : out std_logic;
dbl_drop : out std_logic;
fp_drop : out std_logic;
overlap_error : out std_logic;
en_dual_data_path : in std_logic;
print_data_width : in std_logic_vector( 5 downto 0);
clear_buffer : in std_logic;
en_dual_data_path : in std_logic;
print_data_width : in std_logic_vector( 5 downto 0);
clear_buffer : in std_logic;
start_req : in std_logic_vector(SUB_HEADS-1 downto 0);
start_req_first : in std_logic;
start_req_last : in std_logic;
start_req : in std_logic_vector(SUB_HEADS-1 downto 0);
start_req_first : in std_logic;
start_req_last : in std_logic;
seq_1st_start_req : in std_logic;
fire_req : in std_logic; -- Must be the first fire_req if there are multiple phases (e.g. fire_req(0) that starts Print Sequencer)
fire_req_start_merge : in std_logic; -- must be aligned with fire_req
drop_stripe : in std_logic;
sequencers_busy : out std_logic;
px_buf_ch_nactive : out std_logic_vector(NUM_CHANS-1 downto 0);
fp_holdoff_update : in std_logic;
wave_seq_len : in std_logic_vector(15 downto 0);
seq_1st_start_req : in std_logic;
fire_req : in std_logic; -- Must be the first fire_req if there are multiple phases (e.g. fire_req(0) that starts Print Sequencer)
fire_req_start_merge : in std_logic; -- must be aligned with fire_req
drop_stripe : in std_logic;
sequencers_busy : out std_logic;
px_buf_ch_nactive : out std_logic_vector(NUM_CHANS-1 downto 0);
fp_holdoff_update : in std_logic;
wave_seq_len : in std_logic_vector(15 downto 0);
all_on : in std_logic;
all_on : in std_logic;
diag_peek_sel : in std_logic;
diag_peek_addr : in std_logic_vector(31 downto 0);
diag_peek_data : out std_logic_vector(31 downto 0);
diag_peek_rdptr : out std_logic_vector( 7 downto 0);
diag_peek_wrptr : out std_logic_vector( 7 downto 0);
diag_peek_wdata : in std_logic_vector(31 downto 0);
diag_peek_wr : in std_logic;
diag_peek_sel : in std_logic;
diag_peek_addr : in std_logic_vector(31 downto 0);
diag_peek_data : out std_logic_vector(31 downto 0);
diag_peek_rdptr : out std_logic_vector( 7 downto 0);
diag_peek_wrptr : out std_logic_vector( 7 downto 0);
diag_peek_wdata : in std_logic_vector(31 downto 0);
diag_peek_wr : in std_logic;
diag_fire_req_count : out data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
diag_fire_simg_count : out data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
diag_last_stripe_count : out data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
diag_fire_req_count : out data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
diag_fire_simg_count : out data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
diag_last_stripe_count : out data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
diag_word_count : out std_logic_vector(6 downto 0)
diag_word_count : out std_logic_vector(6 downto 0)
);
end pixel_buffer_zero_gap_2;
architecture rtl of pixel_buffer_zero_gap_2 is
constant TOTAL_DEPTH_LOG2 : integer := log2(PX_DEPTH + RSVD_DEPTH);
constant NUM_CHANS_LOG2 : integer := log2(NUM_CHANS);
constant TOTAL_DEPTH_LOG2 : integer := log2(PX_DEPTH + RSVD_DEPTH);
constant NUM_CHANS_LOG2 : integer := log2(NUM_CHANS);
signal rd_req_int : std_logic_vector(NUM_CHANS-1 downto 0);
type rdreq_vec_t is array (natural range <> ) of std_logic_vector;
signal rdreq_vec_int : rdreq_vec_t(NUM_CHANS-1 downto 0)(MAX_OP_WIDTH-1 downto 0);
signal rd_req_rdy_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal rd_req_int : std_logic_vector(NUM_CHANS-1 downto 0);
type rdreq_vec_t is array (natural range <> ) of std_logic_vector;
signal rdreq_vec_int : rdreq_vec_t(NUM_CHANS-1 downto 0)(MAX_OP_WIDTH-1 downto 0);
signal rd_req_rdy_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal empty_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal full_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal overrun_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal underrun_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal dbl_drop_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal fp_drop_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal empty_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal full_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal overrun_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal underrun_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal dbl_drop_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal fp_drop_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal sequencers_busy_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal last_stripe_dropped : std_logic_vector(NUM_CHANS-1 downto 0);
signal sequencers_busy_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal last_stripe_dropped : std_logic_vector(NUM_CHANS-1 downto 0);
signal start_req_int : std_logic_vector(NUM_CHANS-1 downto 0);
signal start_req_int : std_logic_vector(NUM_CHANS-1 downto 0);
type buf_vec_t is array (natural range <> ) of std_logic_vector;
signal buf_active : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal buf_active_int : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal buf_active_late : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal buf_active_late_int : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal master_buf : std_logic_vector(NUM_CHANS-1 downto 0);
type buf_vec_t is array (natural range <> ) of std_logic_vector;
signal buf_active : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal buf_active_int : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal buf_active_late : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal buf_active_late_int : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal master_buf : std_logic_vector(NUM_CHANS-1 downto 0);
signal clr_buf_active : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal clr_buf_active_rdreq : std_logic_vector(SUB_HEADS-1 downto 0);
signal clr_buf_active_rdvec : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal is_last_wave : std_logic_vector(NUM_CHANS-1 downto 0);
signal clr_buf_active : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal clr_buf_active_rdreq : std_logic_vector(NUM_CHANS-1 downto 0);
signal clr_buf_active_rdvec : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal is_last_wave : std_logic_vector(NUM_CHANS-1 downto 0);
signal rd_data : data_array_t(NUM_CHANS-1 downto 0)(MAX_OP_WIDTH*32-1 downto 0);
signal last_stripe : data_array_t(NUM_CHANS-1 downto 0)(MAX_OP_WIDTH-1 downto 0);
signal diag_word_count_int : data_array_t(NUM_CHANS-1 downto 0)(6 downto 0);
signal diag_peek_data_int : data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
signal diag_peek_rdptr_int : data_array_t(NUM_CHANS-1 downto 0)( 7 downto 0);
signal rd_data : data_array_t(NUM_CHANS-1 downto 0)(MAX_OP_WIDTH*32-1 downto 0);
signal last_stripe : data_array_t(NUM_CHANS-1 downto 0)(MAX_OP_WIDTH-1 downto 0);
signal diag_word_count_int : data_array_t(NUM_CHANS-1 downto 0)(6 downto 0);
signal diag_peek_data_int : data_array_t(NUM_CHANS-1 downto 0)(31 downto 0);
signal diag_peek_rdptr_int : data_array_t(NUM_CHANS-1 downto 0)( 7 downto 0);
signal diag_peek_wrptr_int : data_array_t(NUM_CHANS-1 downto 0)( 7 downto 0);
signal fire_req_dly : std_logic;
signal drop_stripe_d : std_logic;
signal fire_req_dly : std_logic;
signal drop_stripe_d : std_logic;
signal is_zero_gap : std_logic;
signal is_zero_gap : std_logic;
signal buf_active_dly : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
signal buf_active_dly : buf_vec_t(SUB_HEADS-1 downto 0)(NUM_CHANS-1 downto 0);
begin
@ -238,7 +239,7 @@ begin
diag_peek_rdptr_int(NUM_CHANS-1 downto 1) <= (others => (others => '0'));
diag_peek_wrptr_int(NUM_CHANS-1 downto 1) <= (others => (others => '0'));
rd_req_rdy_int(NUM_CHANS-1 downto 1) <= (others => '0');
clr_buf_active(NUM_CHANS-1 downto 1) <= (others => '0');
clr_buf_active_rdreq(NUM_CHANS-1 downto 1)<= (others => '0');
GEN_TIE_OFF_Q : for i in 1 to NUM_CHANS-1 generate
q(i) <= (others => '0');
@ -299,7 +300,7 @@ begin
wrreq => wrreq(i),
rdreq => rd_req_int(i),
rdreq_vec => rdreq_vec_int(i),
rdreq_vec => rdreq_vec_int(i),
rdreq_rdy => rd_req_rdy_int(i),
q => rd_data(i),
last_word_op => last_stripe(i),