Commit b8866f11 authored by Martin Jeřábek's avatar Martin Jeřábek

testfw feature: mass renaming

parent ee8b3465
......@@ -74,7 +74,7 @@ package abort_transmittion_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -88,7 +88,7 @@ package body abort_transmittion_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
)is
......
......@@ -86,7 +86,7 @@ package arbitration_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -98,7 +98,7 @@ package body Arbitration_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -63,7 +63,7 @@ package fault_confinement_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -75,7 +75,7 @@ package body fault_confinement_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -78,7 +78,7 @@ package forbid_fd_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -91,7 +91,7 @@ package body forbid_fd_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -87,7 +87,7 @@ package interrupt_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -99,7 +99,7 @@ package body interrupt_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -66,7 +66,7 @@ package invalid_configs_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -79,7 +79,7 @@ package body invalid_configs_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -62,7 +62,7 @@ package overload_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -74,7 +74,7 @@ package body overload_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -20,19 +20,13 @@ package pkg_feature_exec_dispath is
constant NINST : natural := 2;
-- TODO: rename to outputs
type instance_inputs_t is record
type instance_outputs_t is record
drv_bus : std_logic_vector(1023 downto 0);
stat_bus : std_logic_vector(511 downto 0);
irq : std_logic;
hw_reset : std_logic;
end record;
type instance_outputs_t is record
nothing : boolean;
end record;
type instance_inputs_arr_t is array (1 to NINST) of instance_inputs_t;
type instance_outputs_arr_t is array (1 to NINST) of instance_outputs_t;
type mem_bus_arr_t is array (1 to NINST) of Avalon_mem_type;
......@@ -42,7 +36,7 @@ package pkg_feature_exec_dispath is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......
......@@ -64,7 +64,7 @@ package retr_limit_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -76,7 +76,7 @@ package body retr_limit_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -74,7 +74,7 @@ package rx_status_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -86,7 +86,7 @@ package body rx_status_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -86,7 +86,7 @@ package spec_mode_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -98,7 +98,7 @@ package body spec_mode_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -92,8 +92,7 @@ entity CAN_feature_test is
signal iteration_done : in boolean := false;
signal hw_reset_on_new_test : in boolean := true;
signal iin : out instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal iout : out instance_outputs_arr_t;
signal rand_ctr : in natural range 0 to RAND_POOL_SIZE;
--CAN bus signals
......@@ -199,10 +198,10 @@ begin
p(i).swr <= mem_bus(i).swr;
p(i).srd <= mem_bus(i).srd;
mem_bus(i).data_out <= p(i).data_out;
iin(i).irq <= p(i).int;
iin(i).drv_bus <= p(i).drv_bus;
iin(i).stat_bus <= p(i).stat_bus;
iin(i).hw_reset <= p(i).res_n;
iout(i).irq <= p(i).int;
iout(i).drv_bus <= p(i).drv_bus;
iout(i).stat_bus <= p(i).stat_bus;
iout(i).hw_reset <= p(i).res_n;
---------------------------------
--Transceiver and bus realization
......@@ -352,7 +351,6 @@ architecture tb of tb_feature is
signal mem_bus : mem_bus_arr_t := (OTHERS => mem_bus_init);
signal iin : instance_inputs_arr_t;
signal iout : instance_outputs_arr_t;
signal bus_level : std_logic;
......@@ -383,7 +381,6 @@ begin
hw_reset_on_new_test => hw_reset_on_new_test,
test_name => padded_test_name,
iout => iout,
iin => iin,
--Internal signals of CAN controllers
bus_level => bus_level,
rand_ctr => rand_ctr
......@@ -408,7 +405,7 @@ begin
restart_mem_bus(mem_bus(2));
wait for 10 ns;
wait until iin(1).hw_reset = '1' and iin(2).hw_reset = '1';
wait until iout(1).hw_reset = '1' and iout(2).hw_reset = '1';
wait for 10 ns;
--Execute the controllers configuration
......@@ -428,11 +425,11 @@ begin
report "Iteration ...";
iteration_done <= false;
exec_feature_test(test_name => test_name,
o => o,
rand_ctr => rand_ctr,
mem_bus => mem_bus,
iout => iin,
so => so,
o => o,
rand_ctr => rand_ctr,
mem_bus => mem_bus,
iout => iout,
so => so,
bus_level => bus_level
);
......
......@@ -70,7 +70,7 @@ package traf_meas_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -83,7 +83,7 @@ package body traf_meas_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -70,7 +70,7 @@ package tran_delay_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -83,7 +83,7 @@ package body tran_delay_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -79,7 +79,7 @@ package tx_arb_time_tran_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
);
......@@ -91,7 +91,7 @@ package body tx_arb_time_tran_feature is
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
......@@ -24,7 +24,7 @@ procedure exec_feature_test(
variable o : out feature_outputs_t;
signal so : out feature_signal_outputs_t;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
signal iout : in instance_inputs_arr_t;
signal iout : in instance_outputs_arr_t;
signal mem_bus : inout mem_bus_arr_t;
signal bus_level : in std_logic
) is
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment