espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/twai_ll_parse_frame_buffer_typo' into 'master'

Browse Source 
TWAI: Fix twai_ll_parse_frame_buffer() typo

Closes IDFGH-7140

See merge request espressif/esp-idf!17875
This commit is contained in:
Darian
2022-04-22 21:29:59 +08:00
parent 5f8ead1bb6 09dc46552b
commit 7c5cf3988f
8 changed files with 47 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/hal/esp32/include/hal/can_ll.h
View File

@@ -1,16 +1,8 @@
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 * 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, 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) 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 ------------------------ */ /* ----------------------- RX Message Count Register ------------------------ */

22
components/hal/esp32/include/hal/twai_ll.h
View File

@@ -1,16 +1,8 @@
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 * 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 hw Start address of the TWAI registers
* @param rx_frame Pointer to store formatted frame * @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) 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] data Data. Left over bytes set to 0.
* @param[out] format Type of TWAI frame * @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) uint8_t *data, uint32_t *flags)
{ {
//Copy frame information //Copy frame information

22
components/hal/esp32c3/include/hal/twai_ll.h
View File

@@ -1,16 +1,8 @@
// Copyright 2021 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 * 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 hw Start address of the TWAI registers
* @param rx_frame Pointer to store formatted frame * @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) 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] data Data. Left over bytes set to 0.
* @param[out] format Type of TWAI frame * @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) uint8_t *data, uint32_t *flags)
{ {
//Copy frame information //Copy frame information

22
components/hal/esp32h2/include/hal/twai_ll.h
View File

@@ -1,16 +1,8 @@
// Copyright 2021 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 * 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 hw Start address of the TWAI registers
* @param rx_frame Pointer to store formatted frame * @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) 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] data Data. Left over bytes set to 0.
* @param[out] format Type of TWAI frame * @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) uint8_t *data, uint32_t *flags)
{ {
//Copy frame information //Copy frame information

22
components/hal/esp32s2/include/hal/twai_ll.h
View File

@@ -1,16 +1,8 @@
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 * 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 hw Start address of the TWAI registers
* @param rx_frame Pointer to store formatted frame * @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) 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] data Data. Left over bytes set to 0.
* @param[out] format Type of TWAI frame * @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) uint8_t *data, uint32_t *flags)
{ {
//Copy frame information //Copy frame information

22
components/hal/esp32s3/include/hal/twai_ll.h
View File

@@ -1,16 +1,8 @@
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 * 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 hw Start address of the TWAI registers
* @param rx_frame Pointer to store formatted frame * @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) 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] data Data. Left over bytes set to 0.
* @param[out] format Type of TWAI frame * @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) uint8_t *data, uint32_t *flags)
{ {
//Copy frame information //Copy frame information

20
components/hal/include/hal/twai_hal.h
View File

@@ -1,16 +1,8 @@
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 * 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) static inline void twai_hal_parse_frame(twai_hal_frame_t *frame, twai_message_t *message)
{ {
//Direct call to ll function //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); message->data, &message->flags);
} }

7
tools/ci/check_copyright_ignore.txt
View File

@@ -789,7 +789,6 @@ components/hal/esp32/brownout_hal.c
components/hal/esp32/gpio_hal_workaround.c components/hal/esp32/gpio_hal_workaround.c
components/hal/esp32/include/hal/aes_ll.h components/hal/esp32/include/hal/aes_ll.h
components/hal/esp32/include/hal/can_hal.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/can_types.h
components/hal/esp32/include/hal/clk_gate_ll.h components/hal/esp32/include/hal/clk_gate_ll.h
components/hal/esp32/include/hal/dac_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_hal.h
components/hal/esp32/include/hal/touch_sensor_ll.h components/hal/esp32/include/hal/touch_sensor_ll.h
components/hal/esp32/include/hal/trace_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/include/hal/uart_ll.h
components/hal/esp32/interrupt_descriptor_table.c components/hal/esp32/interrupt_descriptor_table.c
components/hal/esp32c3/hmac_hal.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/spi_flash_ll.h
components/hal/esp32c3/include/hal/spimem_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/systimer_ll.h
components/hal/esp32c3/include/hal/twai_ll.h
components/hal/esp32c3/include/hal/uhci_ll.h components/hal/esp32c3/include/hal/uhci_ll.h
components/hal/esp32c3/include/hal/usb_serial_jtag_ll.h components/hal/esp32c3/include/hal/usb_serial_jtag_ll.h
components/hal/esp32c3/rtc_cntl_hal.c 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_encrypted_ll.h
components/hal/esp32h2/include/hal/spi_flash_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/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_ll.h
components/hal/esp32h2/include/hal/uhci_types.h components/hal/esp32h2/include/hal/uhci_types.h
components/hal/esp32h2/include/hal/usb_serial_jtag_ll.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_hal.h
components/hal/esp32s2/include/hal/touch_sensor_ll.h components/hal/esp32s2/include/hal/touch_sensor_ll.h
components/hal/esp32s2/include/hal/trace_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/include/hal/usb_ll.h
components/hal/esp32s2/interrupt_descriptor_table.c components/hal/esp32s2/interrupt_descriptor_table.c
components/hal/esp32s2/touch_sensor_hal.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/spi_flash_ll.h
components/hal/esp32s3/include/hal/spimem_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/systimer_ll.h
components/hal/esp32s3/include/hal/twai_ll.h
components/hal/esp32s3/include/hal/uhci_ll.h components/hal/esp32s3/include/hal/uhci_ll.h
components/hal/esp32s3/include/hal/usb_ll.h components/hal/esp32s3/include/hal/usb_ll.h
components/hal/esp32s3/include/hal/usb_serial_jtag_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_hal.h
components/hal/include/hal/systimer_types.h components/hal/include/hal/systimer_types.h
components/hal/include/hal/touch_sensor_hal.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/twai_types.h
components/hal/include/hal/uart_types.h components/hal/include/hal/uart_types.h
components/hal/include/hal/uhci_types.h components/hal/include/hal/uhci_types.h