HMBFDHV-83 Corrected the header in comms_avalon_unique_id. Minor Bug Fix to generic_sequencer_15 in that an uninitialised signal is now initialised.

This commit is contained in:
Damian Smith 2019-05-24 16:34:45 +01:00
commit ef93cc5e0f
2 changed files with 35 additions and 50 deletions

View file

@ -1,21 +1,5 @@
-------------------------------------------------------------------------------
-- Title : Command Interpreter
-- Project : SAMBA 1200 HIB
-------------------------------------------------------------------------------
-- File : command_interpreter.vhd
-- Author : Robbie Temple
-- Company : Global Inkjet Systems
-- Created : 2009-11-01
-- Last update: 2014-12-01
-- Platform :
-- Standard : VHDL'93
-------------------------------------------------------------------------------
-- Description:
-- SAMBA 1200 HIB test data board command interpreter version
-- Interprets the data stream and distributed data to the rest of the FPGA.
-- Receives responses and transmits them back to the LVDS parser.
-- FIXME - for now, assume that latency is OK and there is no need to back off
-- response messages - but test for this!
-- reports the unique FPGA ID
-------------------------------------------------------------------------------
-- Copyright (c) 2009 Global Inkjet Systems
-------------------------------------------------------------------------------
@ -25,60 +9,60 @@ use ieee.std_logic_1164.all;
use ieee.numeric_std.all;
entity comms_avalon_unique_id is
port (
port(
-- Clocks, resets and enables
clk : in std_logic;
rst_n : in std_logic;
clk : in std_logic;
rst_n : in std_logic;
----Avalon MM interface
avs_readdata : out std_logic_vector(31 downto 0);
avs_address : in std_logic_vector(1 downto 0);
avs_read_n : in std_logic
);
avs_readdata : out std_logic_vector(31 downto 0);
avs_address : in std_logic_vector(1 downto 0);
avs_read_n : in std_logic
);
end comms_avalon_unique_id;
architecture rtl of comms_avalon_unique_id is
component unique_chip_ID is
port (
clkin : in std_logic := '0'; -- clkin.clk
reset : in std_logic := '0'; -- reset.reset
data_valid : out std_logic; -- output.valid
chip_id : out std_logic_vector(63 downto 0) -- .data
);
component unique_chip_ID is
port(
clkin : in std_logic := '0'; -- clkin.clk
reset : in std_logic := '0'; -- reset.reset
data_valid : out std_logic; -- output.valid
chip_id : out std_logic_vector(63 downto 0) -- .data
);
end component;
signal data_valid : std_logic;
signal chip_id : std_logic_vector (63 downto 0);
signal data_valid : std_logic;
signal chip_id : std_logic_vector(63 downto 0);
begin
u_chip_ID : unique_chip_ID
port map (
port map(
clkin => clk,
reset => not rst_n,
data_valid => data_valid,
data_valid => data_valid,
chip_id => chip_id
);
);
--------Avalon Process
P_avalon_MM_read : process (clk, rst_n) is
begin -- process P_avalon_MM_read
--------Avalon Process
P_avalon_MM_read : process(clk, rst_n) is
begin -- process P_avalon_MM_read
if rst_n = '0' then
avs_readdata <= (others => '0');
elsif clk'event and clk = '1' then
avs_readdata <= (others => '0');
avs_readdata <= (others => '0');
if avs_read_n = '0' then
case avs_address is
when "00" =>
if data_valid='1' then
avs_readdata <= chip_id(31 downto 0);
end if;
when "00" =>
if data_valid = '1' then
avs_readdata <= chip_id(31 downto 0);
end if;
when "01" =>
if data_valid='1' then
avs_readdata <= chip_id(63 downto 32);
end if;
when "10" =>
avs_readdata(0) <=data_valid;
if data_valid = '1' then
avs_readdata <= chip_id(63 downto 32);
end if;
when "10" =>
avs_readdata(0) <= data_valid;
when others => null;
end case;
end if;

View file

@ -590,7 +590,7 @@ begin
ld_jmp_addr <= '1' when decode = '1' and (jump_abs = '1' or jump_rel = '1' or jump_r1 = '1') else '0';
jump_abs <= '1' when (opcode = CMD_JUMP and (subcode = X"0" or (subcode = X"1" and zero_flag = '1') or (subcode = X"2" and zero_flag = '0'))) or (opcode = CMD_END and subcode = X"1") else '0';
jump_abs <= '1' when (opcode = CMD_JUMP and (subcode = X"0" or (subcode = X"1" and zero_flag = '1') or (subcode = X"2" and zero_flag = '0'))) or (opcode = CMD_END and subcode = X"1") else '0';
jump_rel <= '1' when (opcode = CMD_BRANCH and (subcode = X"0" or (subcode = X"1" and zero_flag = '1') or (subcode = X"2" and zero_flag = '0'))) or (opcode = CMD_LOOP and loop_done = '0') or (opcode = CMD_END and subcode = X"2") else '0';
jump_r1 <= '1' when opcode = CMD_JUMP and subcode = X"F" else '0';
@ -635,6 +635,7 @@ begin
gRAMP_NOGEN : if VECT_RAMP_EN = false generate
ramp_val <= (others => '0');
ramp_up <= '0';
end generate gRAMP_NOGEN;
gBUS_BURST_GEN : if BUS_BURST_EN = true generate