From f3b292365ffcd4c95128e568fa114ac55fb0ef6b Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 18 Sep 2017 08:22:38 +0200 Subject: bsps: Clock_driver_support_install_isr() Remove old ISR parameter since is not used by the clock driver shell. Make an implementation optional. Update #3139. --- c/src/lib/libbsp/lm32/shared/clock/ckinit.c | 6 ++---- c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/lm32') diff --git a/c/src/lib/libbsp/lm32/shared/clock/ckinit.c b/c/src/lib/libbsp/lm32/shared/clock/ckinit.c index 6a30583853..fd1c27437c 100644 --- a/c/src/lib/libbsp/lm32/shared/clock/ckinit.c +++ b/c/src/lib/libbsp/lm32/shared/clock/ckinit.c @@ -47,10 +47,8 @@ static inline void clockwrite(unsigned int reg, int value) lm32_interrupt_ack(CLOCK_IRQMASK); \ } while (0) -#define Clock_driver_support_install_isr(_new, _old ) \ - do { \ - _old = (rtems_isr_entry) set_vector( _new, CLOCK_VECTOR, 1 ); \ - } while (0) +#define Clock_driver_support_install_isr(_new ) \ + set_vector( _new, CLOCK_VECTOR, 1 ) static void Clock_driver_support_initialize_hardware(void) { diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c b/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c index 35b4b818e6..bc9821d1bc 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c @@ -26,8 +26,9 @@ lm32_interrupt_ack(1 << MM_IRQ_TIMER0); \ } while (0) -#define Clock_driver_support_install_isr(_new, _old ) \ +#define Clock_driver_support_install_isr(_new ) \ do { \ + rtems_isr_entry _old; \ rtems_interrupt_catch(_new, MM_IRQ_TIMER0, &_old); \ } while (0) -- cgit v1.2.3