git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7811 35acf78f-673a-0410-8e92-d51de3d6d3f4

15 files changed, 68 insertions, 68 deletions

diff --git a/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.h b/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.h
index 24c0ed830..0c027b50c 100644
--- a/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.h
+++ b/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.h
@@ -235,17 +235,17 @@
 #endif

 

 #if STM32_I2C_USE_I2C1 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_I2C_I2C1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_I2C_I2C1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to I2C1"

 #endif

 

 #if STM32_I2C_USE_I2C2 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_I2C_I2C2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_I2C_I2C2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to I2C2"

 #endif

 

 #if STM32_I2C_USE_I2C3 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_I2C_I2C3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_I2C_I2C3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to I2C3"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.h b/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.h
index 34c66570f..b5d07bd2c 100644
--- a/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.h
+++ b/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.h
@@ -146,12 +146,12 @@
 #endif

 

 #if STM32_I2C_USE_I2C1 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_I2C_I2C1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_I2C_I2C1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to I2C1"

 #endif

 

 #if STM32_I2C_USE_I2C2 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_I2C_I2C2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_I2C_I2C2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to I2C2"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h
index 6051fd130..22b5509c8 100644
--- a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h
+++ b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h
@@ -159,12 +159,12 @@
 #endif

 

 #if STM32_USB_USE_OTG1 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_USB_OTG1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_USB_OTG1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to OTG1"

 #endif

 

 #if STM32_USB_USE_OTG2 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_USB_OTG2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_USB_OTG2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to OTG2"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/SPIv1/i2s_lld.h b/os/hal/ports/STM32/LLD/SPIv1/i2s_lld.h
index 2c788e65a..3e007b7db 100644
--- a/os/hal/ports/STM32/LLD/SPIv1/i2s_lld.h
+++ b/os/hal/ports/STM32/LLD/SPIv1/i2s_lld.h
@@ -157,12 +157,12 @@
 #endif

 

 #if STM32_I2S_USE_SPI2 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_I2S_SPI2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_I2S_SPI2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI2"

 #endif

 

 #if STM32_I2S_USE_SPI3 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_I2S_SPI3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_I2S_SPI3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI3"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/SPIv1/spi_lld.h b/os/hal/ports/STM32/LLD/SPIv1/spi_lld.h
index dedb62b95..2aab01daf 100644
--- a/os/hal/ports/STM32/LLD/SPIv1/spi_lld.h
+++ b/os/hal/ports/STM32/LLD/SPIv1/spi_lld.h
@@ -237,32 +237,32 @@
 #endif

 

 #if STM32_SPI_USE_SPI1 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI1"

 #endif

 

 #if STM32_SPI_USE_SPI2 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI2"

 #endif

 

 #if STM32_SPI_USE_SPI3 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI3"

 #endif

 

 #if STM32_SPI_USE_SPI4 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI4_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI4_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI4"

 #endif

 

 #if STM32_SPI_USE_SPI5 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI5_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI5_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI5"

 #endif

 

 #if STM32_SPI_USE_SPI6 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI6_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI6_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI6"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/SPIv2/spi_lld.h b/os/hal/ports/STM32/LLD/SPIv2/spi_lld.h
index 9cc375f83..bf7ddf700 100644
--- a/os/hal/ports/STM32/LLD/SPIv2/spi_lld.h
+++ b/os/hal/ports/STM32/LLD/SPIv2/spi_lld.h
@@ -146,17 +146,17 @@
 #endif

 

 #if STM32_SPI_USE_SPI1 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI1"

 #endif

 

 #if STM32_SPI_USE_SPI2 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI2"

 #endif

 

 #if STM32_SPI_USE_SPI3 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SPI_SPI3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SPI_SPI3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SPI3"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.h b/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.h
index ab32a2e76..94ee3ffc6 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.h
+++ b/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.h
@@ -296,62 +296,62 @@
 #endif

 

 #if STM32_GPT_USE_TIM1 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM1"

 #endif

 

 #if STM32_GPT_USE_TIM2 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM2"

 #endif

 

 #if STM32_GPT_USE_TIM3 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM3"

 #endif

 

 #if STM32_GPT_USE_TIM4 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM4_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM4_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM4"

 #endif

 

 #if STM32_GPT_USE_TIM5 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM5_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM5_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM5"

 #endif

 

 #if STM32_GPT_USE_TIM6 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM6_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM6_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM6"

 #endif

 

 #if STM32_GPT_USE_TIM7 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM7_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM7_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM7"

 #endif

 

 #if STM32_GPT_USE_TIM8 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM8_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM8_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM8"

 #endif

 

 #if STM32_GPT_USE_TIM9 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM9_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM9_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM9"

 #endif

 

 #if STM32_GPT_USE_TIM11 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM11_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM11_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM11"

 #endif

 

 #if STM32_GPT_USE_TIM12 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM12_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM12_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM12"

 #endif

 

 #if STM32_GPT_USE_TIM14 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_GPT_TIM14_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_GPT_TIM14_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM14"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/TIMv1/icu_lld.h b/os/hal/ports/STM32/LLD/TIMv1/icu_lld.h
