From bd16104116a0b2a342c5202fbdbf654e9a6e2e7a Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 11 Feb 2011 11:42:34 +0000
Subject: [PATCH] =?UTF-8?q?2011-02-11=09Ralf=20Cors=C3=A9pius=20<ralf.cors?=
 =?UTF-8?q?epius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* include/bsp.h, startup/bspreset.c:
	Use "__asm__" instead of "asm" for improved c99-compliance.
---
 c/src/lib/libbsp/arm/gba/ChangeLog          | 5 +++++
 c/src/lib/libbsp/arm/gba/include/bsp.h      | 2 +-
 c/src/lib/libbsp/arm/gba/startup/bspreset.c | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog
index 0bf4315346..92d941fbcd 100644
--- a/c/src/lib/libbsp/arm/gba/ChangeLog
+++ b/c/src/lib/libbsp/arm/gba/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* include/bsp.h, startup/bspreset.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/gba/include/bsp.h b/c/src/lib/libbsp/arm/gba/include/bsp.h
index 46e4d23a6a..91c38eee8b 100644
--- a/c/src/lib/libbsp/arm/gba/include/bsp.h
+++ b/c/src/lib/libbsp/arm/gba/include/bsp.h
@@ -44,7 +44,7 @@ extern "C" {
     uint32_t i; \
     for(i = 0; i<microseconds;) {i++;} \
     uint32_t  _cnt = _microseconds; \
-    asm volatile ("0: nop; sub %0, %0, #1; cmp %0,#0; bne 0b" : "=c"(_cnt) : "0"(_cnt)); \
+    __asm__ volatile ("0: nop; sub %0, %0, #1; cmp %0,#0; bne 0b" : "=c"(_cnt) : "0"(_cnt)); \
   }
 
 /** gba_zero_memory library function in start.S  */
diff --git a/c/src/lib/libbsp/arm/gba/startup/bspreset.c b/c/src/lib/libbsp/arm/gba/startup/bspreset.c
index 6af1a3f18b..b5e06e4eec 100644
--- a/c/src/lib/libbsp/arm/gba/startup/bspreset.c
+++ b/c/src/lib/libbsp/arm/gba/startup/bspreset.c
@@ -11,6 +11,6 @@
 
 void bsp_reset(void)
 {
-  asm volatile ("ldr  r0, =_gba_reset");
-  asm volatile ("bx   r0");
+  __asm__ volatile ("ldr  r0, =_gba_reset");
+  __asm__ volatile ("bx   r0");
 }