This is an automated email from the ASF dual-hosted git repository. jerzy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit c88a97c489454f6198b5d227a72b6f35431f4066 Author: Jerzy Kasenberg <[email protected]> AuthorDate: Wed Oct 2 09:26:14 2024 +0200 hw/cmsis: Cleanup NVIC related prototypes NVIC_Relocate, NVIC_SetVector, NVIC_GetVector prototypes were defined in a lot of places. Now they are put in one header. Signed-off-by: Jerzy Kasenberg <[email protected]> --- .../include/mynewt_nvic.h} | 28 ++++------------------ hw/mcu/ambiq/apollo2/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/ambiq/apollo3/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/atmel/samd21xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/dialog/da1469x/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/nordic/nrf51xxx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/nordic/nrf5340/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/nordic/nrf5340_net/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/nordic/nrf91xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/nxp/kinetis/MK8xF/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/nxp/lpc55xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/nxp/mkw41z/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32f0xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32f1xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32f3xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32f4xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32f7xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32g0xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32g4xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32h7xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32l0xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32l1xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32l4xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32u5xx/include/mcu/cmsis_nvic.h | 4 ---- hw/mcu/stm/stm32wbxx/include/mcu/cmsis_nvic.h | 4 ---- 26 files changed, 5 insertions(+), 123 deletions(-) diff --git a/hw/mcu/atmel/samd21xx/include/mcu/cmsis_nvic.h b/hw/cmsis-core/include/mynewt_nvic.h similarity index 67% copy from hw/mcu/atmel/samd21xx/include/mcu/cmsis_nvic.h copy to hw/cmsis-core/include/mynewt_nvic.h index 4b8909b61..d861225af 100644 --- a/hw/mcu/atmel/samd21xx/include/mcu/cmsis_nvic.h +++ b/hw/cmsis-core/include/mynewt_nvic.h @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,32 +17,14 @@ * under the License. */ -/* mbed Microcontroller Library - cmsis_nvic - * Copyright (c) 2009-2011 ARM Limited. All rights reserved. - * - * CMSIS-style functionality to support dynamic vectors - */ - -#ifndef __CMSIS_NVIC_H__ -#define __CMSIS_NVIC_H__ - -#include <stdint.h> - -#define NVIC_NUM_VECTORS (16 + 29) // CORE + MCU Peripherals -#define NVIC_USER_IRQ_OFFSET 16 +#ifndef MYNEWT_NVIC_H +#define MYNEWT_NVIC_H -#include <mcu/cortex_m0.h> - -#ifdef __cplusplus -extern "C" { -#endif +#include <mcu/cmsis_nvic.h> +#include <os/util.h> void NVIC_Relocate(void); void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); uint32_t NVIC_GetVector(IRQn_Type IRQn); -#ifdef __cplusplus -} -#endif - #endif diff --git a/hw/mcu/ambiq/apollo2/include/mcu/cmsis_nvic.h b/hw/mcu/ambiq/apollo2/include/mcu/cmsis_nvic.h index 1e8fec1d8..ee509ac6d 100644 --- a/hw/mcu/ambiq/apollo2/include/mcu/cmsis_nvic.h +++ b/hw/mcu/ambiq/apollo2/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/ambiq/apollo3/include/mcu/cmsis_nvic.h b/hw/mcu/ambiq/apollo3/include/mcu/cmsis_nvic.h index a7398f992..f1d4bd71c 100644 --- a/hw/mcu/ambiq/apollo3/include/mcu/cmsis_nvic.h +++ b/hw/mcu/ambiq/apollo3/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/atmel/samd21xx/include/mcu/cmsis_nvic.h b/hw/mcu/atmel/samd21xx/include/mcu/cmsis_nvic.h index 4b8909b61..788b65c0e 100644 --- a/hw/mcu/atmel/samd21xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/atmel/samd21xx/include/mcu/cmsis_nvic.h @@ -37,10 +37,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/dialog/da1469x/include/mcu/cmsis_nvic.h b/hw/mcu/dialog/da1469x/include/mcu/cmsis_nvic.h index 04298ac14..a298498dd 100644 --- a/hw/mcu/dialog/da1469x/include/mcu/cmsis_nvic.h +++ b/hw/mcu/dialog/da1469x/include/mcu/cmsis_nvic.h @@ -17,10 +17,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/nordic/nrf51xxx/include/mcu/cmsis_nvic.h b/hw/mcu/nordic/nrf51xxx/include/mcu/cmsis_nvic.h index 5d2ae8304..cd1b74911 100644 --- a/hw/mcu/nordic/nrf51xxx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/nordic/nrf51xxx/include/mcu/cmsis_nvic.h @@ -19,10 +19,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h b/hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h index 11a812d33..363be0275 100644 --- a/hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h @@ -17,10 +17,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/nordic/nrf5340/include/mcu/cmsis_nvic.h b/hw/mcu/nordic/nrf5340/include/mcu/cmsis_nvic.h index 94e9e986a..aa0694057 100644 --- a/hw/mcu/nordic/nrf5340/include/mcu/cmsis_nvic.h +++ b/hw/mcu/nordic/nrf5340/include/mcu/cmsis_nvic.h @@ -17,10 +17,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/nordic/nrf5340_net/include/mcu/cmsis_nvic.h b/hw/mcu/nordic/nrf5340_net/include/mcu/cmsis_nvic.h index 0c26de040..fd0d8811a 100644 --- a/hw/mcu/nordic/nrf5340_net/include/mcu/cmsis_nvic.h +++ b/hw/mcu/nordic/nrf5340_net/include/mcu/cmsis_nvic.h @@ -17,10 +17,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/nordic/nrf91xx/include/mcu/cmsis_nvic.h b/hw/mcu/nordic/nrf91xx/include/mcu/cmsis_nvic.h index 26656353f..de60957ed 100644 --- a/hw/mcu/nordic/nrf91xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/nordic/nrf91xx/include/mcu/cmsis_nvic.h @@ -16,10 +16,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/nxp/kinetis/MK8xF/include/mcu/cmsis_nvic.h b/hw/mcu/nxp/kinetis/MK8xF/include/mcu/cmsis_nvic.h index ed3ca6005..61147286f 100644 --- a/hw/mcu/nxp/kinetis/MK8xF/include/mcu/cmsis_nvic.h +++ b/hw/mcu/nxp/kinetis/MK8xF/include/mcu/cmsis_nvic.h @@ -36,10 +36,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/nxp/lpc55xx/include/mcu/cmsis_nvic.h b/hw/mcu/nxp/lpc55xx/include/mcu/cmsis_nvic.h index 4b6b98124..785852202 100644 --- a/hw/mcu/nxp/lpc55xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/nxp/lpc55xx/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/nxp/mkw41z/include/mcu/cmsis_nvic.h b/hw/mcu/nxp/mkw41z/include/mcu/cmsis_nvic.h index c6d951930..918adf9e0 100644 --- a/hw/mcu/nxp/mkw41z/include/mcu/cmsis_nvic.h +++ b/hw/mcu/nxp/mkw41z/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32f0xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32f0xx/include/mcu/cmsis_nvic.h index e7b89009c..3f0b2a01b 100644 --- a/hw/mcu/stm/stm32f0xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32f0xx/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32f1xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32f1xx/include/mcu/cmsis_nvic.h index a1b36b9eb..fc3880c16 100644 --- a/hw/mcu/stm/stm32f1xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32f1xx/include/mcu/cmsis_nvic.h @@ -22,10 +22,6 @@ extern uint32_t __isr_vector_end[]; extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32f3xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32f3xx/include/mcu/cmsis_nvic.h index ceb3f8651..93c50b770 100644 --- a/hw/mcu/stm/stm32f3xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32f3xx/include/mcu/cmsis_nvic.h @@ -41,10 +41,6 @@ extern uint32_t __isr_vector_end[]; extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32f4xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32f4xx/include/mcu/cmsis_nvic.h index 0a74b2ae1..04663a563 100644 --- a/hw/mcu/stm/stm32f4xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32f4xx/include/mcu/cmsis_nvic.h @@ -22,10 +22,6 @@ extern uint32_t __isr_vector_end[]; extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32f7xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32f7xx/include/mcu/cmsis_nvic.h index 040d9cf16..cf130a2f7 100644 --- a/hw/mcu/stm/stm32f7xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32f7xx/include/mcu/cmsis_nvic.h @@ -22,10 +22,6 @@ extern uint32_t __isr_vector_end[]; extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32g0xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32g0xx/include/mcu/cmsis_nvic.h index cd25c74c2..551bb023d 100644 --- a/hw/mcu/stm/stm32g0xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32g0xx/include/mcu/cmsis_nvic.h @@ -23,10 +23,6 @@ enum { extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32g4xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32g4xx/include/mcu/cmsis_nvic.h index a9d900394..366e1f137 100644 --- a/hw/mcu/stm/stm32g4xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32g4xx/include/mcu/cmsis_nvic.h @@ -22,10 +22,6 @@ extern uint32_t __isr_vector_end[]; extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32h7xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32h7xx/include/mcu/cmsis_nvic.h index 7f11693ae..53b1c35d8 100644 --- a/hw/mcu/stm/stm32h7xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32h7xx/include/mcu/cmsis_nvic.h @@ -22,10 +22,6 @@ extern uint32_t __isr_vector_end[]; extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32l0xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32l0xx/include/mcu/cmsis_nvic.h index 8b6225805..1c53b9581 100644 --- a/hw/mcu/stm/stm32l0xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32l0xx/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32l1xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32l1xx/include/mcu/cmsis_nvic.h index 5526559db..93fe85a88 100644 --- a/hw/mcu/stm/stm32l1xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32l1xx/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32l4xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32l4xx/include/mcu/cmsis_nvic.h index dbf2cc2e7..0f1de3caa 100644 --- a/hw/mcu/stm/stm32l4xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32l4xx/include/mcu/cmsis_nvic.h @@ -22,10 +22,6 @@ extern uint32_t __isr_vector_end[]; extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32u5xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32u5xx/include/mcu/cmsis_nvic.h index d92bc2d8b..9e1ab7c20 100644 --- a/hw/mcu/stm/stm32u5xx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32u5xx/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif diff --git a/hw/mcu/stm/stm32wbxx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32wbxx/include/mcu/cmsis_nvic.h index 8e268d346..aafebedbf 100644 --- a/hw/mcu/stm/stm32wbxx/include/mcu/cmsis_nvic.h +++ b/hw/mcu/stm/stm32wbxx/include/mcu/cmsis_nvic.h @@ -18,10 +18,6 @@ extern "C" { #endif -void NVIC_Relocate(void); -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector); -uint32_t NVIC_GetVector(IRQn_Type IRQn); - #ifdef __cplusplus } #endif
