From a660e9dc47c522fe1a1b7f6e4af1795dbd6c20b1 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 8 Sep 2022 10:37:05 +0200 Subject: Do not use RTEMS_INLINE_ROUTINE Directly use "static inline" which is available in C99 and later. This brings the RTEMS implementation closer to standard C. Close #3935. --- bsps/powerpc/gen5200/include/tm27.h | 2 +- bsps/powerpc/motorola_powerpc/include/bsp.h | 2 +- bsps/powerpc/mvme5500/include/tm27.h | 2 +- bsps/powerpc/psim/include/tm27.h | 2 +- bsps/powerpc/qoriq/include/tm27.h | 10 +++++----- bsps/powerpc/t32mppc/include/bsp/irq.h | 4 ++-- bsps/powerpc/virtex/console/consolelite.c | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'bsps/powerpc') diff --git a/bsps/powerpc/gen5200/include/tm27.h b/bsps/powerpc/gen5200/include/tm27.h index bd3dbb2d85..77dc566e49 100644 --- a/bsps/powerpc/gen5200/include/tm27.h +++ b/bsps/powerpc/gen5200/include/tm27.h @@ -34,7 +34,7 @@ static rtems_irq_connect_data clockIrqData = {BSP_DECREMENTER, (rtems_irq_disable) nullFunc, (rtems_irq_is_enabled) nullFunc}; -RTEMS_INLINE_ROUTINE void Install_tm27_vector(void (*_handler)(void)) +static inline void Install_tm27_vector(void (*_handler)(void)) { clockIrqData.hdl = _handler; if (!BSP_install_rtems_irq_handler (&clockIrqData)) { diff --git a/bsps/powerpc/motorola_powerpc/include/bsp.h b/bsps/powerpc/motorola_powerpc/include/bsp.h index 7d362bf406..1c35d8e1b7 100644 --- a/bsps/powerpc/motorola_powerpc/include/bsp.h +++ b/bsps/powerpc/motorola_powerpc/include/bsp.h @@ -190,7 +190,7 @@ extern int rtems_dec21140_driver_attach(struct rtems_bsdnet_ifconfig *, int); #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_ne_driver_attach extern int rtems_ne_driver_attach(struct rtems_bsdnet_ifconfig *, int); -RTEMS_INLINE_ROUTINE const char* bsp_cmdline_arg(const char* arg) +static inline const char* bsp_cmdline_arg(const char* arg) { return rtems_bsp_cmdline_get_param_raw(arg); } diff --git a/bsps/powerpc/mvme5500/include/tm27.h b/bsps/powerpc/mvme5500/include/tm27.h index bf255aeb79..99686dc85d 100644 --- a/bsps/powerpc/mvme5500/include/tm27.h +++ b/bsps/powerpc/mvme5500/include/tm27.h @@ -32,7 +32,7 @@ static rtems_irq_connect_data clockIrqData = {BSP_DECREMENTER, (rtems_irq_disable)nullFunc, (rtems_irq_is_enabled) nullFunc}; -RTEMS_INLINE_ROUTINE void Install_tm27_vector(void (*_handler)()) +static inline void Install_tm27_vector(void (*_handler)()) { clockIrqData.hdl = _handler; if (!BSP_install_rtems_irq_handler (&clockIrqData)) { diff --git a/bsps/powerpc/psim/include/tm27.h b/bsps/powerpc/psim/include/tm27.h index 8e20a3ebd1..c8781efe65 100644 --- a/bsps/powerpc/psim/include/tm27.h +++ b/bsps/powerpc/psim/include/tm27.h @@ -32,7 +32,7 @@ static rtems_irq_connect_data clockIrqData = {BSP_DECREMENTER, (rtems_irq_disable)nullFunc, (rtems_irq_is_enabled) nullFunc}; -RTEMS_INLINE_ROUTINE void Install_tm27_vector(void (*_handler)()) +static inline void Install_tm27_vector(void (*_handler)()) { clockIrqData.hdl = _handler; if (!BSP_install_rtems_irq_handler (&clockIrqData)) { diff --git a/bsps/powerpc/qoriq/include/tm27.h b/bsps/powerpc/qoriq/include/tm27.h index 89ae11fef6..4ac769de90 100644 --- a/bsps/powerpc/qoriq/include/tm27.h +++ b/bsps/powerpc/qoriq/include/tm27.h @@ -53,7 +53,7 @@ #define IPI_INDEX_HIGH 2 -RTEMS_INLINE_ROUTINE void Install_tm27_vector(void (*handler)(rtems_vector_number)) +static inline void Install_tm27_vector(void (*handler)(rtems_vector_number)) { rtems_status_code sc; rtems_vector_number low = QORIQ_IRQ_IPI_0 + IPI_INDEX_LOW; @@ -84,24 +84,24 @@ RTEMS_INLINE_ROUTINE void Install_tm27_vector(void (*handler)(rtems_vector_numbe assert(sc == RTEMS_SUCCESSFUL); } -RTEMS_INLINE_ROUTINE void qoriq_tm27_cause(uint32_t ipi_index) +static inline void qoriq_tm27_cause(uint32_t ipi_index) { uint32_t self = ppc_processor_id(); qoriq.pic.per_cpu[self].ipidr[ipi_index].reg = UINT32_C(1) << self; } -RTEMS_INLINE_ROUTINE void Cause_tm27_intr(void) +static inline void Cause_tm27_intr(void) { qoriq_tm27_cause(IPI_INDEX_LOW); } -RTEMS_INLINE_ROUTINE void Clear_tm27_intr(void) +static inline void Clear_tm27_intr(void) { /* Nothing to do */ } -RTEMS_INLINE_ROUTINE inline void Lower_tm27_intr(void) +static inline inline void Lower_tm27_intr(void) { qoriq_tm27_cause(IPI_INDEX_HIGH); } diff --git a/bsps/powerpc/t32mppc/include/bsp/irq.h b/bsps/powerpc/t32mppc/include/bsp/irq.h index a860dc28e1..bb9b9b1564 100644 --- a/bsps/powerpc/t32mppc/include/bsp/irq.h +++ b/bsps/powerpc/t32mppc/include/bsp/irq.h @@ -39,7 +39,7 @@ extern "C" { #define BSP_INTERRUPT_VECTOR_COUNT 1 -RTEMS_INLINE_ROUTINE rtems_status_code bsp_interrupt_set_affinity( +static inline rtems_status_code bsp_interrupt_set_affinity( rtems_vector_number vector, const Processor_mask *affinity ) @@ -49,7 +49,7 @@ RTEMS_INLINE_ROUTINE rtems_status_code bsp_interrupt_set_affinity( return RTEMS_SUCCESSFUL; } -RTEMS_INLINE_ROUTINE rtems_status_code bsp_interrupt_get_affinity( +static inline rtems_status_code bsp_interrupt_get_affinity( rtems_vector_number vector, Processor_mask *affinity ) diff --git a/bsps/powerpc/virtex/console/consolelite.c b/bsps/powerpc/virtex/console/consolelite.c index 4d0b2db17f..9a2595a535 100644 --- a/bsps/powerpc/virtex/console/consolelite.c +++ b/bsps/powerpc/virtex/console/consolelite.c @@ -57,28 +57,28 @@ -RTEMS_INLINE_ROUTINE uint32_t xlite_uart_control(uint32_t base) +static inline uint32_t xlite_uart_control(uint32_t base) { uint32_t c = *((volatile uint32_t*)(base+CTRL_REG)); return c; } -RTEMS_INLINE_ROUTINE uint32_t xlite_uart_status(uint32_t base) +static inline uint32_t xlite_uart_status(uint32_t base) { uint32_t c = *((volatile uint32_t*)(base+STAT_REG)); return c; } -RTEMS_INLINE_ROUTINE uint32_t xlite_uart_read(uint32_t base) +static inline uint32_t xlite_uart_read(uint32_t base) { uint32_t c = *((volatile uint32_t*)(base+RECV_REG)); return c; } -RTEMS_INLINE_ROUTINE void xlite_uart_write(uint32_t base, char ch) +static inline void xlite_uart_write(uint32_t base, char ch) { *(volatile uint32_t*)(base+TRAN_REG) = (uint32_t)ch; return; -- cgit v1.2.3