Commit 33a8fb2b authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

reg.map: Re-generate reg.map.

parent ba46d3f5
This diff is collapsed.
......@@ -45,50 +45,50 @@ enum ctu_can_fd_can_registers {
CTU_CAN_FD_MODE = 0x4,
CTU_CAN_FD_SETTINGS = 0x6,
CTU_CAN_FD_STATUS = 0x8,
CTU_CAN_FD_COMMAND = 0xa,
CTU_CAN_FD_INT_STAT = 0xc,
CTU_CAN_FD_INT_ENA_SET = 0x10,
CTU_CAN_FD_INT_ENA_CLR = 0x14,
CTU_CAN_FD_INT_MASK_SET = 0x18,
CTU_CAN_FD_INT_MASK_CLR = 0x1c,
CTU_CAN_FD_BTR = 0x20,
CTU_CAN_FD_BTR_FD = 0x24,
CTU_CAN_FD_EWL = 0x28,
CTU_CAN_FD_ERP = 0x29,
CTU_CAN_FD_FAULT_STATE = 0x2a,
CTU_CAN_FD_RXC = 0x2c,
CTU_CAN_FD_TXC = 0x2e,
CTU_CAN_FD_ERR_NORM = 0x30,
CTU_CAN_FD_ERR_FD = 0x32,
CTU_CAN_FD_CTR_PRES = 0x34,
CTU_CAN_FD_FILTER_A_MASK = 0x38,
CTU_CAN_FD_FILTER_A_VAL = 0x3c,
CTU_CAN_FD_FILTER_B_MASK = 0x40,
CTU_CAN_FD_FILTER_B_VAL = 0x44,
CTU_CAN_FD_FILTER_C_MASK = 0x48,
CTU_CAN_FD_FILTER_C_VAL = 0x4c,
CTU_CAN_FD_FILTER_RAN_LOW = 0x50,
CTU_CAN_FD_FILTER_RAN_HIGH = 0x54,
CTU_CAN_FD_FILTER_CONTROL = 0x58,
CTU_CAN_FD_FILTER_STATUS = 0x5a,
CTU_CAN_FD_RX_MEM_INFO = 0x5c,
CTU_CAN_FD_RX_POINTERS = 0x60,
CTU_CAN_FD_RX_STATUS = 0x64,
CTU_CAN_FD_RX_SETTINGS = 0x66,
CTU_CAN_FD_RX_DATA = 0x68,
CTU_CAN_FD_TX_STATUS = 0x6c,
CTU_CAN_FD_TX_COMMAND = 0x70,
CTU_CAN_FD_TX_PRIORITY = 0x74,
CTU_CAN_FD_ERR_CAPT = 0x78,
CTU_CAN_FD_ALC = 0x79,
CTU_CAN_FD_TRV_DELAY = 0x7c,
CTU_CAN_FD_SSP_CFG = 0x7e,
CTU_CAN_FD_RX_COUNTER = 0x80,
CTU_CAN_FD_TX_COUNTER = 0x84,
CTU_CAN_FD_DEBUG_REGISTER = 0x88,
CTU_CAN_FD_YOLO_REG = 0x8c,
CTU_CAN_FD_TIMESTAMP_LOW = 0x90,
CTU_CAN_FD_TIMESTAMP_HIGH = 0x94,
CTU_CAN_FD_COMMAND = 0xc,
CTU_CAN_FD_INT_STAT = 0x10,
CTU_CAN_FD_INT_ENA_SET = 0x14,
CTU_CAN_FD_INT_ENA_CLR = 0x18,
CTU_CAN_FD_INT_MASK_SET = 0x1c,
CTU_CAN_FD_INT_MASK_CLR = 0x20,
CTU_CAN_FD_BTR = 0x24,
CTU_CAN_FD_BTR_FD = 0x28,
CTU_CAN_FD_EWL = 0x2c,
CTU_CAN_FD_ERP = 0x2d,
CTU_CAN_FD_FAULT_STATE = 0x2e,
CTU_CAN_FD_RXC = 0x30,
CTU_CAN_FD_TXC = 0x32,
CTU_CAN_FD_ERR_NORM = 0x34,
CTU_CAN_FD_ERR_FD = 0x36,
CTU_CAN_FD_CTR_PRES = 0x38,
CTU_CAN_FD_FILTER_A_MASK = 0x3c,
CTU_CAN_FD_FILTER_A_VAL = 0x40,
CTU_CAN_FD_FILTER_B_MASK = 0x44,
CTU_CAN_FD_FILTER_B_VAL = 0x48,
CTU_CAN_FD_FILTER_C_MASK = 0x4c,
CTU_CAN_FD_FILTER_C_VAL = 0x50,
CTU_CAN_FD_FILTER_RAN_LOW = 0x54,
CTU_CAN_FD_FILTER_RAN_HIGH = 0x58,
CTU_CAN_FD_FILTER_CONTROL = 0x5c,
CTU_CAN_FD_FILTER_STATUS = 0x5e,
CTU_CAN_FD_RX_MEM_INFO = 0x60,
CTU_CAN_FD_RX_POINTERS = 0x64,
CTU_CAN_FD_RX_STATUS = 0x68,
CTU_CAN_FD_RX_SETTINGS = 0x6a,
CTU_CAN_FD_RX_DATA = 0x6c,
CTU_CAN_FD_TX_STATUS = 0x70,
CTU_CAN_FD_TX_COMMAND = 0x74,
CTU_CAN_FD_TX_PRIORITY = 0x78,
CTU_CAN_FD_ERR_CAPT = 0x7c,
CTU_CAN_FD_ALC = 0x7e,
CTU_CAN_FD_TRV_DELAY = 0x80,
CTU_CAN_FD_SSP_CFG = 0x82,
CTU_CAN_FD_RX_COUNTER = 0x84,
CTU_CAN_FD_TX_COUNTER = 0x88,
CTU_CAN_FD_DEBUG_REGISTER = 0x8c,
CTU_CAN_FD_YOLO_REG = 0x90,
CTU_CAN_FD_TIMESTAMP_LOW = 0x94,
CTU_CAN_FD_TIMESTAMP_HIGH = 0x98,
CTU_CAN_FD_TXTB1_DATA_1 = 0x100,
CTU_CAN_FD_TXTB1_DATA_2 = 0x104,
CTU_CAN_FD_TXTB1_DATA_20 = 0x14c,
......@@ -229,9 +229,9 @@ enum ctu_can_fd_settings_nisofd {
NON_ISO_FD = 0x1,
};
union ctu_can_fd_status_command {
union ctu_can_fd_status {
uint32_t u32;
struct ctu_can_fd_status_command_s {
struct ctu_can_fd_status_s {
#ifdef __LITTLE_ENDIAN_BITFIELD
/* STATUS */
uint32_t rxne : 1;
......@@ -242,7 +242,26 @@ union ctu_can_fd_status_command {
uint32_t txs : 1;
uint32_t ewl : 1;
uint32_t idle : 1;
uint32_t reserved_16_8 : 9;
uint32_t reserved_31_8 : 24;
#else
uint32_t reserved_31_8 : 24;
uint32_t idle : 1;
uint32_t ewl : 1;
uint32_t txs : 1;
uint32_t rxs : 1;
uint32_t eft : 1;
uint32_t txnf : 1;
uint32_t dor : 1;
uint32_t rxne : 1;
#endif
} s;
};
union ctu_can_fd_command {
uint32_t u32;
struct ctu_can_fd_command_s {
#ifdef __LITTLE_ENDIAN_BITFIELD
uint32_t reserved_0 : 1;
/* COMMAND */
uint32_t abt : 1;
uint32_t rrb : 1;
......@@ -250,24 +269,16 @@ union ctu_can_fd_status_command {
uint32_t ercrst : 1;
uint32_t rxfcrst : 1;
uint32_t txfcrst : 1;
uint32_t reserved_31_23 : 9;
uint32_t reserved_31_7 : 25;
#else
uint32_t reserved_31_23 : 9;
uint32_t reserved_31_7 : 25;
uint32_t txfcrst : 1;
uint32_t rxfcrst : 1;
uint32_t ercrst : 1;
uint32_t cdo : 1;
uint32_t rrb : 1;
uint32_t abt : 1;
uint32_t reserved_16_8 : 9;
uint32_t idle : 1;
uint32_t ewl : 1;
uint32_t txs : 1;
uint32_t rxs : 1;
uint32_t eft : 1;
uint32_t txnf : 1;
uint32_t dor : 1;
uint32_t rxne : 1;
uint32_t reserved_0 : 1;
#endif
} s;
};
......@@ -816,14 +827,16 @@ union ctu_can_fd_err_capt_alc {
/* ERR_CAPT */
uint32_t err_pos : 5;
uint32_t err_type : 3;
uint32_t reserved_15_8 : 8;
/* ALC */
uint32_t alc_bit : 5;
uint32_t alc_id_field : 3;
uint32_t reserved_31_16 : 16;
uint32_t reserved_31_24 : 8;
#else
uint32_t reserved_31_16 : 16;
uint32_t reserved_31_24 : 8;
uint32_t alc_id_field : 3;
uint32_t alc_bit : 5;
uint32_t reserved_15_8 : 8;
uint32_t err_type : 3;
uint32_t err_pos : 5;
#endif
......
......@@ -61,50 +61,50 @@ package can_fd_register_map is
constant MODE_ADR : std_logic_vector(11 downto 0) := x"004";
constant SETTINGS_ADR : std_logic_vector(11 downto 0) := x"006";
constant STATUS_ADR : std_logic_vector(11 downto 0) := x"008";
constant COMMAND_ADR : std_logic_vector(11 downto 0) := x"00A";
constant INT_STAT_ADR : std_logic_vector(11 downto 0) := x"00C";
constant INT_ENA_SET_ADR : std_logic_vector(11 downto 0) := x"010";
constant INT_ENA_CLR_ADR : std_logic_vector(11 downto 0) := x"014";
constant INT_MASK_SET_ADR : std_logic_vector(11 downto 0) := x"018";
constant INT_MASK_CLR_ADR : std_logic_vector(11 downto 0) := x"01C";
constant BTR_ADR : std_logic_vector(11 downto 0) := x"020";
constant BTR_FD_ADR : std_logic_vector(11 downto 0) := x"024";
constant EWL_ADR : std_logic_vector(11 downto 0) := x"028";
constant ERP_ADR : std_logic_vector(11 downto 0) := x"029";
constant FAULT_STATE_ADR : std_logic_vector(11 downto 0) := x"02A";
constant RXC_ADR : std_logic_vector(11 downto 0) := x"02C";
constant TXC_ADR : std_logic_vector(11 downto 0) := x"02E";
constant ERR_NORM_ADR : std_logic_vector(11 downto 0) := x"030";
constant ERR_FD_ADR : std_logic_vector(11 downto 0) := x"032";
constant CTR_PRES_ADR : std_logic_vector(11 downto 0) := x"034";
constant FILTER_A_MASK_ADR : std_logic_vector(11 downto 0) := x"038";
constant FILTER_A_VAL_ADR : std_logic_vector(11 downto 0) := x"03C";
constant FILTER_B_MASK_ADR : std_logic_vector(11 downto 0) := x"040";
constant FILTER_B_VAL_ADR : std_logic_vector(11 downto 0) := x"044";
constant FILTER_C_MASK_ADR : std_logic_vector(11 downto 0) := x"048";
constant FILTER_C_VAL_ADR : std_logic_vector(11 downto 0) := x"04C";
constant FILTER_RAN_LOW_ADR : std_logic_vector(11 downto 0) := x"050";
constant FILTER_RAN_HIGH_ADR : std_logic_vector(11 downto 0) := x"054";
constant FILTER_CONTROL_ADR : std_logic_vector(11 downto 0) := x"058";
constant FILTER_STATUS_ADR : std_logic_vector(11 downto 0) := x"05A";
constant RX_MEM_INFO_ADR : std_logic_vector(11 downto 0) := x"05C";
constant RX_POINTERS_ADR : std_logic_vector(11 downto 0) := x"060";
constant RX_STATUS_ADR : std_logic_vector(11 downto 0) := x"064";
constant RX_SETTINGS_ADR : std_logic_vector(11 downto 0) := x"066";
constant RX_DATA_ADR : std_logic_vector(11 downto 0) := x"068";
constant TX_STATUS_ADR : std_logic_vector(11 downto 0) := x"06C";
constant TX_COMMAND_ADR : std_logic_vector(11 downto 0) := x"070";
constant TX_PRIORITY_ADR : std_logic_vector(11 downto 0) := x"074";
constant ERR_CAPT_ADR : std_logic_vector(11 downto 0) := x"078";
constant ALC_ADR : std_logic_vector(11 downto 0) := x"079";
constant TRV_DELAY_ADR : std_logic_vector(11 downto 0) := x"07C";
constant SSP_CFG_ADR : std_logic_vector(11 downto 0) := x"07E";
constant RX_COUNTER_ADR : std_logic_vector(11 downto 0) := x"080";
constant TX_COUNTER_ADR : std_logic_vector(11 downto 0) := x"084";
constant DEBUG_REGISTER_ADR : std_logic_vector(11 downto 0) := x"088";
constant YOLO_REG_ADR : std_logic_vector(11 downto 0) := x"08C";
constant TIMESTAMP_LOW_ADR : std_logic_vector(11 downto 0) := x"090";
constant TIMESTAMP_HIGH_ADR : std_logic_vector(11 downto 0) := x"094";
constant COMMAND_ADR : std_logic_vector(11 downto 0) := x"00C";
constant INT_STAT_ADR : std_logic_vector(11 downto 0) := x"010";
constant INT_ENA_SET_ADR : std_logic_vector(11 downto 0) := x"014";
constant INT_ENA_CLR_ADR : std_logic_vector(11 downto 0) := x"018";
constant INT_MASK_SET_ADR : std_logic_vector(11 downto 0) := x"01C";
constant INT_MASK_CLR_ADR : std_logic_vector(11 downto 0) := x"020";
constant BTR_ADR : std_logic_vector(11 downto 0) := x"024";
constant BTR_FD_ADR : std_logic_vector(11 downto 0) := x"028";
constant EWL_ADR : std_logic_vector(11 downto 0) := x"02C";
constant ERP_ADR : std_logic_vector(11 downto 0) := x"02D";
constant FAULT_STATE_ADR : std_logic_vector(11 downto 0) := x"02E";
constant RXC_ADR : std_logic_vector(11 downto 0) := x"030";
constant TXC_ADR : std_logic_vector(11 downto 0) := x"032";
constant ERR_NORM_ADR : std_logic_vector(11 downto 0) := x"034";
constant ERR_FD_ADR : std_logic_vector(11 downto 0) := x"036";
constant CTR_PRES_ADR : std_logic_vector(11 downto 0) := x"038";
constant FILTER_A_MASK_ADR : std_logic_vector(11 downto 0) := x"03C";
constant FILTER_A_VAL_ADR : std_logic_vector(11 downto 0) := x"040";
constant FILTER_B_MASK_ADR : std_logic_vector(11 downto 0) := x"044";
constant FILTER_B_VAL_ADR : std_logic_vector(11 downto 0) := x"048";
constant FILTER_C_MASK_ADR : std_logic_vector(11 downto 0) := x"04C";
constant FILTER_C_VAL_ADR : std_logic_vector(11 downto 0) := x"050";
constant FILTER_RAN_LOW_ADR : std_logic_vector(11 downto 0) := x"054";
constant FILTER_RAN_HIGH_ADR : std_logic_vector(11 downto 0) := x"058";
constant FILTER_CONTROL_ADR : std_logic_vector(11 downto 0) := x"05C";
constant FILTER_STATUS_ADR : std_logic_vector(11 downto 0) := x"05E";
constant RX_MEM_INFO_ADR : std_logic_vector(11 downto 0) := x"060";
constant RX_POINTERS_ADR : std_logic_vector(11 downto 0) := x"064";
constant RX_STATUS_ADR : std_logic_vector(11 downto 0) := x"068";
constant RX_SETTINGS_ADR : std_logic_vector(11 downto 0) := x"06A";
constant RX_DATA_ADR : std_logic_vector(11 downto 0) := x"06C";
constant TX_STATUS_ADR : std_logic_vector(11 downto 0) := x"070";
constant TX_COMMAND_ADR : std_logic_vector(11 downto 0) := x"074";
constant TX_PRIORITY_ADR : std_logic_vector(11 downto 0) := x"078";
constant ERR_CAPT_ADR : std_logic_vector(11 downto 0) := x"07C";
constant ALC_ADR : std_logic_vector(11 downto 0) := x"07E";
constant TRV_DELAY_ADR : std_logic_vector(11 downto 0) := x"080";
constant SSP_CFG_ADR : std_logic_vector(11 downto 0) := x"082";
constant RX_COUNTER_ADR : std_logic_vector(11 downto 0) := x"084";
constant TX_COUNTER_ADR : std_logic_vector(11 downto 0) := x"088";
constant DEBUG_REGISTER_ADR : std_logic_vector(11 downto 0) := x"08C";
constant YOLO_REG_ADR : std_logic_vector(11 downto 0) := x"090";
constant TIMESTAMP_LOW_ADR : std_logic_vector(11 downto 0) := x"094";
constant TIMESTAMP_HIGH_ADR : std_logic_vector(11 downto 0) := x"098";
------------------------------------------------------------------------------
------------------------------------------------------------------------------
......@@ -311,12 +311,12 @@ package can_fd_register_map is
-- Writing logic 1 into each bit gives different command to the IP Core. After
-- writing logic 1, logic 0 does not have to be written.
------------------------------------------------------------------------------
constant ABT_IND : natural := 17;
constant RRB_IND : natural := 18;
constant CDO_IND : natural := 19;
constant ERCRST_IND : natural := 20;
constant RXFCRST_IND : natural := 21;
constant TXFCRST_IND : natural := 22;
constant ABT_IND : natural := 1;
constant RRB_IND : natural := 2;
constant CDO_IND : natural := 3;
constant ERCRST_IND : natural := 4;
constant RXFCRST_IND : natural := 5;
constant TXFCRST_IND : natural := 6;
-- COMMAND register reset values
constant ABT_RSTVAL : std_logic := '0';
......@@ -943,10 +943,10 @@ package can_fd_register_map is
-- Arbitration lost capture register. Determines bit position of last arbitrat
-- ion lost.
------------------------------------------------------------------------------
constant ALC_BIT_L : natural := 8;
constant ALC_BIT_H : natural := 12;
constant ALC_ID_FIELD_L : natural := 13;
constant ALC_ID_FIELD_H : natural := 15;
constant ALC_BIT_L : natural := 16;
constant ALC_BIT_H : natural := 20;
constant ALC_ID_FIELD_L : natural := 21;
constant ALC_ID_FIELD_H : natural := 23;
-- "ALC_ID_FIELD" field enumerated values
constant ALC_BASE_ID : std_logic_vector(2 downto 0) := "000";
......
......@@ -50,9 +50,9 @@ use ieee.std_logic_1164.all;
package can_registers_pkg is
type Control_registers_out_t is record
mode : std_logic_vector(7 downto 0);
settings : std_logic_vector(7 downto 0);
command : std_logic_vector(15 downto 0);
mode : std_logic_vector(15 downto 0);
settings : std_logic_vector(15 downto 0);
command : std_logic_vector(31 downto 0);
int_stat : std_logic_vector(15 downto 0);
int_ena_set : std_logic_vector(15 downto 0);
int_ena_clr : std_logic_vector(15 downto 0);
......@@ -83,7 +83,7 @@ package can_registers_pkg is
type Control_registers_in_t is record
device_id : std_logic_vector(15 downto 0);
version : std_logic_vector(15 downto 0);
status : std_logic_vector(15 downto 0);
status : std_logic_vector(31 downto 0);
int_stat : std_logic_vector(15 downto 0);
int_ena_set : std_logic_vector(15 downto 0);
int_mask_set : std_logic_vector(15 downto 0);
......
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