diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 11:48:20 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 11:48:20 +0000 |
| commit | 3af73566becdfadc4fabfaa252d8e13daaa10d9c (patch) | |
| tree | 29fb1f4d6a4f237e930135d4898e79148ae53d7b | |
| parent | 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-3af73566becdfadc4fabfaa252d8e13daaa10d9c.tar.bz2 | |
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* console/console.c, dswifi/arm9/source/wifi_arm9.c, tools/bin2s.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
| -rw-r--r-- | c/src/lib/libbsp/arm/nds/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/nds/console/console.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/nds/tools/bin2s.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/arm/nds/ChangeLog b/c/src/lib/libbsp/arm/nds/ChangeLog index 88a82d3f1b..31313006e4 100644 --- a/c/src/lib/libbsp/arm/nds/ChangeLog +++ b/c/src/lib/libbsp/arm/nds/ChangeLog @@ -1,3 +1,8 @@ +2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> + + * console/console.c, dswifi/arm9/source/wifi_arm9.c, tools/bin2s.c: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org> * timer/timer.c: Include <rtems/btimer.h>. diff --git a/c/src/lib/libbsp/arm/nds/console/console.c b/c/src/lib/libbsp/arm/nds/console/console.c index 8b2c6c56ab..618935faed 100644 --- a/c/src/lib/libbsp/arm/nds/console/console.c +++ b/c/src/lib/libbsp/arm/nds/console/console.c @@ -38,7 +38,7 @@ void nds_putch (char c) { #ifdef TESTSUITE - asm volatile ("swi $0x1"); + __asm__ volatile ("swi $0x1"); #endif consolePrintChar (c); } diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c index d130b93419..970c788e7e 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c @@ -61,7 +61,7 @@ void sgIP_RestoreInterrupts(int old_ime) { } void sgIP_IntrWaitEvent() { - // __asm( ".ARM\n swi 0x060000\n" ); + // __asm__ ( ".ARM\n swi 0x060000\n" ); int i,j; j=0; for(i=0;i<20000;i++) { diff --git a/c/src/lib/libbsp/arm/nds/tools/bin2s.c b/c/src/lib/libbsp/arm/nds/tools/bin2s.c index ff7ac129d7..f344c8e3b6 100644 --- a/c/src/lib/libbsp/arm/nds/tools/bin2s.c +++ b/c/src/lib/libbsp/arm/nds/tools/bin2s.c @@ -1,7 +1,7 @@ /*--------------------------------------------------------------------------------- $Id$ - bin2s: convert a binary file to a gcc asm module + bin2s: convert a binary file to a gcc asm-module for gfx/foo.bin it'll write foo_bin (an array of char) foo_bin_end, and foo_bin_len (an unsigned int) for 4bit.chr it'll write _4bit_chr, _4bit_chr_end, and |