diff options
Diffstat (limited to 'c/src/lib/libbsp/arm')
8 files changed, 14 insertions, 33 deletions
diff --git a/c/src/lib/libbsp/arm/beagle/clock.c b/c/src/lib/libbsp/arm/beagle/clock.c index 912d904197..ec35f1505e 100644 --- a/c/src/lib/libbsp/arm/beagle/clock.c +++ b/c/src/lib/libbsp/arm/beagle/clock.c @@ -314,11 +314,8 @@ static void beagle_clock_cleanup(void) #define Clock_driver_support_at_tick() beagle_clock_at_tick() #define Clock_driver_support_initialize_hardware() beagle_clock_initialize() -#define Clock_driver_support_install_isr(isr, old_isr) \ - do { \ - beagle_clock_handler_install(isr); \ - old_isr = NULL; \ - } while (0) +#define Clock_driver_support_install_isr(isr) \ + beagle_clock_handler_install(isr) #define Clock_driver_support_shutdown_hardware() beagle_clock_cleanup() diff --git a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c index 121b2c9d32..6c8c57691a 100644 --- a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c @@ -25,10 +25,9 @@ void Clock_isr(void * arg); *EP7312_TC1EOI = 0xffffffff; \ } while(0) -#define Clock_driver_support_install_isr( _new, _old ) \ +#define Clock_driver_support_install_isr( _new ) \ do { \ rtems_status_code status = RTEMS_SUCCESSFUL; \ - (_old) = NULL; /* avoid warning */; \ status = rtems_interrupt_handler_install( \ BSP_TC1OI, \ "Clock", \ diff --git a/c/src/lib/libbsp/arm/raspberrypi/clock/clockdrv.c b/c/src/lib/libbsp/arm/raspberrypi/clock/clockdrv.c index 72c85b1669..43ce59e1b4 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/raspberrypi/clock/clockdrv.c @@ -106,11 +106,8 @@ static void raspberrypi_clock_cleanup(void) #define Clock_driver_support_shutdown_hardware() raspberrypi_clock_cleanup() -#define Clock_driver_support_install_isr(clock_isr, old_isr) \ - do { \ - raspberrypi_clock_handler_install_isr(clock_isr); \ - old_isr = NULL; \ - } while (0) +#define Clock_driver_support_install_isr(clock_isr) \ + raspberrypi_clock_handler_install_isr(clock_isr) #define CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR 1 diff --git a/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c b/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c index 63a3dd7fd2..09516b4905 100644 --- a/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c +++ b/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c @@ -202,11 +202,8 @@ static void a9mpcore_clock_cleanup(void) #define Clock_driver_support_initialize_hardware() \ a9mpcore_clock_initialize() -#define Clock_driver_support_install_isr(isr, old_isr) \ - do { \ - a9mpcore_clock_handler_install(); \ - old_isr = NULL; \ - } while (0) +#define Clock_driver_support_install_isr(isr) \ + a9mpcore_clock_handler_install() #define Clock_driver_support_shutdown_hardware() \ a9mpcore_clock_cleanup() diff --git a/c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c b/c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c index 67e0d59af2..21ba3f1e97 100644 --- a/c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c +++ b/c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c @@ -195,11 +195,8 @@ RTEMS_SYSINIT_ITEM( #define Clock_driver_support_initialize_hardware() \ arm_gt_clock_initialize() -#define Clock_driver_support_install_isr(isr, old_isr) \ - do { \ - arm_gt_clock_handler_install(); \ - old_isr = NULL; \ - } while (0) +#define Clock_driver_support_install_isr(isr) \ + arm_gt_clock_handler_install() /* Include shared source clock driver code */ #include "../../shared/clockdrv_shell.h" diff --git a/c/src/lib/libbsp/arm/shared/armv7m/clock/armv7m-clock-config.c b/c/src/lib/libbsp/arm/shared/armv7m/clock/armv7m-clock-config.c index afef7daa09..e03ba9d83f 100644 --- a/c/src/lib/libbsp/arm/shared/armv7m/clock/armv7m-clock-config.c +++ b/c/src/lib/libbsp/arm/shared/armv7m/clock/armv7m-clock-config.c @@ -170,11 +170,8 @@ static void _ARMV7M_Systick_cleanup(void) #define Clock_driver_support_initialize_hardware() \ _ARMV7M_Systick_initialize() -#define Clock_driver_support_install_isr(isr, old_isr) \ - do { \ - _ARMV7M_Systick_handler_install(); \ - old_isr = NULL; \ - } while (0) +#define Clock_driver_support_install_isr(isr) \ + _ARMV7M_Systick_handler_install() #define Clock_driver_support_shutdown_hardware() \ _ARMV7M_Systick_cleanup() diff --git a/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c b/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c index 0a0399939d..b6a6dc9fb2 100644 --- a/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c +++ b/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c @@ -125,11 +125,8 @@ static void lpc_clock_cleanup(void) #define Clock_driver_support_at_tick() lpc_clock_at_tick() #define Clock_driver_support_initialize_hardware() lpc_clock_initialize() -#define Clock_driver_support_install_isr(isr, old_isr) \ - do { \ - lpc_clock_handler_install(); \ - old_isr = NULL; \ - } while (0) +#define Clock_driver_support_install_isr(isr) \ + lpc_clock_handler_install() #define Clock_driver_support_shutdown_hardware() lpc_clock_cleanup() diff --git a/c/src/lib/libbsp/arm/tms570/clock/clock.c b/c/src/lib/libbsp/arm/tms570/clock/clock.c index b4d60b3153..091bfda2b6 100644 --- a/c/src/lib/libbsp/arm/tms570/clock/clock.c +++ b/c/src/lib/libbsp/arm/tms570/clock/clock.c @@ -182,7 +182,7 @@ static void tms570_clock_driver_support_shutdown_hardware( void ) #define Clock_driver_support_shutdown_hardware \ tms570_clock_driver_support_shutdown_hardware -#define Clock_driver_support_install_isr(Clock_isr, Old_ticker ) \ +#define Clock_driver_support_install_isr(Clock_isr) \ tms570_clock_driver_support_install_isr( Clock_isr ) void Clock_isr(void *arg); /* to supress warning */ |