From 90b68014babfcd2f073c1174ee3b7d378002b309 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 11 Feb 2011 12:44:28 +0000 Subject: [PATCH] =?UTF-8?q?2011-02-11=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * irq/discovery_pic.c, network/if_em/rtemscompat_defs.h, * network/if_gfe/rtemscompat_defs.h, startup/bspstart.c: Use "__asm__" instead of "asm" for improved c99-compliance. --- c/src/lib/libbsp/powerpc/beatnik/ChangeLog | 6 ++++++ c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c | 2 +- .../libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h | 2 +- .../powerpc/beatnik/network/if_gfe/rtemscompat_defs.h | 2 +- c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/beatnik/ChangeLog b/c/src/lib/libbsp/powerpc/beatnik/ChangeLog index 0f1714cb1b..1b8b280844 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/ChangeLog +++ b/c/src/lib/libbsp/powerpc/beatnik/ChangeLog @@ -1,3 +1,9 @@ +2011-02-11 Ralf Corsépius + + * irq/discovery_pic.c, network/if_em/rtemscompat_defs.h, + * network/if_gfe/rtemscompat_defs.h, startup/bspstart.c: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c b/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c index 8b0eba27fc..204fafecd9 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c +++ b/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c @@ -75,7 +75,7 @@ #define NUM_INTR_REGS 3 -#define SYNC() asm volatile("sync") +#define SYNC() __asm__ volatile("sync") /* How many times should the ISR dispatcher check for * pending interrupts until it decides that something's diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h b/c/src/lib/libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h index 50b51e6d40..946c0f1a93 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h +++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h @@ -100,7 +100,7 @@ typedef struct { #define bus_dmamap_unload(args...) do {} while (0) #ifdef __PPC__ -#define bus_dmamap_sync(args...) do { asm volatile("sync":::"memory"); } while (0) +#define bus_dmamap_sync(args...) do { __asm__ volatile("sync":::"memory"); } while (0) #else #define bus_dmamap_sync(args...) do {} while (0) #endif diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/rtemscompat_defs.h b/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/rtemscompat_defs.h index 8234681b1b..9f90fdec96 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/rtemscompat_defs.h +++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/rtemscompat_defs.h @@ -89,7 +89,7 @@ typedef struct device blah; #define BUS_DMA_NOCACHE 0xdeadbeef #ifdef __PPC__ -#define bus_dmamap_sync(args...) do { asm volatile("sync":::"memory"); } while(0) +#define bus_dmamap_sync(args...) do { __asm__ volatile("sync":::"memory"); } while(0) #else #error "Dont' know how to sync memory on your CPU" #endif diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c b/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c index 55f0f421a4..9df047e032 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c @@ -233,7 +233,7 @@ void bsp_start( void ) * so there is no need to set it in r1 again... It is just for info * so that it can be printed without accessing R1. */ - asm volatile("mr %0, 1":"=r"(stack)); + __asm__ volatile("mr %0, 1":"=r"(stack)); /* tag the bottom (T. Straumann 6/36/2001 ) */