diff options
| author | marcoveeneman <marco-veeneman@hotmail.com> | 2018-03-12 19:04:54 +0100 |
|---|---|---|
| committer | marcoveeneman <marco-veeneman@hotmail.com> | 2018-03-12 19:04:54 +0100 |
| commit | 32cdf41174686c78d7978d0a4232b1ac8bc0f2f6 (patch) | |
| tree | 9512720f36f86dab35a0fac211fbdf047f4a224b /os | |
| parent | 0b539b26b0221e70ac4db0541f92239a8cf3909d (diff) | |
| download | ChibiOS-Contrib-32cdf41174686c78d7978d0a4232b1ac8bc0f2f6.tar.gz ChibiOS-Contrib-32cdf41174686c78d7978d0a4232b1ac8bc0f2f6.tar.bz2 ChibiOS-Contrib-32cdf41174686c78d7978d0a4232b1ac8bc0f2f6.zip | |
Fixed warnings triggered by -Wundef compile option
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h | 32 | ||||
| -rw-r--r-- | os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/ports/TIVA/TM4C123x/hal_lld.h | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h b/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h index 993d5c3..e884a92 100644 --- a/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h +++ b/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h @@ -665,82 +665,82 @@ typedef uint32_t iopadid_t; #error "Invalid IRQ priority assigned to GPION" #endif -#if TIVA_HAS_GPIOP0 && \ +#if TIVA_HAS_GPIOP && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP0_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOP0" #endif -#if TIVA_HAS_GPIOP1 && \ +#if TIVA_HAS_GPIOP && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP1_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOP1" #endif -#if TIVA_HAS_GPIOP2 && \ +#if TIVA_HAS_GPIOP && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP2_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOP2" #endif -#if TIVA_HAS_GPIOP3 && \ +#if TIVA_HAS_GPIOP && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP3_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOP3" #endif -#if TIVA_HAS_GPIOP4 && \ +#if TIVA_HAS_GPIOP && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP4_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOP4" #endif -#if TIVA_HAS_GPIOP5 && \ +#if TIVA_HAS_GPIOP && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP5_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOP5" #endif -#if TIVA_HAS_GPIOP6 && \ +#if TIVA_HAS_GPIOP && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP6_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOP6" #endif -#if TIVA_HAS_GPIOP7 && \ +#if TIVA_HAS_GPIOP && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP7_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOP7" #endif -#if TIVA_HAS_GPIOQ0 && \ +#if TIVA_HAS_GPIOQ && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ0_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOQ0" #endif -#if TIVA_HAS_GPIOQ1 && \ +#if TIVA_HAS_GPIOQ && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ1_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOQ1" #endif -#if TIVA_HAS_GPIOQ2 && \ +#if TIVA_HAS_GPIOQ && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ2_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOQ2" #endif -#if TIVA_HAS_GPIOQ3 && \ +#if TIVA_HAS_GPIOQ && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ3_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOQ3" #endif -#if TIVA_HAS_GPIOQ4 && \ +#if TIVA_HAS_GPIOQ && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ4_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOQ4" #endif -#if TIVA_HAS_GPIOQ5 && \ +#if TIVA_HAS_GPIOQ && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ5_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOQ5" #endif -#if TIVA_HAS_GPIOQ6 && \ +#if TIVA_HAS_GPIOQ && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ6_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOQ6" #endif -#if TIVA_HAS_GPIOQ7 && \ +#if TIVA_HAS_GPIOQ && \ !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ7_IRQ_PRIORITY) #error "Invalid IRQ priority assigned to GPIOQ7" #endif diff --git a/os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c b/os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c index 7da95b8..0f9576a 100644 --- a/os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c +++ b/os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c @@ -74,7 +74,7 @@ #error "TIVA_ST_USE_TIMER specifies an unsupported timer" #endif -#if (ST_CLOCK_SRC / OSAL_ST_FREQUENCY) - 1 > 0xFFFF +#if (TIVA_SYSCLK / OSAL_ST_FREQUENCY) - 1 > 0xFFFF #error "the selected ST frequency is not obtainable because TIM timer prescaler limits" #endif diff --git a/os/hal/ports/TIVA/TM4C123x/hal_lld.h b/os/hal/ports/TIVA/TM4C123x/hal_lld.h index 5937b88..5d38a67 100644 --- a/os/hal/ports/TIVA/TM4C123x/hal_lld.h +++ b/os/hal/ports/TIVA/TM4C123x/hal_lld.h @@ -203,7 +203,7 @@ #error "Invalid value for TIVA_BYPASS_VALUE defined" #endif -#if (TIVA_OSCSRC == TIVA_RCC_OSCSRC_MOSC) && (TIVA_MOSC_ENABLE == FALSE) +#if (TIVA_OSCSRC == SYSCTL_RCC2_OSCSRC2_MO) && (TIVA_MOSC_ENABLE == FALSE) #error "Main Oscillator selected but not enabled" #endif |