index c6ee12606..1b21f8246 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/icu_lld.h
+++ b/os/hal/ports/STM32/LLD/TIMv1/icu_lld.h
@@ -194,37 +194,37 @@
 #endif

 

 #if STM32_ICU_USE_TIM1 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_ICU_TIM1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_ICU_TIM1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM1"

 #endif

 

 #if STM32_ICU_USE_TIM2 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_ICU_TIM2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_ICU_TIM2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM2"

 #endif

 

 #if STM32_ICU_USE_TIM3 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_ICU_TIM3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_ICU_TIM3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM3"

 #endif

 

 #if STM32_ICU_USE_TIM4 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_ICU_TIM4_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_ICU_TIM4_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM4"

 #endif

 

 #if STM32_ICU_USE_TIM5 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_ICU_TIM5_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_ICU_TIM5_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM5"

 #endif

 

 #if STM32_ICU_USE_TIM8 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_ICU_TIM8_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_ICU_TIM8_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM8"

 #endif

 

 #if STM32_ICU_USE_TIM9 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_ICU_TIM9_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_ICU_TIM9_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM9"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.h b/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.h
index 193b91bf0..9956024ac 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.h
+++ b/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.h
@@ -249,37 +249,37 @@
 #endif

 

 #if STM32_PWM_USE_TIM1 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_PWM_TIM1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_PWM_TIM1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM1"

 #endif

 

 #if STM32_PWM_USE_TIM2 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_PWM_TIM2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_PWM_TIM2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM2"

 #endif

 

 #if STM32_PWM_USE_TIM3 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_PWM_TIM3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_PWM_TIM3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM3"

 #endif

 

 #if STM32_PWM_USE_TIM4 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_PWM_TIM4_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_PWM_TIM4_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM4"

 #endif

 

 #if STM32_PWM_USE_TIM5 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_PWM_TIM5_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_PWM_TIM5_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM5"

 #endif

 

 #if STM32_PWM_USE_TIM8 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_PWM_TIM8_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_PWM_TIM8_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM8"

 #endif

 

 #if STM32_PWM_USE_TIM9 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_PWM_TIM9_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_PWM_TIM9_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to TIM9"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/USARTv1/serial_lld.h b/os/hal/ports/STM32/LLD/USARTv1/serial_lld.h
index 221619021..b8f669776 100644
--- a/os/hal/ports/STM32/LLD/USARTv1/serial_lld.h
+++ b/os/hal/ports/STM32/LLD/USARTv1/serial_lld.h
@@ -171,32 +171,32 @@
 #endif

 

 #if STM32_SERIAL_USE_USART1 &&                                              \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_USART1_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_USART1_PRIORITY)

 #error "Invalid IRQ priority assigned to USART1"

 #endif

 

 #if STM32_SERIAL_USE_USART2 &&                                              \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_USART2_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_USART2_PRIORITY)

 #error "Invalid IRQ priority assigned to USART2"

 #endif

 

 #if STM32_SERIAL_USE_USART3 &&                                              \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_USART3_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_USART3_PRIORITY)

 #error "Invalid IRQ priority assigned to USART3"

 #endif

 

 #if STM32_SERIAL_USE_UART4 &&                                               \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_UART4_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_UART4_PRIORITY)

 #error "Invalid IRQ priority assigned to UART4"

 #endif

 

 #if STM32_SERIAL_USE_UART5 &&                                               \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_UART5_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_UART5_PRIORITY)

 #error "Invalid IRQ priority assigned to UART5"

 #endif

 

 #if STM32_SERIAL_USE_USART6 &&                                              \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_USART6_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_USART6_PRIORITY)

 #error "Invalid IRQ priority assigned to USART6"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/USARTv1/uart_lld.h b/os/hal/ports/STM32/LLD/USARTv1/uart_lld.h
