Commit 47ad6f94 authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

reg_map: Add SETTING[PEX] bit.

parent 0906562d
......@@ -5085,7 +5085,7 @@ cellcolor{cyan}
\end_inset
</cell>
<cell alignment="center" leftline="true" multicolumn="1" rightline="true" topline="true" usebox="none" valignment="top">
<cell alignment="center" leftline="true" multicolumn="1" topline="true" usebox="none" valignment="top">
\begin_inset Text
\begin_layout Plain Layout
......@@ -5141,11 +5141,11 @@ Reserved\end_layout
\end_inset
</cell>
<cell alignment="center" leftline="true" multicolumn="2" rightline="true" topline="true" usebox="none" valignment="top">
<cell alignment="center" leftline="true" multicolumn="1" rightline="true" topline="true" usebox="none" valignment="top">
\begin_inset Text
\begin_layout Plain Layout
Reserved\end_layout
PEX\end_layout
\end_inset
</cell>
......@@ -5226,7 +5226,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
-\end_layout
0\end_layout
\end_inset
</cell>
......@@ -5580,6 +5580,11 @@ NISOFD Non ISO FD. When active CTU CAN FD is compliant to NON-ISO CAN FD specifi
0b0 - ISO_FD - The CAN Controller conforms to ISO CAN FD specification.\begin_inset Newline newline\end_inset
0b1 - NON_ISO_FD - The CAN Controller conforms to NON ISO CAN FD specification.
\end_layout
\begin_layout Description
PEX Protocol exception handling. When turned-on CTU CAN FD will turn to integration state upon detection of protocol exception. This should be modified only when SETTINGS[ENA] = '0'.\begin_inset Newline newline\end_inset
0b0 - PROTOCOL_EXCEPTION_DISABLED - Protocol exception handling is disabled.\begin_inset Newline newline\end_inset
0b1 - PROTOCOL_EXCEPTION_ENABLED - Protocol exception handling is enabled.
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
\end_inset
......@@ -141,9 +141,11 @@ union ctu_can_fd_mode_settings {
uint32_t ilbp : 1;
uint32_t ena : 1;
uint32_t nisofd : 1;
uint32_t reserved_31_24 : 8;
uint32_t pex : 1;
uint32_t reserved_31_25 : 7;
#else
uint32_t reserved_31_24 : 8;
uint32_t reserved_31_25 : 7;
uint32_t pex : 1;
uint32_t nisofd : 1;
uint32_t ena : 1;
uint32_t ilbp : 1;
......@@ -207,6 +209,11 @@ enum ctu_can_fd_settings_nisofd {
NON_ISO_FD = 0x1,
};
enum ctu_can_fd_settings_pex {
PROTOCOL_EXCEPTION_DISABLED = 0x0,
PROTOCOL_EXCEPTION_ENABLED = 0x1,
};
union ctu_can_fd_status {
uint32_t u32;
struct ctu_can_fd_status_s {
......
......@@ -519,6 +519,32 @@
</ipxact:enumeratedValue>
</ipxact:enumeratedValues>
</ipxact:field>
<ipxact:field>
<ipxact:name>PEX</ipxact:name>
<ipxact:displayName>PEX</ipxact:displayName>
<ipxact:description>Protocol exception handling. When turned-on CTU CAN FD will turn to integration state upon detection of protocol exception. This should be modified only when SETTINGS[ENA] = '0'.</ipxact:description>
<ipxact:bitOffset>8</ipxact:bitOffset>
<ipxact:resets>
<ipxact:reset>
<ipxact:value>0</ipxact:value>
</ipxact:reset>
</ipxact:resets>
<ipxact:bitWidth>1</ipxact:bitWidth>
<ipxact:enumeratedValues>
<ipxact:enumeratedValue>
<ipxact:name>PROTOCOL_EXCEPTION_DISABLED</ipxact:name>
<ipxact:displayName>PROTOCOL_EXCEPTION_DISABLED</ipxact:displayName>
<ipxact:description>Protocol exception handling is disabled.</ipxact:description>
<ipxact:value>0</ipxact:value>
</ipxact:enumeratedValue>
<ipxact:enumeratedValue>
<ipxact:name>PROTOCOL_EXCEPTION_ENABLED</ipxact:name>
<ipxact:displayName>PROTOCOL_EXCEPTION_DISABLED</ipxact:displayName>
<ipxact:description>Protocol exception handling is enabled.</ipxact:description>
<ipxact:value>1</ipxact:value>
</ipxact:enumeratedValue>
</ipxact:enumeratedValues>
</ipxact:field>
</ipxact:register>
<ipxact:register>
<ipxact:name>INT_STAT</ipxact:name>
......
......@@ -230,6 +230,7 @@ package can_fd_register_map is
constant ILBP_IND : natural := 21;
constant ENA_IND : natural := 22;
constant NISOFD_IND : natural := 23;
constant PEX_IND : natural := 24;
-- "RTRLE" field enumerated values
constant RTRLE_DISABLED : std_logic := '0';
......@@ -247,12 +248,17 @@ package can_fd_register_map is
constant ISO_FD : std_logic := '0';
constant NON_ISO_FD : std_logic := '1';
-- "PEX" field enumerated values
constant PROTOCOL_EXCEPTION_DISABLED : std_logic := '0';
constant PROTOCOL_EXCEPTION_ENABLED : std_logic := '1';
-- SETTINGS register reset values
constant RTRLE_RSTVAL : std_logic := '0';
constant RTRTH_RSTVAL : std_logic_vector(3 downto 0) := x"0";
constant ILBP_RSTVAL : std_logic := '0';
constant ENA_RSTVAL : std_logic := '0';
constant NISOFD_RSTVAL : std_logic := '0';
constant PEX_RSTVAL : std_logic := '0';
------------------------------------------------------------------------------
-- STATUS register
......
......@@ -143,7 +143,7 @@ begin
settings_reg_comp : memory_reg
generic map(
data_width => 16 ,
data_mask => "0000000011111111" ,
data_mask => "0000000111111111" ,
reset_polarity => RESET_POLARITY ,
reset_value => "0000000000000000" ,
auto_clear => "0000000000000000" ,
......
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