blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

hal: fix issues reported by PVS-Studio

Browse Source 
https://www.viva64.com/en/b/0790/#ID369075A8F4
https://www.viva64.com/en/b/0790/#IDF03E449184
Reported in https://github.com/espressif/esp-idf/issues/6440
This commit is contained in:
Ivan Grokhotkov 2022-03-14 18:45:40 +01:00
parent 6a4a6d584b
commit 12717cbc00
No known key found for this signature in database
GPG Key ID: 1E050E141B280628
3 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/hal/esp32/include/hal/spi_flash_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
@ -370,7 +362,7 @@ static inline void spi_flash_ll_set_usr_address(spi_dev_t *dev, uint32_t addr, i
dev->addr = addr; dev->addr = addr;
dev->slv_wr_status = UINT32_MAX; dev->slv_wr_status = UINT32_MAX;
} else { } else {
uint32_t padding_ones = (bit_len == 32? 0 : UINT32_MAX >> bit_len); uint32_t padding_ones = UINT32_MAX >> bit_len;
dev->addr = (addr << (32 - bit_len)) | padding_ones; dev->addr = (addr << (32 - bit_len)) | padding_ones;
} }
} }

21
components/hal/esp32/touch_sensor_hal.c
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.
// The HAL layer for Touch sensor (common part) // The HAL layer for Touch sensor (common part)
@ -46,6 +38,7 @@ void touch_hal_get_wakeup_status(touch_pad_t *pad_num)
touch_ll_read_trigger_status_mask(&touch_mask); touch_ll_read_trigger_status_mask(&touch_mask);
if (touch_mask == 0) { if (touch_mask == 0) {
*pad_num = -1; *pad_num = -1;
} else {
*pad_num = (touch_pad_t)(__builtin_ffs(touch_mask) - 1);
} }
*pad_num = (touch_pad_t)(__builtin_ffs(touch_mask) - 1);
} }

2
tools/ci/check_copyright_ignore.txt
View File

@ -832,14 +832,12 @@ components/hal/esp32/include/hal/sha_ll.h
components/hal/esp32/include/hal/sigmadelta_ll.h components/hal/esp32/include/hal/sigmadelta_ll.h
components/hal/esp32/include/hal/soc_ll.h components/hal/esp32/include/hal/soc_ll.h
components/hal/esp32/include/hal/spi_flash_encrypted_ll.h components/hal/esp32/include/hal/spi_flash_encrypted_ll.h
components/hal/esp32/include/hal/spi_flash_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/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/esp32/touch_sensor_hal.c
components/hal/esp32c3/hmac_hal.c components/hal/esp32c3/hmac_hal.c
components/hal/esp32c3/include/hal/adc_hal_conf.h components/hal/esp32c3/include/hal/adc_hal_conf.h
components/hal/esp32c3/include/hal/aes_ll.h components/hal/esp32c3/include/hal/aes_ll.h