2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>

	* shared/1553/b1553brm.c, shared/can/grcan.c, shared/can/occan.c,
	shared/spw/grspw.c, shared/uart/apbuart.c:
	Use "__asm__" instead of "asm" for improved c99-compliance.

6 files changed, 13 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/sparc/ChangeLog b/c/src/lib/libbsp/sparc/ChangeLog
index 294bfdc03d..41e17671a1 100644
--- a/c/src/lib/libbsp/sparc/ChangeLog
+++ b/c/src/lib/libbsp/sparc/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* shared/1553/b1553brm.c, shared/can/grcan.c, shared/can/occan.c,
+	shared/spw/grspw.c, shared/uart/apbuart.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/sparc/shared/1553/b1553brm.c b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
index 5eac447450..e447df26d5 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
@@ -89,7 +89,7 @@
 #define READ_DMA(address) _BRM_REG_READ16((unsigned int)address)
 static __inline__ unsigned short _BRM_REG_READ16(unsigned int addr) {
 	unsigned short tmp;
-	asm(" lduha [%1]1, %0 "
+	__asm__ (" lduha [%1]1, %0 "
 	  : "=r"(tmp)
 	  : "r"(addr)
 	);
diff --git a/c/src/lib/libbsp/sparc/shared/can/grcan.c b/c/src/lib/libbsp/sparc/shared/can/grcan.c
index c176490c68..fb48550365 100644
--- a/c/src/lib/libbsp/sparc/shared/can/grcan.c
+++ b/c/src/lib/libbsp/sparc/shared/can/grcan.c
@@ -267,7 +267,7 @@ static void grcan_interrupt(struct grcan_priv *pDev);
 static unsigned char __inline__ _grcan_read_nocache_byte(unsigned int address)
 {
   unsigned char tmp;
-  asm(" lduba [%1]1, %0 "
+  __asm__ (" lduba [%1]1, %0 "
     : "=r"(tmp)
     : "r"(address)
   );
@@ -282,7 +282,7 @@ static unsigned char __inline__ _grcan_read_nocache_byte(unsigned int address)
 static unsigned int __inline__ _grcan_read_nocache(unsigned int address)
 {
   unsigned int tmp;
-  asm(" lda [%1]1, %0 "
+  __asm__ (" lda [%1]1, %0 "
     : "=r"(tmp)
     : "r"(address)
   );
diff --git a/c/src/lib/libbsp/sparc/shared/can/occan.c b/c/src/lib/libbsp/sparc/shared/can/occan.c
index 8b6dbfd32a..dd052a3066 100644
--- a/c/src/lib/libbsp/sparc/shared/can/occan.c
+++ b/c/src/lib/libbsp/sparc/shared/can/occan.c
@@ -295,7 +295,7 @@ static unsigned int sys_freq_hz;
  #define READ_REG(address) _OCCAN_REG_READ((unsigned int)(address))
  static __inline__ unsigned char _OCCAN_REG_READ(unsigned int addr) {
         unsigned char tmp;
-        asm(" lduba [%1]1, %0 "
+        __asm__ (" lduba [%1]1, %0 "
             : "=r"(tmp)
             : "r"(addr)
            );
diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw.c b/c/src/lib/libbsp/sparc/shared/spw/grspw.c
index cd6c801cb6..6a9da79dfa 100644
--- a/c/src/lib/libbsp/sparc/shared/spw/grspw.c
+++ b/c/src/lib/libbsp/sparc/shared/spw/grspw.c
@@ -206,7 +206,7 @@ static GRSPW_DEV *grspw_devs;
 #else
 static unsigned int _SPW_READ(void *addr) {
         unsigned int tmp;
-        asm(" lda [%1]1, %0 "
+        __asm__ (" lda [%1]1, %0 "
             : "=r"(tmp)
             : "r"(addr)
            );
@@ -215,7 +215,7 @@ static unsigned int _SPW_READ(void *addr) {
 
 static unsigned int _MEM_READ(void *addr) {
         unsigned int tmp;
-        asm(" lduba [%1]1, %0 "
+        __asm__ (" lduba [%1]1, %0 "
             : "=r"(tmp)
             : "r"(addr)
            );
diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
index 58d0eab4dc..b3f4bbdd9a 100644
--- a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
+++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
@@ -144,7 +144,7 @@ static void apbuart_hw_open(apbuart_priv *uart);
 	#define READ_REG(address) _APBUART_READ_REG((unsigned int)(address))
   static __inline__ unsigned int _APBUART_READ_REG(unsigned int addr) {
         unsigned int tmp;
-        asm(" lda [%1]1, %0 "
+        __asm__ (" lda [%1]1, %0 "
             : "=r"(tmp)
             : "r"(addr)
            );