diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 12:19:29 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 12:19:29 +0000 |
| commit | bd918ff70250446dd3ae2fb43ff85f0e6fcf4d12 (patch) | |
| tree | 8b558431b779adebbcd292acb68f729187866050 /c | |
| parent | 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-bd918ff70250446dd3ae2fb43ff85f0e6fcf4d12.tar.bz2 | |
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* shared/console/polled_io.c, shared/flash/spansionFlash.c,
shared/startup/bspidle.c, shared/startup/probeMemEnd.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
Diffstat (limited to 'c')
5 files changed, 10 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index 566d528fa6..a50f0abdbf 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> + + * shared/console/polled_io.c, shared/flash/spansionFlash.c, + shared/startup/bspidle.c, shared/startup/probeMemEnd.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/shared/console/polled_io.c b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c index 6d3b911887..07561ff876 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c +++ b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c @@ -909,7 +909,7 @@ void printk(const char *fmt, ...) { /* Necessary to avoid including a library, and GCC won't do this inline. */ #define div10(num, rmd) \ do { uint32_t t1, t2, t3; \ - asm("lis %4,0xcccd; " \ + __asm__ ("lis %4,0xcccd; " \ "addi %4,%4,0xffffcccd; " /* Build 0xcccccccd */ \ "mulhwu %3,%0+1,%4; " /* (num.l*cst.l).h */ \ "mullw %2,%0,%4; " /* (num.h*cst.l).l */ \ diff --git a/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c b/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c index 332d35a191..37aee0867b 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c +++ b/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c @@ -77,7 +77,7 @@ /* Assume flash-endianness == CPU endianness */ #ifdef __PPC__ -#define IOSYNC(mem) do { asm volatile("eieio"); } while (0) +#define IOSYNC(mem) do { __asm__ volatile("eieio"); } while (0) #else #define IOSYNC(mem) do { } while (0) #endif diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspidle.c b/c/src/lib/libbsp/powerpc/shared/startup/bspidle.c index 4a8a0ba0c0..7132dc4260 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/bspidle.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/bspidle.c @@ -27,7 +27,7 @@ void *bsp_idle_thread( uintptr_t ignored ) { for( ; ; ) { - asm volatile( + __asm__ volatile( "mfmsr 3; oris 3,3,4; sync; mtmsr 3; isync; ori 3,3,0; ori 3,3,0" ); } diff --git a/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c b/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c index 6620c7d581..32b6f8afd8 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c @@ -123,7 +123,7 @@ CPU_lockUnlockCaches(register int doLock) register uint32_t v, x; if ( _read_MSR() & MSR_VE ) { #define DSSALL 0x7e00066c /* dssall opcode */ - asm volatile(" .long %0"::"i"(DSSALL)); + __asm__ volatile(" .long %0"::"i"(DSSALL)); #undef DSSALL } asm volatile("sync"); |