diff --git a/components/driver/include/driver/can.h b/components/driver/include/driver/can.h deleted file mode 100644 index a9e0aef657..0000000000 --- a/components/driver/include/driver/can.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -#warning driver/can.h is deprecated, please use driver/twai.h instead - -#include "hal/can_types.h" -#include "driver/twai.h" - -/* ---------------------------- Compatibility ------------------------------- */ - -#define CAN_GENERAL_CONFIG_DEFAULT(tx_io_num, rx_io_num, op_mode) TWAI_GENERAL_CONFIG_DEFAULT(tx_io_num, rx_io_num, op_mode) - -#define CAN_ALERT_TX_IDLE TWAI_ALERT_TX_IDLE -#define CAN_ALERT_TX_SUCCESS TWAI_ALERT_TX_SUCCESS -#define CAN_ALERT_BELOW_ERR_WARN TWAI_ALERT_BELOW_ERR_WARN -#define CAN_ALERT_ERR_ACTIVE TWAI_ALERT_ERR_ACTIVE -#define CAN_ALERT_RECOVERY_IN_PROGRESS TWAI_ALERT_RECOVERY_IN_PROGRESS -#define CAN_ALERT_BUS_RECOVERED TWAI_ALERT_BUS_RECOVERED -#define CAN_ALERT_ARB_LOST TWAI_ALERT_ARB_LOST -#define CAN_ALERT_ABOVE_ERR_WARN TWAI_ALERT_ABOVE_ERR_WARN -#define CAN_ALERT_BUS_ERROR TWAI_ALERT_BUS_ERROR -#define CAN_ALERT_TX_FAILED TWAI_ALERT_TX_FAILED -#define CAN_ALERT_RX_QUEUE_FULL TWAI_ALERT_RX_QUEUE_FULL -#define CAN_ALERT_ERR_PASS TWAI_ALERT_ERR_PASS -#define CAN_ALERT_BUS_OFF TWAI_ALERT_BUS_OFF -#define CAN_ALERT_ALL TWAI_ALERT_ALL -#define CAN_ALERT_NONE TWAI_ALERT_NONE -#define CAN_ALERT_AND_LOG TWAI_ALERT_AND_LOG - -#define CAN_IO_UNUSED TWAI_IO_UNUSED - -#define CAN_STATE_STOPPED TWAI_STATE_STOPPED -#define CAN_STATE_RUNNING TWAI_STATE_RUNNING -#define CAN_STATE_BUS_OFF TWAI_STATE_BUS_OFF -#define CAN_STATE_RECOVERING TWAI_STATE_RECOVERING - -#if SOC_TWAI_SUPPORTED -typedef twai_state_t can_state_t; -typedef twai_general_config_t can_general_config_t; -typedef twai_status_info_t can_status_info_t; -#endif // SOC_TWAI_SUPPORTED - -#define can_driver_install(g_config, t_config, f_config) twai_driver_install(g_config, t_config, f_config) -#define can_driver_uninstall() twai_driver_uninstall() -#define can_start() twai_start() -#define can_stop() twai_stop() -#define can_transmit(message, ticks_to_wait) twai_transmit(message, ticks_to_wait) -#define can_receive(message, ticks_to_wait) twai_receive(message, ticks_to_wait) -#define can_read_alerts(alerts, ticks_to_wait) twai_read_alerts(alerts, ticks_to_wait) -#define can_reconfigure_alerts(alerts_enabled, current_alerts) twai_reconfigure_alerts(alerts_enabled, current_alerts) -#define can_initiate_recovery() twai_initiate_recovery() -#define can_get_status_info(status_info) twai_get_status_info(status_info) -#define can_clear_transmit_queue() twai_clear_transmit_queue() -#define can_clear_receive_queue() twai_clear_receive_queue() - -#ifdef __cplusplus -} -#endif diff --git a/components/hal/esp32/include/hal/can_hal.h b/components/hal/esp32/include/hal/can_hal.h deleted file mode 100644 index 9752fe2e6c..0000000000 --- a/components/hal/esp32/include/hal/can_hal.h +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/******************************************************************************* - * NOTICE - * The hal is not public api, don't use in application code. - * See readme.md in hal/include/hal/readme.md - ******************************************************************************/ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -#warning hal/can_hal.h is deprecated, please use hal/twai_hal.h instead - -#include "hal/twai_hal.h" -#include "hal/can_types.h" - -/* ------------------------- Defines and Typedefs --------------------------- */ - -//Error active interrupt related -#define CAN_HAL_EVENT_BUS_OFF TWAI_HAL_EVENT_BUS_OFF -#define CAN_HAL_EVENT_BUS_RECOV_CPLT TWAI_HAL_EVENT_BUS_RECOV_CPLT -#define CAN_HAL_EVENT_BUS_RECOV_PROGRESS TWAI_HAL_EVENT_BUS_RECOV_PROGRESS -#define CAN_HAL_EVENT_ABOVE_EWL TWAI_HAL_EVENT_ABOVE_EWL -#define CAN_HAL_EVENT_BELOW_EWL TWAI_HAL_EVENT_BELOW_EWL -#define CAN_HAL_EVENT_ERROR_PASSIVE TWAI_HAL_EVENT_ERROR_PASSIVE -#define CAN_HAL_EVENT_ERROR_ACTIVE TWAI_HAL_EVENT_ERROR_ACTIVE -#define CAN_HAL_EVENT_BUS_ERR TWAI_HAL_EVENT_BUS_ERR -#define CAN_HAL_EVENT_ARB_LOST TWAI_HAL_EVENT_ARB_LOST -#define CAN_HAL_EVENT_RX_BUFF_FRAME TWAI_HAL_EVENT_RX_BUFF_FRAME -#define CAN_HAL_EVENT_TX_BUFF_FREE TWAI_HAL_EVENT_TX_BUFF_FREE - -typedef twai_hal_context_t can_hal_context_t; - -typedef twai_hal_frame_t can_hal_frame_t; - -/* ---------------------------- Init and Config ----------------------------- */ - -static inline bool can_hal_init(can_hal_context_t *hal_ctx){ - return twai_hal_init(hal_ctx); -} - -static inline void can_hal_deinit(can_hal_context_t *hal_ctx) -{ - twai_hal_deinit(hal_ctx); -} - -static inline void can_hal_configure(can_hal_context_t *hal_ctx, const can_timing_config_t *t_config, const can_filter_config_t *f_config, uint32_t intr_mask, uint32_t clkout_divider) -{ - twai_hal_configure(hal_ctx, t_config, f_config, intr_mask, clkout_divider); -} - -/* -------------------------------- Actions --------------------------------- */ - -static inline void can_hal_start(can_hal_context_t *hal_ctx, can_mode_t mode) -{ - twai_hal_start(hal_ctx, mode); -} - -static inline void can_hal_stop(can_hal_context_t *hal_ctx) -{ - twai_hal_stop(hal_ctx); -} - -static inline void can_hal_start_bus_recovery(can_hal_context_t *hal_ctx) -{ - twai_hal_start_bus_recovery(hal_ctx); -} - -static inline uint32_t can_hal_get_tec(can_hal_context_t *hal_ctx) -{ - return twai_hal_get_tec(hal_ctx); -} - -static inline uint32_t can_hal_get_rec(can_hal_context_t *hal_ctx) -{ - return twai_hal_get_rec(hal_ctx); -} - -static inline uint32_t can_hal_get_rx_msg_count(can_hal_context_t *hal_ctx) -{ - return twai_hal_get_rx_msg_count(hal_ctx); -} - -static inline bool can_hal_check_last_tx_successful(can_hal_context_t *hal_ctx) -{ - return twai_hal_check_last_tx_successful(hal_ctx); -} - -static inline bool can_hal_check_state_flags(can_hal_context_t *hal_ctx, uint32_t check_flags) -{ - return twai_hal_check_state_flags(hal_ctx, check_flags); -} - -/* ----------------------------- Event Handling ----------------------------- */ - -static inline uint32_t can_hal_decode_interrupt_events(can_hal_context_t *hal_ctx) { - return twai_hal_decode_interrupt(hal_ctx); -} - -/* ------------------------------- TX and RX -------------------------------- */ - -static inline void can_hal_format_frame(const can_message_t *message, can_hal_frame_t *frame) -{ - twai_hal_format_frame(message, frame); -} - -static inline void can_hal_parse_frame(can_hal_frame_t *frame, can_message_t *message) -{ - twai_hal_parse_frame(frame, message); -} - -static inline void can_hal_set_tx_buffer_and_transmit(can_hal_context_t *hal_ctx, can_hal_frame_t *tx_frame) -{ - twai_hal_set_tx_buffer_and_transmit(hal_ctx, tx_frame); -} - -static inline void can_hal_read_rx_buffer_and_clear(can_hal_context_t *hal_ctx, can_hal_frame_t *rx_frame) -{ - twai_hal_read_rx_buffer_and_clear(hal_ctx, rx_frame); -} - -#ifdef __cplusplus -} -#endif diff --git a/components/hal/esp32/include/hal/can_ll.h b/components/hal/esp32/include/hal/can_ll.h deleted file mode 100644 index 04f9482700..0000000000 --- a/components/hal/esp32/include/hal/can_ll.h +++ /dev/null @@ -1,246 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/******************************************************************************* - * NOTICE - * The ll is not public api, don't use in application code. - * See readme.md in hal/include/hal/readme.md - ******************************************************************************/ - -// The Lowlevel layer for CAN - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -#warning hal/can_ll.h is deprecated, please use hal/twai_ll.h instead - -#include "hal/twai_ll.h" -#include "hal/can_types.h" -#include "soc/can_periph.h" - -/* ------------------------- Defines and Typedefs --------------------------- */ - -#define CAN_LL_STATUS_RBS TWAI_LL_STATUS_RBS -#define CAN_LL_STATUS_DOS TWAI_LL_STATUS_DOS -#define CAN_LL_STATUS_TBS TWAI_LL_STATUS_TBS -#define CAN_LL_STATUS_TCS TWAI_LL_STATUS_TCS -#define CAN_LL_STATUS_RS TWAI_LL_STATUS_RS -#define CAN_LL_STATUS_TS TWAI_LL_STATUS_TS -#define CAN_LL_STATUS_ES TWAI_LL_STATUS_ES -#define CAN_LL_STATUS_BS TWAI_LL_STATUS_BS - -#define CAN_LL_INTR_RI TWAI_LL_INTR_RI -#define CAN_LL_INTR_TI TWAI_LL_INTR_TI -#define CAN_LL_INTR_EI TWAI_LL_INTR_EI -#define CAN_LL_INTR_EPI TWAI_LL_INTR_EPI -#define CAN_LL_INTR_ALI TWAI_LL_INTR_ALI -#define CAN_LL_INTR_BEI TWAI_LL_INTR_BEI - -typedef twai_ll_frame_buffer_t can_ll_frame_buffer_t; - -/* ---------------------------- Mode Register ------------------------------- */ - -static inline void can_ll_enter_reset_mode(can_dev_t *hw) -{ - twai_ll_enter_reset_mode(hw); -} - -static inline void can_ll_exit_reset_mode(can_dev_t *hw) -{ - twai_ll_exit_reset_mode(hw); -} - -static inline bool can_ll_is_in_reset_mode(can_dev_t *hw) -{ - return twai_ll_is_in_reset_mode(hw); -} - -static inline void can_ll_set_mode(can_dev_t *hw, can_mode_t mode) -{ - twai_ll_set_mode(hw, mode); -} - -/* --------------------------- Command Register ----------------------------- */ - -static inline void can_ll_set_cmd_tx(can_dev_t *hw) -{ - twai_ll_set_cmd_tx(hw); -} - -static inline void can_ll_set_cmd_tx_single_shot(can_dev_t *hw) -{ - twai_ll_set_cmd_tx_single_shot(hw); -} - -static inline void can_ll_set_cmd_abort_tx(can_dev_t *hw) -{ - twai_ll_set_cmd_abort_tx(hw); -} - -static inline void can_ll_set_cmd_release_rx_buffer(can_dev_t *hw) -{ - twai_ll_set_cmd_release_rx_buffer(hw); -} - -static inline void can_ll_set_cmd_clear_data_overrun(can_dev_t *hw) -{ - twai_ll_set_cmd_clear_data_overrun(hw); -} - -static inline void can_ll_set_cmd_self_rx_request(can_dev_t *hw) -{ - twai_ll_set_cmd_self_rx_request(hw); -} - -static inline void can_ll_set_cmd_self_rx_single_shot(can_dev_t *hw) -{ - twai_ll_set_cmd_self_rx_single_shot(hw); -} - -/* --------------------------- Status Register ------------------------------ */ - -static inline uint32_t can_ll_get_status(can_dev_t *hw) -{ - return twai_ll_get_status(hw); -} - -static inline bool can_ll_is_fifo_overrun(can_dev_t *hw) -{ - return twai_ll_is_fifo_overrun(hw); -} - -static inline bool can_ll_is_last_tx_successful(can_dev_t *hw) -{ - return twai_ll_is_last_tx_successful(hw); -} - -/* -------------------------- Interrupt Register ---------------------------- */ - -static inline uint32_t can_ll_get_and_clear_intrs(can_dev_t *hw) -{ - return twai_ll_get_and_clear_intrs(hw); -} - -/* ----------------------- Interrupt Enable Register ------------------------ */ - -static inline void can_ll_set_enabled_intrs(can_dev_t *hw, uint32_t intr_mask) -{ - twai_ll_set_enabled_intrs(hw, intr_mask); -} - -/* ------------------------ Bus Timing Registers --------------------------- */ - -static inline void can_ll_set_bus_timing(can_dev_t *hw, uint32_t brp, uint32_t sjw, uint32_t tseg1, uint32_t tseg2, bool triple_sampling) -{ - twai_ll_set_bus_timing(hw, brp, sjw, tseg1, tseg2, triple_sampling); -} - -/* ----------------------------- ALC Register ------------------------------- */ - -static inline void can_ll_clear_arb_lost_cap(can_dev_t *hw) -{ - twai_ll_clear_arb_lost_cap(hw); -} - -/* ----------------------------- ECC Register ------------------------------- */ - -static inline void can_ll_clear_err_code_cap(can_dev_t *hw) -{ - twai_ll_clear_err_code_cap(hw); -} - -/* ----------------------------- EWL Register ------------------------------- */ - -static inline void can_ll_set_err_warn_lim(can_dev_t *hw, uint32_t ewl) -{ - twai_ll_set_err_warn_lim(hw, ewl); -} - -static inline uint32_t can_ll_get_err_warn_lim(can_dev_t *hw) -{ - return twai_ll_get_err_warn_lim(hw); -} - -/* ------------------------ RX Error Count Register ------------------------- */ - -static inline uint32_t can_ll_get_rec(can_dev_t *hw) -{ - return twai_ll_get_rec(hw); -} - -static inline void can_ll_set_rec(can_dev_t *hw, uint32_t rec) -{ - twai_ll_set_rec(hw, rec); -} - -/* ------------------------ TX Error Count Register ------------------------- */ - -static inline uint32_t can_ll_get_tec(can_dev_t *hw) -{ - return twai_ll_get_tec(hw); -} - -static inline void can_ll_set_tec(can_dev_t *hw, uint32_t tec) -{ - twai_ll_set_tec(hw, tec); -} - -/* ---------------------- Acceptance Filter Registers ----------------------- */ - -static inline void can_ll_set_acc_filter(can_dev_t* hw, uint32_t code, uint32_t mask, bool single_filter) -{ - twai_ll_set_acc_filter(hw, code, mask, single_filter); -} - -/* ------------------------- TX/RX Buffer Registers ------------------------- */ - -static inline void can_ll_set_tx_buffer(can_dev_t *hw, can_ll_frame_buffer_t *tx_frame) -{ - twai_ll_set_tx_buffer(hw, tx_frame); -} - -static inline void can_ll_get_rx_buffer(can_dev_t *hw, can_ll_frame_buffer_t *rx_frame) -{ - twai_ll_get_rx_buffer(hw, rx_frame); -} - -static inline void can_ll_format_frame_buffer(uint32_t id, uint8_t dlc, const uint8_t *data, - uint32_t flags, can_ll_frame_buffer_t *tx_frame) -{ - twai_ll_format_frame_buffer(id, dlc, data, flags, tx_frame); -} - -static inline void can_ll_prase_frame_buffer(can_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, - uint8_t *data, uint32_t *flags) -{ - twai_ll_parse_frame_buffer(rx_frame, id, dlc, data, flags); -} - -/* ----------------------- RX Message Count Register ------------------------ */ - -static inline uint32_t can_ll_get_rx_msg_count(can_dev_t *hw) -{ - return twai_ll_get_rx_msg_count(hw); -} - -/* ------------------------- Clock Divider Register ------------------------- */ - -static inline void can_ll_set_clkout(can_dev_t *hw, uint32_t divider) -{ - twai_ll_set_clkout(hw, divider); -} - -static inline void can_ll_enable_extended_reg_layout(can_dev_t *hw) -{ - twai_ll_enable_extended_reg_layout(hw); -} - -#ifdef __cplusplus -} -#endif diff --git a/components/hal/include/hal/can_types.h b/components/hal/include/hal/can_types.h deleted file mode 100644 index 0bc7724c35..0000000000 --- a/components/hal/include/hal/can_types.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -#warning hal/can_types.h is deprecated, please use hal/twai_types.h instead - -#include "hal/twai_types.h" - -/* ---------------------------- Compatibility ------------------------------- */ - -#define CAN_EXTD_ID_MASK TWAI_EXTD_ID_MASK -#define CAN_STD_ID_MASK TWAI_STD_ID_MASK -#define CAN_FRAME_MAX_DLC TWAI_FRAME_MAX_DLC -#define CAN_FRAME_EXTD_ID_LEN_BYTES TWAI_FRAME_EXTD_ID_LEN_BYTES -#define CAN_FRAME_STD_ID_LEN_BYTES TWAI_FRAME_STD_ID_LEN_BYTES -#define CAN_ERR_PASS_THRESH TWAI_ERR_PASS_THRESH - -#define CAN_MSG_FLAG_NONE TWAI_MSG_FLAG_NONE -#define CAN_MSG_FLAG_EXTD TWAI_MSG_FLAG_EXTD -#define CAN_MSG_FLAG_RTR TWAI_MSG_FLAG_RTR -#define CAN_MSG_FLAG_SS TWAI_MSG_FLAG_SS -#define CAN_MSG_FLAG_SELF TWAI_MSG_FLAG_SELF -#define CAN_MSG_FLAG_DLC_NON_COMP TWAI_MSG_FLAG_DLC_NON_COMP - -#if (SOC_TWAI_BRP_MAX > 128) || (CONFIG_ESP32_REV_MIN >= 2) -#define CAN_TIMING_CONFIG_12_5KBITS() TWAI_TIMING_CONFIG_12_5KBITS() -#define CAN_TIMING_CONFIG_16KBITS() TWAI_TIMING_CONFIG_16KBITS() -#define CAN_TIMING_CONFIG_20KBITS() TWAI_TIMING_CONFIG_20KBITS() -#endif -#define CAN_TIMING_CONFIG_25KBITS() TWAI_TIMING_CONFIG_25KBITS() -#define CAN_TIMING_CONFIG_50KBITS() TWAI_TIMING_CONFIG_50KBITS() -#define CAN_TIMING_CONFIG_100KBITS() TWAI_TIMING_CONFIG_100KBITS() -#define CAN_TIMING_CONFIG_125KBITS() TWAI_TIMING_CONFIG_125KBITS() -#define CAN_TIMING_CONFIG_250KBITS() TWAI_TIMING_CONFIG_250KBITS() -#define CAN_TIMING_CONFIG_500KBITS() TWAI_TIMING_CONFIG_500KBITS() -#define CAN_TIMING_CONFIG_800KBITS() TWAI_TIMING_CONFIG_800KBITS() -#define CAN_TIMING_CONFIG_1MBITS() TWAI_TIMING_CONFIG_1MBITS() - -#define CAN_FILTER_CONFIG_ACCEPT_ALL() TWAI_FILTER_CONFIG_ACCEPT_ALL() - -typedef twai_mode_t can_mode_t; -#define CAN_MODE_NORMAL TWAI_MODE_NORMAL -#define CAN_MODE_NO_ACK TWAI_MODE_NO_ACK -#define CAN_MODE_LISTEN_ONLY TWAI_MODE_LISTEN_ONLY - -typedef twai_message_t can_message_t; -typedef twai_timing_config_t can_timing_config_t; -typedef twai_filter_config_t can_filter_config_t; - -#ifdef __cplusplus -} -#endif diff --git a/components/soc/esp32/include/soc/can_periph.h b/components/soc/esp32/include/soc/can_periph.h deleted file mode 100644 index 1feac200d2..0000000000 --- a/components/soc/esp32/include/soc/can_periph.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#pragma once - -#include "sdkconfig.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#warning soc/can_periph.h is deprecated, please use soc/twai_periph.h instead - -#if CONFIG_IDF_TARGET_ESP32 -#include "soc/soc_caps.h" -#include "soc/can_struct.h" -#endif - -#ifdef __cplusplus -} -#endif diff --git a/components/soc/esp32/include/soc/can_struct.h b/components/soc/esp32/include/soc/can_struct.h deleted file mode 100644 index d56efeddb9..0000000000 --- a/components/soc/esp32/include/soc/can_struct.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at - -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -#warning soc/can_struct.h is deprecated, please use soc/twai_struct.h instead - -#include "soc/twai_struct.h" - -typedef twai_dev_t can_dev_t; -extern can_dev_t CAN; - -#ifdef __cplusplus -} -#endif diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h index f1e3db1c2b..b43a180383 100644 --- a/components/soc/esp32/include/soc/soc_caps.h +++ b/components/soc/esp32/include/soc/soc_caps.h @@ -362,16 +362,6 @@ #define SOC_PM_SUPPORT_RTC_FAST_MEM_PD (1) #define SOC_PM_SUPPORT_RTC_SLOW_MEM_PD (1) -/* ---------------------------- Compatibility ------------------------------- */ -#define SOC_CAN_SUPPORTED SOC_TWAI_SUPPORTED -#define CAN_BRP_MIN SOC_TWAI_BRP_MIN -#define CAN_BRP_MAX SOC_TWAI_BRP_MAX -#define CAN_SUPPORT_MULTI_ADDRESS_LAYOUT SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT -#if SOC_CAPS_ECO_VER >= 2 -# define CAN_BRP_DIV_SUPPORTED SOC_TWAI_BRP_DIV_SUPPORTED -# define CAN_BRP_DIV_THRESH SOC_TWAI_BRP_DIV_THRESH -#endif - /*-------------------------- SDMMC CAPS -----------------------------------------*/ /* On ESP32, clock/cmd/data pins use IO MUX. diff --git a/components/soc/esp32/ld/esp32.peripherals.ld b/components/soc/esp32/ld/esp32.peripherals.ld index 7dbb7b6439..9d7b49fe28 100644 --- a/components/soc/esp32/ld/esp32.peripherals.ld +++ b/components/soc/esp32/ld/esp32.peripherals.ld @@ -36,7 +36,6 @@ PROVIDE ( EMAC_DMA = 0x3ff69000 ); PROVIDE ( EMAC_EXT = 0x3ff69800 ); PROVIDE ( EMAC_MAC = 0x3ff6A000 ); PROVIDE ( TWAI = 0x3ff6B000 ); -PROVIDE ( CAN = 0x3ff6B000 ); PROVIDE ( MCPWM1 = 0x3ff6C000 ); PROVIDE ( I2S1 = 0x3ff6D000 ); PROVIDE ( UART2 = 0x3ff6E000 ); diff --git a/docs/en/migration-guides/release-5.x/peripherals.rst b/docs/en/migration-guides/release-5.x/peripherals.rst index 31911b7134..0cad8fe66f 100644 --- a/docs/en/migration-guides/release-5.x/peripherals.rst +++ b/docs/en/migration-guides/release-5.x/peripherals.rst @@ -394,6 +394,14 @@ LCD 8. Calling :cpp:func:`i2s_del_channel` to delete and release the resources of the channel if it is not needed any more, but the channel must be disabled before deleting it. + +.. only:: SOC_TWAI_SUPPORTED + + TWAI Driver + ----------- + + The deprecated ``CAN`` peripheral driver is removed. Please use ``TWAI`` driver instead (i.e. include ``driver/twai.h`` in your application). + Register access macros ---------------------- diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index be4d34e02d..374f61b434 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -720,8 +720,6 @@ components/hal/aes_hal.c components/hal/dac_hal.c components/hal/ds_hal.c components/hal/esp32/include/hal/aes_ll.h -components/hal/esp32/include/hal/can_hal.h -components/hal/esp32/include/hal/can_types.h components/hal/esp32/include/hal/mpu_ll.h components/hal/esp32/include/hal/rwdt_ll.h components/hal/esp32/include/hal/spi_flash_encrypted_ll.h @@ -971,8 +969,6 @@ components/soc/esp32/include/soc/apb_ctrl_reg.h components/soc/esp32/include/soc/apb_ctrl_struct.h components/soc/esp32/include/soc/bb_reg.h components/soc/esp32/include/soc/boot_mode.h -components/soc/esp32/include/soc/can_periph.h -components/soc/esp32/include/soc/can_struct.h components/soc/esp32/include/soc/clkout_channel.h components/soc/esp32/include/soc/dac_channel.h components/soc/esp32/include/soc/emac_dma_struct.h diff --git a/tools/idf_py_actions/hints.yml b/tools/idf_py_actions/hints.yml index 06218ca723..99aaf808fd 100644 --- a/tools/idf_py_actions/hints.yml +++ b/tools/idf_py_actions/hints.yml @@ -108,6 +108,9 @@ re_variables: ['esp_panic.h'] hint_variables: ['esp_panic.h', 'use functionalities provided in esp_debug_helpers.h'] + - re_variables: ['driver/can.h'] + hint_variables: ['driver/can.h', 'driver/twai.h'] + - re: "error: implicit declaration of function 'esp_int_wdt_\\w+'" hint: 'The Interrupt Watchdog API has been made private, it shall not be used anymore. You can still force its inclusion with #include "esp_private/esp_int_wdt.h" (not recommended)'