Просмотр исходного кода

mcpwm: fix implicit conversion in LL function

Closes https://github.com/espressif/esp-idf/issues/8066
morris 4 лет назад
Родитель
Сommit
ac5c2eaa28

+ 7 - 17
components/hal/esp32/include/hal/mcpwm_ll.h

@@ -1,16 +1,8 @@
-// Copyright 2015-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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE
@@ -339,17 +331,15 @@ static inline void mcpwm_ll_timer_set_count_mode(mcpwm_dev_t *mcpwm, int timer_i
 static inline mcpwm_timer_count_mode_t mcpwm_ll_timer_get_count_mode(mcpwm_dev_t *mcpwm, int timer_id)
 {
     switch (mcpwm->timer[timer_id].timer_cfg1.timer_mod) {
-    case 0:
-        return MCPWM_TIMER_COUNT_MODE_PAUSE;
     case 1:
         return MCPWM_TIMER_COUNT_MODE_UP;
     case 2:
         return MCPWM_TIMER_COUNT_MODE_DOWN;
     case 3:
         return MCPWM_TIMER_COUNT_MODE_UP_DOWN;
+    case 0:
     default:
-        HAL_ASSERT(false && "unknown count mode");
-        return mcpwm->timer[timer_id].timer_cfg1.timer_mod;
+        return MCPWM_TIMER_COUNT_MODE_PAUSE;
     }
 }
 

+ 8 - 18
components/hal/esp32s3/include/hal/mcpwm_ll.h

@@ -1,16 +1,8 @@
-// Copyright 2015-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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE
@@ -349,17 +341,15 @@ static inline void mcpwm_ll_timer_set_count_mode(mcpwm_dev_t *mcpwm, int timer_i
 static inline mcpwm_timer_count_mode_t mcpwm_ll_timer_get_count_mode(mcpwm_dev_t *mcpwm, int timer_id)
 {
     switch (mcpwm->timer[timer_id].timer_cfg1.timer_mod) {
-    case 0:
-        return MCPWM_TIMER_COUNT_MODE_PAUSE;
     case 1:
         return MCPWM_TIMER_COUNT_MODE_UP;
     case 2:
         return MCPWM_TIMER_COUNT_MODE_DOWN;
     case 3:
         return MCPWM_TIMER_COUNT_MODE_UP_DOWN;
+    case 0:
     default:
-        HAL_ASSERT(false && "unknown count mode");
-        return mcpwm->timer[timer_id].timer_cfg1.timer_mod;
+        return MCPWM_TIMER_COUNT_MODE_PAUSE;
     }
 }
 
@@ -397,7 +387,7 @@ static inline uint32_t mcpwm_ll_timer_get_count_value(mcpwm_dev_t *mcpwm, int ti
     }
     // up direction
     return (HAL_FORCE_READ_U32_REG_FIELD(mcpwm->timer[timer_id].timer_status, timer_value) +
-                HAL_FORCE_READ_U32_REG_FIELD(mcpwm->timer[timer_id].timer_cfg0, timer_period)) %
+            HAL_FORCE_READ_U32_REG_FIELD(mcpwm->timer[timer_id].timer_cfg0, timer_period)) %
            (HAL_FORCE_READ_U32_REG_FIELD(mcpwm->timer[timer_id].timer_cfg0, timer_period) + 1);
 }
 

+ 0 - 2
tools/ci/check_copyright_ignore.txt

@@ -990,7 +990,6 @@ components/hal/esp32/include/hal/emac_ll.h
 components/hal/esp32/include/hal/i2c_ll.h
 components/hal/esp32/include/hal/i2s_ll.h
 components/hal/esp32/include/hal/interrupt_controller_ll.h
-components/hal/esp32/include/hal/mcpwm_ll.h
 components/hal/esp32/include/hal/mpu_ll.h
 components/hal/esp32/include/hal/pcnt_ll.h
 components/hal/esp32/include/hal/rmt_ll.h
@@ -1120,7 +1119,6 @@ components/hal/esp32s3/include/hal/cpu_ll.h
 components/hal/esp32s3/include/hal/gpspi_flash_ll.h
 components/hal/esp32s3/include/hal/i2c_ll.h
 components/hal/esp32s3/include/hal/interrupt_controller_ll.h
-components/hal/esp32s3/include/hal/mcpwm_ll.h
 components/hal/esp32s3/include/hal/memprot_ll.h
 components/hal/esp32s3/include/hal/mpu_ll.h
 components/hal/esp32s3/include/hal/pcnt_ll.h