From 35ad0b4bdd2f4b246a4d358f5f5bbc4c5ad95128 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 11 Feb 2011 11:48:17 +0000 Subject: [PATCH] =?UTF-8?q?2011-02-11=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * irq/irq.c, misc/restart.c, rtc/rtc-config.c: Use "__asm__" instead of "asm" for improved c99-compliance. --- c/src/lib/libbsp/arm/lpc32xx/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/lpc32xx/irq/irq.c | 2 +- c/src/lib/libbsp/arm/lpc32xx/misc/restart.c | 2 +- c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/arm/lpc32xx/ChangeLog b/c/src/lib/libbsp/arm/lpc32xx/ChangeLog index 2c6cf0ad3d..fcaa05c458 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc32xx/ChangeLog @@ -1,3 +1,8 @@ +2011-02-11 Ralf Corsépius + + * irq/irq.c, misc/restart.c, rtc/rtc-config.c: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-02-09 Ralf Corsépius * misc/timer.c: Include . diff --git a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c b/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c index c0f3bb8dba..5cc5ea32f2 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c +++ b/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c @@ -114,7 +114,7 @@ static inline unsigned lpc32xx_irq_get_index(uint32_t val) { ARM_SWITCH_REGISTERS; - asm volatile ( + __asm__ volatile ( ARM_SWITCH_TO_ARM "clz %[val], %[val]\n" "rsb %[val], %[val], #31\n" diff --git a/c/src/lib/libbsp/arm/lpc32xx/misc/restart.c b/c/src/lib/libbsp/arm/lpc32xx/misc/restart.c index 0d658f712d..ff42b332ae 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/misc/restart.c +++ b/c/src/lib/libbsp/arm/lpc32xx/misc/restart.c @@ -40,7 +40,7 @@ void lpc32xx_restart(void *addr) ctrl &= ~(ARM_CP15_CTRL_I | ARM_CP15_CTRL_C | ARM_CP15_CTRL_M); arm_cp15_set_control(ctrl); - asm volatile ( + __asm__ volatile ( ARM_SWITCH_TO_ARM "mov pc, %[addr]\n" ARM_SWITCH_BACK diff --git a/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c b/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c index aea14411d0..8268df311d 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c +++ b/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c @@ -49,7 +49,7 @@ static void lpc32xx_rtc_set(uint32_t val) /* It needs some time before we can read the values back */ while (i != 0) { - asm volatile ("nop"); + __asm__ volatile ("nop"); --i; } }