From 09dc46552b16f3549e47ea897401050de407534a Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Fri, 22 Apr 2022 15:23:56 +0800 Subject: [PATCH] twai: Fix twai_ll_parse_frame_buffer() typo Closes https://github.com/espressif/esp-idf/issues/8743 --- components/hal/esp32/include/hal/can_ll.h | 20 ++++++------------ components/hal/esp32/include/hal/twai_ll.h | 22 +++++++------------- components/hal/esp32c3/include/hal/twai_ll.h | 22 +++++++------------- components/hal/esp32h2/include/hal/twai_ll.h | 22 +++++++------------- components/hal/esp32s2/include/hal/twai_ll.h | 22 +++++++------------- components/hal/esp32s3/include/hal/twai_ll.h | 22 +++++++------------- components/hal/include/hal/twai_hal.h | 20 ++++++------------ tools/ci/check_copyright_ignore.txt | 7 ------- 8 files changed, 47 insertions(+), 110 deletions(-) diff --git a/components/hal/esp32/include/hal/can_ll.h b/components/hal/esp32/include/hal/can_ll.h index 0d0c8b2960..04f9482700 100644 --- a/components/hal/esp32/include/hal/can_ll.h +++ b/components/hal/esp32/include/hal/can_ll.h @@ -1,16 +1,8 @@ -// 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. +/* + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /******************************************************************************* * NOTICE @@ -227,7 +219,7 @@ static inline void can_ll_format_frame_buffer(uint32_t id, uint8_t dlc, const ui 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_prase_frame_buffer(rx_frame, id, dlc, data, flags); + twai_ll_parse_frame_buffer(rx_frame, id, dlc, data, flags); } /* ----------------------- RX Message Count Register ------------------------ */ diff --git a/components/hal/esp32/include/hal/twai_ll.h b/components/hal/esp32/include/hal/twai_ll.h index 72949aa9cf..ad50f97422 100644 --- a/components/hal/esp32/include/hal/twai_ll.h +++ b/components/hal/esp32/include/hal/twai_ll.h @@ -1,16 +1,8 @@ -// 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. +/* + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /******************************************************************************* * NOTICE @@ -609,7 +601,7 @@ static inline void twai_ll_set_tx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t * @param hw Start address of the TWAI registers * @param rx_frame Pointer to store formatted frame * - * @note Call twai_ll_prase_frame_buffer() to parse the formatted frame + * @note Call twai_ll_parse_frame_buffer() to parse the formatted frame */ static inline void twai_ll_get_rx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t *rx_frame) { @@ -677,7 +669,7 @@ static inline void twai_ll_format_frame_buffer(uint32_t id, uint8_t dlc, const u * @param[out] data Data. Left over bytes set to 0. * @param[out] format Type of TWAI frame */ -static inline void twai_ll_prase_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, +static inline void twai_ll_parse_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, uint8_t *data, uint32_t *flags) { //Copy frame information diff --git a/components/hal/esp32c3/include/hal/twai_ll.h b/components/hal/esp32c3/include/hal/twai_ll.h index 371d4dd361..74010a3432 100644 --- a/components/hal/esp32c3/include/hal/twai_ll.h +++ b/components/hal/esp32c3/include/hal/twai_ll.h @@ -1,16 +1,8 @@ -// Copyright 2021 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. +/* + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /******************************************************************************* * NOTICE @@ -517,7 +509,7 @@ static inline void twai_ll_set_tx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t * @param hw Start address of the TWAI registers * @param rx_frame Pointer to store formatted frame * - * @note Call twai_ll_prase_frame_buffer() to parse the formatted frame + * @note Call twai_ll_parse_frame_buffer() to parse the formatted frame */ static inline void twai_ll_get_rx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t *rx_frame) { @@ -585,7 +577,7 @@ static inline void twai_ll_format_frame_buffer(uint32_t id, uint8_t dlc, const u * @param[out] data Data. Left over bytes set to 0. * @param[out] format Type of TWAI frame */ -static inline void twai_ll_prase_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, +static inline void twai_ll_parse_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, uint8_t *data, uint32_t *flags) { //Copy frame information diff --git a/components/hal/esp32h2/include/hal/twai_ll.h b/components/hal/esp32h2/include/hal/twai_ll.h index 92c46d010b..ac8930b02d 100644 --- a/components/hal/esp32h2/include/hal/twai_ll.h +++ b/components/hal/esp32h2/include/hal/twai_ll.h @@ -1,16 +1,8 @@ -// Copyright 2021 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. +/* + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /******************************************************************************* * NOTICE @@ -517,7 +509,7 @@ static inline void twai_ll_set_tx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t * @param hw Start address of the TWAI registers * @param rx_frame Pointer to store formatted frame * - * @note Call twai_ll_prase_frame_buffer() to parse the formatted frame + * @note Call twai_ll_parse_frame_buffer() to parse the formatted frame */ static inline void twai_ll_get_rx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t *rx_frame) { @@ -585,7 +577,7 @@ static inline void twai_ll_format_frame_buffer(uint32_t id, uint8_t dlc, const u * @param[out] data Data. Left over bytes set to 0. * @param[out] format Type of TWAI frame */ -static inline void twai_ll_prase_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, +static inline void twai_ll_parse_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, uint8_t *data, uint32_t *flags) { //Copy frame information diff --git a/components/hal/esp32s2/include/hal/twai_ll.h b/components/hal/esp32s2/include/hal/twai_ll.h index 7a04c18aef..960a124d93 100644 --- a/components/hal/esp32s2/include/hal/twai_ll.h +++ b/components/hal/esp32s2/include/hal/twai_ll.h @@ -1,16 +1,8 @@ -// 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. +/* + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /******************************************************************************* * NOTICE @@ -517,7 +509,7 @@ static inline void twai_ll_set_tx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t * @param hw Start address of the TWAI registers * @param rx_frame Pointer to store formatted frame * - * @note Call twai_ll_prase_frame_buffer() to parse the formatted frame + * @note Call twai_ll_parse_frame_buffer() to parse the formatted frame */ static inline void twai_ll_get_rx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t *rx_frame) { @@ -585,7 +577,7 @@ static inline void twai_ll_format_frame_buffer(uint32_t id, uint8_t dlc, const u * @param[out] data Data. Left over bytes set to 0. * @param[out] format Type of TWAI frame */ -static inline void twai_ll_prase_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, +static inline void twai_ll_parse_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, uint8_t *data, uint32_t *flags) { //Copy frame information diff --git a/components/hal/esp32s3/include/hal/twai_ll.h b/components/hal/esp32s3/include/hal/twai_ll.h index e9eef59104..29e2dc4155 100644 --- a/components/hal/esp32s3/include/hal/twai_ll.h +++ b/components/hal/esp32s3/include/hal/twai_ll.h @@ -1,16 +1,8 @@ -// 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. +/* + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /******************************************************************************* * NOTICE @@ -517,7 +509,7 @@ static inline void twai_ll_set_tx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t * @param hw Start address of the TWAI registers * @param rx_frame Pointer to store formatted frame * - * @note Call twai_ll_prase_frame_buffer() to parse the formatted frame + * @note Call twai_ll_parse_frame_buffer() to parse the formatted frame */ static inline void twai_ll_get_rx_buffer(twai_dev_t *hw, twai_ll_frame_buffer_t *rx_frame) { @@ -585,7 +577,7 @@ static inline void twai_ll_format_frame_buffer(uint32_t id, uint8_t dlc, const u * @param[out] data Data. Left over bytes set to 0. * @param[out] format Type of TWAI frame */ -static inline void twai_ll_prase_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, +static inline void twai_ll_parse_frame_buffer(twai_ll_frame_buffer_t *rx_frame, uint32_t *id, uint8_t *dlc, uint8_t *data, uint32_t *flags) { //Copy frame information diff --git a/components/hal/include/hal/twai_hal.h b/components/hal/include/hal/twai_hal.h index f4036655bd..aeeed60231 100644 --- a/components/hal/include/hal/twai_hal.h +++ b/components/hal/include/hal/twai_hal.h @@ -1,16 +1,8 @@ -// 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. +/* + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /******************************************************************************* * NOTICE @@ -253,7 +245,7 @@ static inline void twai_hal_format_frame(const twai_message_t *message, twai_hal static inline void twai_hal_parse_frame(twai_hal_frame_t *frame, twai_message_t *message) { //Direct call to ll function - twai_ll_prase_frame_buffer(frame, &message->identifier, &message->data_length_code, + twai_ll_parse_frame_buffer(frame, &message->identifier, &message->data_length_code, message->data, &message->flags); } diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 0d6d82ea79..88a48f2230 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -789,7 +789,6 @@ components/hal/esp32/brownout_hal.c components/hal/esp32/gpio_hal_workaround.c components/hal/esp32/include/hal/aes_ll.h components/hal/esp32/include/hal/can_hal.h -components/hal/esp32/include/hal/can_ll.h components/hal/esp32/include/hal/can_types.h components/hal/esp32/include/hal/clk_gate_ll.h components/hal/esp32/include/hal/dac_ll.h @@ -806,7 +805,6 @@ components/hal/esp32/include/hal/spi_flash_encrypted_ll.h components/hal/esp32/include/hal/touch_sensor_hal.h components/hal/esp32/include/hal/touch_sensor_ll.h components/hal/esp32/include/hal/trace_ll.h -components/hal/esp32/include/hal/twai_ll.h components/hal/esp32/include/hal/uart_ll.h components/hal/esp32/interrupt_descriptor_table.c components/hal/esp32c3/hmac_hal.c @@ -826,7 +824,6 @@ components/hal/esp32c3/include/hal/spi_flash_encrypted_ll.h components/hal/esp32c3/include/hal/spi_flash_ll.h components/hal/esp32c3/include/hal/spimem_flash_ll.h components/hal/esp32c3/include/hal/systimer_ll.h -components/hal/esp32c3/include/hal/twai_ll.h components/hal/esp32c3/include/hal/uhci_ll.h components/hal/esp32c3/include/hal/usb_serial_jtag_ll.h components/hal/esp32c3/rtc_cntl_hal.c @@ -845,7 +842,6 @@ components/hal/esp32h2/include/hal/soc_ll.h components/hal/esp32h2/include/hal/spi_flash_encrypted_ll.h components/hal/esp32h2/include/hal/spi_flash_ll.h components/hal/esp32h2/include/hal/spimem_flash_ll.h -components/hal/esp32h2/include/hal/twai_ll.h components/hal/esp32h2/include/hal/uhci_ll.h components/hal/esp32h2/include/hal/uhci_types.h components/hal/esp32h2/include/hal/usb_serial_jtag_ll.h @@ -875,7 +871,6 @@ components/hal/esp32s2/include/hal/systimer_ll.h components/hal/esp32s2/include/hal/touch_sensor_hal.h components/hal/esp32s2/include/hal/touch_sensor_ll.h components/hal/esp32s2/include/hal/trace_ll.h -components/hal/esp32s2/include/hal/twai_ll.h components/hal/esp32s2/include/hal/usb_ll.h components/hal/esp32s2/interrupt_descriptor_table.c components/hal/esp32s2/touch_sensor_hal.c @@ -894,7 +889,6 @@ components/hal/esp32s3/include/hal/spi_flash_encrypted_ll.h components/hal/esp32s3/include/hal/spi_flash_ll.h components/hal/esp32s3/include/hal/spimem_flash_ll.h components/hal/esp32s3/include/hal/systimer_ll.h -components/hal/esp32s3/include/hal/twai_ll.h components/hal/esp32s3/include/hal/uhci_ll.h components/hal/esp32s3/include/hal/usb_ll.h components/hal/esp32s3/include/hal/usb_serial_jtag_ll.h @@ -925,7 +919,6 @@ components/hal/include/hal/spi_slave_hd_hal.h components/hal/include/hal/systimer_hal.h components/hal/include/hal/systimer_types.h components/hal/include/hal/touch_sensor_hal.h -components/hal/include/hal/twai_hal.h components/hal/include/hal/twai_types.h components/hal/include/hal/uart_types.h components/hal/include/hal/uhci_types.h