diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 12:34:23 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 12:34:23 +0000 |
| commit | 5e858ba7048904f903215f0b45a7606e7d4bb328 (patch) | |
| tree | 4a3a4e9a645180204a9b7bc5a809cf23a1ca12f8 /c/src/lib/libbsp/m68k/mvme136 | |
| parent | 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-5e858ba7048904f903215f0b45a7606e7d4bb328.tar.bz2 | |
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* include/bsp.h, shmsupp/lock.c, startup/bspclean.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme136')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/include/bsp.h | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c | 8 |
4 files changed, 13 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 25d4c5cea1..4953a09a19 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,8 @@ +2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> + + * include/bsp.h, shmsupp/lock.c, startup/bspclean.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/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index 4bfb3b60b3..26d8b5bb70 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -34,7 +34,7 @@ extern "C" { #define rtems_bsp_delay( microseconds ) \ { register uint32_t _delay=(microseconds); \ register uint32_t _tmp=123; \ - asm volatile( "0: \ + __asm__ volatile( "0: \ nbcd %0 ; \ nbcd %0 ; \ dbf %1,0b" \ diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c b/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c index f0e60e498e..6bb3044071 100644 --- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c +++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c @@ -49,9 +49,9 @@ void Shm_Lock( rtems_interrupt_disable( isr_level ); Shm_isrstat = isr_level; - asm volatile( "lockit:" : : ); - asm volatile( "tas %0@" : "=a" (lockptr) : "0" (lockptr) ); - asm volatile( "bne lockit" : : ); + __asm__ volatile( "lockit:" : : ); + __asm__ volatile( "tas %0@" : "=a" (lockptr) : "0" (lockptr) ); + __asm__ volatile( "bne lockit" : : ); /* should delay */ } diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c index 0fc64ffd4d..1d2f511db7 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c @@ -23,12 +23,12 @@ void bsp_return_to_monitor_trap(void) register volatile void *start_addr; m68k_set_vbr( 0 ); /* restore 135Bug vectors */ - asm volatile( "trap #15" ); /* trap to 135Bug */ - asm volatile( ".short 0x63" ); /* return to 135Bug (.RETURN) */ + __asm__ volatile( "trap #15" ); /* trap to 135Bug */ + __asm__ volatile( ".short 0x63" ); /* return to 135Bug (.RETURN) */ /* restart program */ start_addr = start; - asm volatile ( "jmp %0@" : "=a" (start_addr) : "0" (start_addr) ); + __asm__ volatile ( "jmp %0@" : "=a" (start_addr) : "0" (start_addr) ); } #define TIMER 0xfffb0000 @@ -41,5 +41,5 @@ void bsp_cleanup( void ) Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0x00 ); M68Kvec[ 45 ] = bsp_return_to_monitor_trap; /* install handler */ - asm volatile( "trap #13" ); /* insures SUPV mode */ + __asm__ volatile( "trap #13" ); /* insures SUPV mode */ } |