index 0d673c6d0..3f3bef590 100644
--- a/os/hal/ports/STM32/LLD/USARTv1/uart_lld.h
+++ b/os/hal/ports/STM32/LLD/USARTv1/uart_lld.h
@@ -252,32 +252,32 @@
 #endif

 

 #if STM32_UART_USE_USART1 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_USART1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_USART1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USART1"

 #endif

 

 #if STM32_UART_USE_USART2 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_USART2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_USART2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USART2"

 #endif

 

 #if STM32_UART_USE_USART3 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_USART3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_USART3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USART3"

 #endif

 

 #if STM32_UART_USE_UART4 &&                                                 \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_UART4_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_UART4_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to UART4"

 #endif

 

 #if STM32_UART_USE_UART5 &&                                                 \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_UART5_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_UART5_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to UART5"

 #endif

 

 #if STM32_UART_USE_USART6 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_USART6_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_USART6_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USART6"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.h b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.h
index 103fa1ebc..522913aae 100644
--- a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.h
+++ b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.h
@@ -171,32 +171,32 @@
 #endif

 

 #if STM32_SERIAL_USE_USART1 &&                                              \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_USART1_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_USART1_PRIORITY)

 #error "Invalid IRQ priority assigned to USART1"

 #endif

 

 #if STM32_SERIAL_USE_USART2 &&                                              \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_USART2_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_USART2_PRIORITY)

 #error "Invalid IRQ priority assigned to USART2"

 #endif

 

 #if STM32_SERIAL_USE_USART3 &&                                              \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_USART3_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_USART3_PRIORITY)

 #error "Invalid IRQ priority assigned to USART3"

 #endif

 

 #if STM32_SERIAL_USE_UART4 &&                                               \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_UART4_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_UART4_PRIORITY)

 #error "Invalid IRQ priority assigned to UART4"

 #endif

 

 #if STM32_SERIAL_USE_UART5 &&                                               \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_UART5_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_UART5_PRIORITY)

 #error "Invalid IRQ priority assigned to UART5"

 #endif

 

 #if STM32_SERIAL_USE_USART6 &&                                              \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SERIAL_USART6_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SERIAL_USART6_PRIORITY)

 #error "Invalid IRQ priority assigned to USART6"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/USARTv2/uart_lld.h b/os/hal/ports/STM32/LLD/USARTv2/uart_lld.h
index 2e3e1a747..ebd2e34fd 100644
--- a/os/hal/ports/STM32/LLD/USARTv2/uart_lld.h
+++ b/os/hal/ports/STM32/LLD/USARTv2/uart_lld.h
@@ -149,17 +149,17 @@
 #endif

 

 #if STM32_UART_USE_USART1 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_USART1_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_USART1_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USART1"

 #endif

 

 #if STM32_UART_USE_USART2 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_USART2_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_USART2_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USART2"

 #endif

 

 #if STM32_UART_USE_USART3 &&                                                \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_UART_USART3_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_USART3_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USART3"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/USBv1/usb_lld.h b/os/hal/ports/STM32/LLD/USBv1/usb_lld.h
index ba4edfd6a..d1bb6b75c 100644
--- a/os/hal/ports/STM32/LLD/USBv1/usb_lld.h
+++ b/os/hal/ports/STM32/LLD/USBv1/usb_lld.h
@@ -102,12 +102,12 @@
 

 #if STM32_USB_USE_USB1 &&                                                   \

     (STM32_USB1_HP_NUMBER != STM32_USB1_LP_NUMBER) &&                       \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_USB_USB1_HP_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_USB_USB1_HP_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USB HP"

 #endif

 

 #if STM32_USB_USE_USB1 &&                                                   \

-    !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_USB_USB1_LP_IRQ_PRIORITY)

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_USB_USB1_LP_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to USB LP"

 #endif

 

diff --git a/os/hal/ports/STM32/LLD/sdc_lld.h b/os/hal/ports/STM32/LLD/sdc_lld.h
index 719fe90fa..8b960fb97 100644
--- a/os/hal/ports/STM32/LLD/sdc_lld.h
+++ b/os/hal/ports/STM32/LLD/sdc_lld.h
@@ -109,7 +109,7 @@
 #error "SDIO not present in the selected device"

 #endif

 

-#if !CORTEX_IS_VALID_KERNEL_PRIORITY(STM32_SDC_SDIO_IRQ_PRIORITY)

+#if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_SDC_SDIO_IRQ_PRIORITY)

 #error "Invalid IRQ priority assigned to SDIO"

 #endif