diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 12:49:35 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 12:49:35 +0000 |
commit | 4ac74d01e789beb6f337aa355d8c1563dbf98053 (patch) | |
tree | fb33ad51b79ee6b37bb4bc9fca6cd5c1e4b10db4 | |
parent | 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-4ac74d01e789beb6f337aa355d8c1563dbf98053.tar.bz2 |
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* include/bsp.h, include/tm27.h, startup/bspstart.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/include/tm27.h | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/startup/bspstart.c | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index e844ded5b7..8e1b4989e3 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,8 @@ +2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> + + * include/bsp.h, include/tm27.h, startup/bspstart.c: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/c/src/lib/libbsp/powerpc/psim/include/bsp.h index 889ea335a8..1150b80ffd 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/psim/include/bsp.h @@ -65,7 +65,7 @@ extern uint32_t BSP_mem_size; /* macros */ #define Processor_Synchronize() \ - asm(" eieio ") + __asm__ (" eieio ") struct rtems_bsdnet_ifconfig; diff --git a/c/src/lib/libbsp/powerpc/psim/include/tm27.h b/c/src/lib/libbsp/powerpc/psim/include/tm27.h index f132fce9bb..d98cdd1ba8 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/tm27.h +++ b/c/src/lib/libbsp/powerpc/psim/include/tm27.h @@ -42,23 +42,23 @@ void Install_tm27_vector(void (*_handler)()) #define Cause_tm27_intr() \ do { \ uint32_t _clicks = 1; \ - asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ + __asm__ volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) #define Clear_tm27_intr() \ do { \ uint32_t _clicks = 0xffffffff; \ - asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ + __asm__ volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) #define Lower_tm27_intr() \ do { \ uint32_t _msr = 0; \ _ISR_Set_level( 0 ); \ - asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ + __asm__ volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ _msr |= 0x8002; \ - asm volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ + __asm__ volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ } while (0) #endif diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c index 2d921db3bd..d6fba2e6f5 100644 --- a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c @@ -137,6 +137,6 @@ void bsp_start( void ) setdbat(2, 0xc<<24, 0xc<<24, 1<<24, IO_PAGE); _write_MSR(_read_MSR() | MSR_DR | MSR_IR); - asm volatile("sync; isync"); + __asm__ volatile("sync; isync"); } |