summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/score603e
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-02-11 12:47:19 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-02-11 12:47:19 +0000
commitd3463aedfecf35b320ba4ed29982669ea511eb53 (patch)
tree78e96e80cde35984b79631af06b974fc56a73bcc /c/src/lib/libbsp/powerpc/score603e
parent2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-d3463aedfecf35b320ba4ed29982669ea511eb53.tar.bz2
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* PCI_bus/PCI.c, console/console.c, include/bsp.h, include/tm27.h, startup/Hwr_init.c, startup/bspstart.c: Use "__asm__" instead of "asm" for improved c99-compliance.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/score603e')
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/ChangeLog6
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/console/console.c4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/include/tm27.h8
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c2
7 files changed, 18 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index 3b72ce4896..b35a4b5d47 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * PCI_bus/PCI.c, console/console.c, include/bsp.h, include/tm27.h,
+ startup/Hwr_init.c, startup/bspstart.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/powerpc/score603e/PCI_bus/PCI.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
index 7fec04a76e..efc30b6e18 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
@@ -29,8 +29,8 @@
*/
void PCI_bus_delay (void)
{
- asm(" nop");
- asm(" nop");
+ __asm__ (" nop");
+ __asm__ (" nop");
}
/*
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/console.c b/c/src/lib/libbsp/powerpc/score603e/console/console.c
index 9aead3f686..392aa4a608 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/console.c
+++ b/c/src/lib/libbsp/powerpc/score603e/console/console.c
@@ -415,13 +415,13 @@ debug_putc_onlcr(const char c)
if ('\n'==c){
rtems_interrupt_disable( isrlevel );
outbyte_polled_85c30( csr, '\r' );
- asm volatile("isync");
+ __asm__ volatile("isync");
rtems_interrupt_enable( isrlevel );
}
rtems_interrupt_disable( isrlevel );
outbyte_polled_85c30( csr, c );
- asm volatile("isync");
+ __asm__ volatile("isync");
rtems_interrupt_enable( isrlevel );
}
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
index 3345351b31..7855235066 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
@@ -67,7 +67,7 @@ extern "C" {
SCORE603E_BRD_FLASH_DISABLE_MASK)
#define Processor_Synchronize() \
- asm volatile(" eieio ")
+ __asm__ volatile(" eieio ")
/* Constants */
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/tm27.h b/c/src/lib/libbsp/powerpc/score603e/include/tm27.h
index 2698a3bf40..4b8a0db1ed 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/tm27.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/tm27.h
@@ -45,22 +45,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/score603e/startup/Hwr_init.c b/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
index 5c71aa2851..117e3bc06b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
@@ -94,7 +94,7 @@ void init_PCI(void)
#define PPC_Get_HID0( _value ) \
do { \
_value = 0; /* to avoid warnings */ \
- asm volatile( \
+ __asm__ volatile( \
"mfspr %0, 0x3f0;" /* get HID0 */ \
"isync" \
: "=r" (_value) \
@@ -104,7 +104,7 @@ void init_PCI(void)
#define PPC_Set_HID0( _value ) \
do { \
- asm volatile( \
+ __asm__ volatile( \
"isync;" \
"mtspr 0x3f0, %0;" /* load HID0 */ \
"isync" \
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
index 8a2b53b96e..2ce9f958e0 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
@@ -213,7 +213,7 @@ void bsp_start( void )
msr_value = 0x2030;
_CPU_MSR_SET( msr_value );
- asm volatile("sync; isync");
+ __asm__ volatile("sync; isync");
/*
* initialize the device driver parameters