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

	* console/console.c, console/ns16550cfg.c, console/polled_io.c,
	include/bsp.h, include/tm27.h, startup/bspstart.c:
	Use "__asm__" instead of "asm" for improved c99-compliance.

7 files changed, 28 insertions, 22 deletions

diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
index 2208f97f44..9b7178fef3 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* console/console.c, console/ns16550cfg.c, console/polled_io.c,
+	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/ep1a/console/console.c b/c/src/lib/libbsp/powerpc/ep1a/console/console.c
index a75f7fab45..911b87bb04 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/console/console.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/console/console.c
@@ -259,12 +259,12 @@ debug_putc_onlcr(const char c)
 
   if ('\n'==c){
      *ptr = '\r';
-     asm volatile("sync");
+     __asm__ volatile("sync");
      for (i=0;i<0x0fff;i++);
   }
 
   *ptr = c;
-  asm volatile("sync");
+  __asm__ volatile("sync");
   for (i=0;i<0x0fff;i++);
 }
 
diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c
index 8237193a7b..f34c6f7aac 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c
@@ -29,7 +29,7 @@ uint8_t Read_ns16550_register(
 volatile struct uart_reg *p = (volatile struct uart_reg *)ulCtrlPort;
   uint8_t  ucData;
   ucData = p[ucRegNum].reg;
-  asm volatile("sync");
+  __asm__ volatile("sync");
   return ucData;
 }
 
@@ -42,9 +42,9 @@ void  Write_ns16550_register(
   volatile struct uart_reg *p = (volatile struct uart_reg *)ulCtrlPort;
   volatile int i;
   p[ucRegNum].reg = ucData;
-  asm volatile("sync");
-  asm volatile("isync");
-  asm volatile("eieio");
+  __asm__ volatile("sync");
+  __asm__ volatile("isync");
+  __asm__ volatile("eieio");
   for (i=0;i<0x08ff;i++)
-    asm volatile("isync");
+    __asm__ volatile("isync");
 }
diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c b/c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c
index 2ec860255f..01f3ff9cac 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c
@@ -925,7 +925,7 @@ int printk(const char *fmt, ...) {
 /* Necessary to avoid including a library, and GCC won't do this inline. */
 #define div10(num, rmd)							 \
 do {	u32 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/ep1a/include/bsp.h b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
index eafa292676..845fd173c9 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
@@ -174,7 +174,7 @@ extern unsigned int BSP_time_base_divisor;
   ((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
 
 #define Processor_Synchronize() \
-  asm(" eieio ")
+  __asm__ (" eieio ")
 
 extern void BSP_panic(char *s);
 extern int BSP_disconnect_clock_handler (void);
diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h b/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h
index fa76ce4998..4ccda63257 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h
+++ b/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h
@@ -39,22 +39,22 @@ void Install_tm27_vector(void (*_handler)())
 #define Cause_tm27_intr()  \
   do { \
     uint32_t _clicks = 8; \
-    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/ep1a/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c
index b7db8936bb..4930d82bb3 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c
@@ -184,18 +184,18 @@ unsigned int EUMBBAR;
 unsigned int get_eumbbar(void) {
   register int a, e;
 
-  asm volatile( "lis %0,0xfec0; ori  %0,%0,0x0000": "=r" (a) );
-  asm volatile("sync");
+  __asm__ volatile( "lis %0,0xfec0; ori  %0,%0,0x0000": "=r" (a) );
+  __asm__ volatile("sync");
 
-  asm volatile("lis %0,0x8000; ori %0,%0,0x0078": "=r"(e) );
-  asm volatile("stwbrx  %0,0x0,%1": "=r"(e): "r"(a));
-  asm volatile("sync");
+  __asm__ volatile("lis %0,0x8000; ori %0,%0,0x0078": "=r"(e) );
+  __asm__ volatile("stwbrx  %0,0x0,%1": "=r"(e): "r"(a));
+  __asm__ volatile("sync");
 
-  asm volatile("lis %0,0xfee0; ori %0,%0,0x0000": "=r" (a) );
-  asm volatile("sync");
+  __asm__ volatile("lis %0,0xfee0; ori %0,%0,0x0000": "=r" (a) );
+  __asm__ volatile("sync");
 
-  asm volatile("lwbrx %0,0x0,%1": "=r" (e): "r" (a));
-  asm volatile("isync");
+  __asm__ volatile("lwbrx %0,0x0,%1": "=r" (e): "r" (a));
+  __asm__ volatile("isync");
   return e;
 }