From c3b18f9f21d97d47013aa519796afbf35dd3c983 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 11 Feb 2011 12:32:23 +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 * include/bsp.h, include/mrm332.h, spurious/spinit.c: Use "__asm__" instead of "asm" for improved c99-compliance. --- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mrm332/include/bsp.h | 2 +- c/src/lib/libbsp/m68k/mrm332/include/mrm332.h | 2 +- c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 6d909fb50c..dc7b59be40 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,8 @@ +2011-02-11 Ralf Corsépius + + * include/bsp.h, include/mrm332.h, spurious/spinit.c: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-02-09 Ralf Corsépius * timer/timer.c: Include . diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index 7edcb95c5d..4488abec50 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -42,7 +42,7 @@ extern "C" { #define rtems_bsp_delay( microseconds ) \ { register uint32_t _delay=(microseconds); \ register uint32_t _tmp=123; \ - asm volatile( "0: \ + __asm__ volatile( "0: \ nbcd %0 ; \ nbcd %0 ; \ dbf %1,0b" \ diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h index 947fd9efce..902668832c 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h @@ -63,7 +63,7 @@ */ /* static void reboot(void) __attribute__ ((noreturn)); */ static void reboot(void); -__inline__ static void reboot() {asm("trap #15; .word 0x0063");} +__inline__ static void reboot() {__asm__ ("trap #15; .word 0x0063");} #endif /* ASM */ diff --git a/c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c b/c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c index 1fc50b84fa..423d5b069f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c +++ b/c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c @@ -77,7 +77,7 @@ rtems_isr Spurious_Isr( bsp_cleanup(); /* BDM SIGEMT */ - asm(" .word 0x4afa"); + __asm__ (" .word 0x4afa"); for(;;); }