Commit da253ce5 authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

test/driver/design: Add CTU_CAN_ prefix

parent b35069f3
...@@ -142,7 +142,7 @@ void ctu_can_fd_enable(struct ctucanfd_priv *priv, bool enable) ...@@ -142,7 +142,7 @@ void ctu_can_fd_enable(struct ctucanfd_priv *priv, bool enable)
union ctu_can_fd_mode_command_status_settings reg; union ctu_can_fd_mode_command_status_settings reg;
reg.u32 = priv->read_reg(priv, CTU_CAN_FD_MODE); reg.u32 = priv->read_reg(priv, CTU_CAN_FD_MODE);
reg.s.ena = enable ? ENABLED : DISABLED; reg.s.ena = enable ? CTU_CAN_ENABLED : CTU_CAN_DISABLED;
priv->write_reg(priv, CTU_CAN_FD_MODE, reg.u32); priv->write_reg(priv, CTU_CAN_FD_MODE, reg.u32);
} }
......
...@@ -316,7 +316,7 @@ static inline bool ctu_can_fd_is_enabled(struct ctucanfd_priv *priv) ...@@ -316,7 +316,7 @@ static inline bool ctu_can_fd_is_enabled(struct ctucanfd_priv *priv)
union ctu_can_fd_mode_command_status_settings reg; union ctu_can_fd_mode_command_status_settings reg;
reg.u32 = priv->read_reg(priv, CTU_CAN_FD_MODE); reg.u32 = priv->read_reg(priv, CTU_CAN_FD_MODE);
return reg.s.ena == ENABLED; return reg.s.ena == CTU_CAN_ENABLED;
} }
......
...@@ -548,7 +548,7 @@ begin ...@@ -548,7 +548,7 @@ begin
elsif rising_edge(clk_sys) then elsif rising_edge(clk_sys) then
if (drv_ena = ENABLED) then if (drv_ena = CTU_CAN_ENABLED) then
case sp_control is case sp_control is
---------------------------------------------------------------- ----------------------------------------------------------------
...@@ -599,7 +599,7 @@ begin ...@@ -599,7 +599,7 @@ begin
elsif rising_edge(clk_sys) then elsif rising_edge(clk_sys) then
if (drv_ena = ENABLED and bit_err_enable = '1') then if (drv_ena = CTU_CAN_ENABLED and bit_err_enable = '1') then
case sp_control is case sp_control is
---------------------------------------------------------------- ----------------------------------------------------------------
......
...@@ -142,7 +142,7 @@ begin ...@@ -142,7 +142,7 @@ begin
unknown_OP_state <= '0'; unknown_OP_state <= '0';
if (drv_ena /= ENABLED) then if (drv_ena /= CTU_CAN_ENABLED) then
OP_State_r <= integrating; OP_State_r <= integrating;
elsif (set_transciever = '1') then elsif (set_transciever = '1') then
OP_State_r <= transciever; OP_State_r <= transciever;
...@@ -156,7 +156,7 @@ begin ...@@ -156,7 +156,7 @@ begin
-- Waiting for 11 consecutive recessive bits -- Waiting for 11 consecutive recessive bits
---------------------------------------------------------------- ----------------------------------------------------------------
when integrating => when integrating =>
if (drv_ena = ENABLED) then if (drv_ena = CTU_CAN_ENABLED) then
if (rec_trig = '1') then if (rec_trig = '1') then
-- Counting up the integration period -- Counting up the integration period
if (integ_counter = INTEGRATING_DURATION) then if (integ_counter = INTEGRATING_DURATION) then
...@@ -214,4 +214,4 @@ begin ...@@ -214,4 +214,4 @@ begin
end if; end if;
end process; end process;
end architecture; end architecture;
\ No newline at end of file
...@@ -3214,7 +3214,7 @@ begin ...@@ -3214,7 +3214,7 @@ begin
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
when off => when off =>
if (drv_ena = ENABLED) then if (drv_ena = CTU_CAN_ENABLED) then
if (error_state /= bus_off and OP_State /= integrating) then if (error_state /= bus_off and OP_State /= integrating) then
-- Note that here we don't want to execute FSM_Preset! We want -- Note that here we don't want to execute FSM_Preset! We want
......
...@@ -2786,9 +2786,9 @@ package body CANtestLib is ...@@ -2786,9 +2786,9 @@ package body CANtestLib is
begin begin
CAN_read(data, MODE_ADR, ID, mem_bus); CAN_read(data, MODE_ADR, ID, mem_bus);
if turn_on then if turn_on then
data(ENA_IND) := ENABLED; data(ENA_IND) := CTU_CAN_ENABLED;
else else
data(ENA_IND) := DISABLED; data(ENA_IND) := CTU_CAN_DISABLED;
end if; end if;
CAN_write(data, MODE_ADR, ID, mem_bus); CAN_write(data, MODE_ADR, ID, mem_bus);
CAN_read(readback, MODE_ADR, ID, mem_bus); CAN_read(readback, MODE_ADR, ID, mem_bus);
......
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