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

replace CAN with TWAI in the esp_isr_names table

Erhan Kurubas 3 лет назад
Родитель
Сommit
f8d439dee3

+ 6 - 14
components/soc/esp32/interrupts.c

@@ -1,16 +1,8 @@
-// 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.
+/*
+ * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include "soc/interrupts.h"
 
@@ -60,7 +52,7 @@ const char * const esp_isr_names[ETS_MAX_INTR_SOURCE] = {
     [42] = "PWM3",
     [43] = "LEDC",
     [44] = "EFUSE",
-    [45] = "CAN",
+    [45] = "TWAI",
     [46] = "RTC_CORE",
     [47] = "RMT",
     [48] = "PCNT",

+ 6 - 14
components/soc/esp32s2/interrupts.c

@@ -1,16 +1,8 @@
-// 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.
+/*
+ * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include "soc/interrupts.h"
 
@@ -62,7 +54,7 @@ const char * const esp_isr_names[ETS_MAX_INTR_SOURCE] = {
     [44] = "PWM3",
     [45] = "LEDC",
     [46] = "EFUSE",
-    [47] = "CAN",
+    [47] = "TWAI",
     [48] = "USB",
     [49] = "RTC_CORE",
     [50] = "RMT",

+ 0 - 2
tools/ci/check_copyright_ignore.txt

@@ -1032,7 +1032,6 @@ components/soc/esp32/include/soc/uart_struct.h
 components/soc/esp32/include/soc/uhci_reg.h
 components/soc/esp32/include/soc/uhci_struct.h
 components/soc/esp32/include/soc/wdev_reg.h
-components/soc/esp32/interrupts.c
 components/soc/esp32/ledc_periph.c
 components/soc/esp32/sdio_slave_periph.c
 components/soc/esp32/sdmmc_periph.c
@@ -1174,7 +1173,6 @@ components/soc/esp32s2/include/soc/usb_wrap_reg.h
 components/soc/esp32s2/include/soc/usb_wrap_struct.h
 components/soc/esp32s2/include/soc/usbh_struct.h
 components/soc/esp32s2/include/soc/wdev_reg.h
-components/soc/esp32s2/interrupts.c
 components/soc/esp32s2/ledc_periph.c
 components/soc/esp32s2/spi_periph.c
 components/soc/esp32s2/uart_periph.c