RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2011-02-11 12:47:19 +00:00
parent d14d3399b6
commit d3463aedfe
7 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/powerpc/score603e/ChangeLog
View File

@@ -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> 2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>. * timer/timer.c: Include <rtems/btimer.h>.

4
c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
View File

@@ -29,8 +29,8 @@
*/ */
void PCI_bus_delay (void) void PCI_bus_delay (void)
{ {
asm(" nop"); __asm__ (" nop");
asm(" nop"); __asm__ (" nop");
} }
/* /*

4
c/src/lib/libbsp/powerpc/score603e/console/console.c
View File

@@ -415,13 +415,13 @@ debug_putc_onlcr(const char c)
if ('\n'==c){ if ('\n'==c){
rtems_interrupt_disable( isrlevel ); rtems_interrupt_disable( isrlevel );
outbyte_polled_85c30( csr, '\r' ); outbyte_polled_85c30( csr, '\r' );
asm volatile("isync"); __asm__ volatile("isync");
rtems_interrupt_enable( isrlevel ); rtems_interrupt_enable( isrlevel );
} }
rtems_interrupt_disable( isrlevel ); rtems_interrupt_disable( isrlevel );
outbyte_polled_85c30( csr, c ); outbyte_polled_85c30( csr, c );
asm volatile("isync"); __asm__ volatile("isync");
rtems_interrupt_enable( isrlevel ); rtems_interrupt_enable( isrlevel );
} }

2
c/src/lib/libbsp/powerpc/score603e/include/bsp.h
View File

@@ -67,7 +67,7 @@ extern "C" {
SCORE603E_BRD_FLASH_DISABLE_MASK) SCORE603E_BRD_FLASH_DISABLE_MASK)
#define Processor_Synchronize() \ #define Processor_Synchronize() \
asm volatile(" eieio ") __asm__ volatile(" eieio ")
/* Constants */ /* Constants */

8
c/src/lib/libbsp/powerpc/score603e/include/tm27.h
View File

@@ -45,22 +45,22 @@ void Install_tm27_vector(void (*_handler)())
#define Cause_tm27_intr() \ #define Cause_tm27_intr() \
do { \ do { \
uint32_t _clicks = 8; \ uint32_t _clicks = 8; \
asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ __asm__ volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
} while (0) } while (0)
#define Clear_tm27_intr() \ #define Clear_tm27_intr() \
do { \ do { \
uint32_t _clicks = 0xffffffff; \ uint32_t _clicks = 0xffffffff; \
asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ __asm__ volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
} while (0) } while (0)
#define Lower_tm27_intr() \ #define Lower_tm27_intr() \
do { \ do { \
uint32_t _msr = 0; \ uint32_t _msr = 0; \
_ISR_Set_level( 0 ); \ _ISR_Set_level( 0 ); \
asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ __asm__ volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
_msr |= 0x8002; \ _msr |= 0x8002; \
asm volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ __asm__ volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
} while (0) } while (0)
#endif #endif

4
c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
View File

@@ -94,7 +94,7 @@ void init_PCI(void)
#define PPC_Get_HID0( _value ) \ #define PPC_Get_HID0( _value ) \
do { \ do { \
_value = 0; /* to avoid warnings */ \ _value = 0; /* to avoid warnings */ \
asm volatile( \ __asm__ volatile( \
"mfspr %0, 0x3f0;" /* get HID0 */ \ "mfspr %0, 0x3f0;" /* get HID0 */ \
"isync" \ "isync" \
: "=r" (_value) \ : "=r" (_value) \
@@ -104,7 +104,7 @@ void init_PCI(void)
#define PPC_Set_HID0( _value ) \ #define PPC_Set_HID0( _value ) \
do { \ do { \
asm volatile( \ __asm__ volatile( \
"isync;" \ "isync;" \
"mtspr 0x3f0, %0;" /* load HID0 */ \ "mtspr 0x3f0, %0;" /* load HID0 */ \
"isync" \ "isync" \

2
c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
View File

@@ -213,7 +213,7 @@ void bsp_start( void )
msr_value = 0x2030; msr_value = 0x2030;
_CPU_MSR_SET( msr_value ); _CPU_MSR_SET( msr_value );
asm volatile("sync; isync"); __asm__ volatile("sync; isync");
/* /*
* initialize the device driver parameters * initialize the device driver parameters