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 
* sh7032/delay/delay.c, sh7032/score/cpu_asm.c,
	sh7032/score/ispsh7032.c, sh7045/sci/sci.c,
	sh7045/sci/sci_termios.c, sh7045/score/cpu_asm.c,
	sh7045/score/ispsh7045.c, sh7750/sci/sh4uart.c,
	sh7750/score/cpu_asm.c, sh7750/score/ispsh7750.c,
	shgdb/score/cpu_asm.c, shgdb/score/ispshgdb.c:
	Use "__asm__" instead of "asm" for improved c99-compliance.
This commit is contained in:
Ralf Corsepius
2011-02-11 09:57:25 +00:00
parent 1531033d84
commit 3d0af835ba
13 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libcpu/sh/ChangeLog
View File

@@ -1,3 +1,13 @@
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* sh7032/delay/delay.c, sh7032/score/cpu_asm.c,
sh7032/score/ispsh7032.c, sh7045/sci/sci.c,
sh7045/sci/sci_termios.c, sh7045/score/cpu_asm.c,
sh7045/score/ispsh7045.c, sh7750/sci/sh4uart.c,
sh7750/score/cpu_asm.c, sh7750/score/ispsh7750.c,
shgdb/score/cpu_asm.c, shgdb/score/ispshgdb.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> 2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1. * configure.ac: Require autoconf-2.68, automake-1.11.1.

2
c/src/lib/libcpu/sh/sh7032/delay/delay.c
View File

@@ -43,7 +43,7 @@ void CPU_delay( uint32_t microseconds )
register uint32_t clicks_per_usec = bsp_clicks_per_second / 1000000; register uint32_t clicks_per_usec = bsp_clicks_per_second / 1000000;
register uint32_t _delay = (microseconds) * (clicks_per_usec); register uint32_t _delay = (microseconds) * (clicks_per_usec);
asm volatile ( __asm__ volatile (
"0: add #-4,%0\n\ "0: add #-4,%0\n\
nop\n\ nop\n\
cmp/pl %0\n\ cmp/pl %0\n\

2
c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
View File

@@ -49,7 +49,7 @@ extern proc_ptr _Hardware_isr_Table[];
unsigned long *_old_stack_ptr; unsigned long *_old_stack_ptr;
#endif #endif
register unsigned long *stack_ptr asm("r15"); register unsigned long *stack_ptr __asm__ ("r15");
/* /*
* sh_set_irq_priority * sh_set_irq_priority

2
c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c
View File

@@ -122,7 +122,7 @@ asm (".global _"Str(name)"\n\t" \
* Dummy interrupt service procedure for * Dummy interrupt service procedure for
* interrupts being not allowed --> Trap 34 * interrupts being not allowed --> Trap 34
************************************************/ ************************************************/
asm(" .section .text\n\ __asm__ (" .section .text\n\
.global __dummy_isp\n\ .global __dummy_isp\n\
__dummy_isp:\n\ __dummy_isp:\n\
mov.l r14,@-r15\n\ mov.l r14,@-r15\n\

2
c/src/lib/libcpu/sh/sh7045/sci/sci.c
View File

@@ -379,7 +379,7 @@ rtems_device_driver sh_sci_open(
_sci_set_cflags( &sci_device[minor], sci_device[minor].cflags ); _sci_set_cflags( &sci_device[minor], sci_device[minor].cflags );
for (a=0; a < 10000L; a++) { /* Delay */ for (a=0; a < 10000L; a++) { /* Delay */
asm volatile ("nop"); __asm__ volatile ("nop");
} }
write8((SCI_RE | SCI_TE), /* enable async. Tx and Rx */ write8((SCI_RE | SCI_TE), /* enable async. Tx and Rx */

4
c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c
View File

@@ -113,7 +113,7 @@ int sh_sci_set_attributes(
SH_SCI_REG_DATA(brr, minor, SCI_BRR); SH_SCI_REG_DATA(brr, minor, SCI_BRR);
for (a=0; a < 10000L; a++) { /* Delay one bit */ for (a=0; a < 10000L; a++) { /* Delay one bit */
asm volatile ("nop"); __asm__ volatile ("nop");
} }
SH_SCI_REG_FLAG((SCI_RE | SCI_TE), minor, SCI_SCR); SH_SCI_REG_FLAG((SCI_RE | SCI_TE), minor, SCI_SCR);
@@ -295,7 +295,7 @@ int sh_sci_first_open(
sh_sci_set_attributes(minor, Console_Port_Tbl[minor].pDeviceParams); sh_sci_set_attributes(minor, Console_Port_Tbl[minor].pDeviceParams);
for (a=0; a < 10000L; a++) { /* Delay */ for (a=0; a < 10000L; a++) { /* Delay */
asm volatile ("nop"); __asm__ volatile ("nop");
} }
write8((SCI_RE | SCI_TE), /* enable async. Tx and Rx */ write8((SCI_RE | SCI_TE), /* enable async. Tx and Rx */

2
c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
View File

@@ -48,7 +48,7 @@ extern proc_ptr _Hardware_isr_Table[];
unsigned long *_old_stack_ptr; unsigned long *_old_stack_ptr;
#endif #endif
register unsigned long *stack_ptr asm("r15"); register unsigned long *stack_ptr __asm__ ("r15");
/* /*
* sh_set_irq_priority * sh_set_irq_priority

2
c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c
View File

@@ -151,7 +151,7 @@ asm (".global _"Str(name)"\n\t"\
* Dummy interrupt service procedure for * Dummy interrupt service procedure for
* interrupts being not allowed --> Trap 34 * interrupts being not allowed --> Trap 34
************************************************/ ************************************************/
asm(" .section .text\n\ __asm__ (" .section .text\n\
.global __dummy_isp\n\ .global __dummy_isp\n\
__dummy_isp:\n\ __dummy_isp:\n\
mov.l r14,@-r15\n\ mov.l r14,@-r15\n\

4
c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c
View File

@@ -842,7 +842,7 @@ sh4uart_start_remote_tx(sh4uart *uart)
* Says gdb that program finished to get out from it. * Says gdb that program finished to get out from it.
*/ */
extern void ipl_finish(void); extern void ipl_finish(void);
asm( __asm__ (
" .global _ipl_finish\n" " .global _ipl_finish\n"
"_ipl_finish:\n" "_ipl_finish:\n"
" mov.l __ipl_finish_value, r0\n" " mov.l __ipl_finish_value, r0\n"
@@ -856,7 +856,7 @@ asm(
); );
extern int ipl_serial_input(int poll_count); extern int ipl_serial_input(int poll_count);
asm( __asm__ (
" .global _ipl_serial_input\n" " .global _ipl_serial_input\n"
"_ipl_serial_input:\n" "_ipl_serial_input:\n"
" mov #1,r0\n" " mov #1,r0\n"

2
c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
View File

@@ -48,7 +48,7 @@ extern proc_ptr _Hardware_isr_Table[];
unsigned long *_old_stack_ptr; unsigned long *_old_stack_ptr;
#endif #endif
register unsigned long *stack_ptr asm("r15"); register unsigned long *stack_ptr __asm__ ("r15");
/* /*
* This routine provides the RTEMS interrupt management. * This routine provides the RTEMS interrupt management.

2
c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c
View File

@@ -309,7 +309,7 @@ asm (" .text\n"
* Dummy interrupt service procedure for * Dummy interrupt service procedure for
* interrupts being not allowed --> Trap 2 * interrupts being not allowed --> Trap 2
************************************************/ ************************************************/
asm(" .section .text\n\ __asm__ (" .section .text\n\
.global __dummy_isp\n\ .global __dummy_isp\n\
__dummy_isp:\n\ __dummy_isp:\n\
mov.l r14,@-r15\n\ mov.l r14,@-r15\n\

2
c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
View File

@@ -21,7 +21,7 @@
unsigned long *_old_stack_ptr; unsigned long *_old_stack_ptr;
#endif #endif
register unsigned long *stack_ptr asm("r15"); register unsigned long *stack_ptr __asm__ ("r15");
/* /*
* This routine provides the RTEMS interrupt management. * This routine provides the RTEMS interrupt management.

2
c/src/lib/libcpu/sh/shgdb/score/ispshgdb.c
View File

@@ -137,7 +137,7 @@ asm (".global _"Str(name)"\n\t"\
* Dummy interrupt service procedure for * Dummy interrupt service procedure for
* interrupts being not allowed --> Trap 34 * interrupts being not allowed --> Trap 34
************************************************/ ************************************************/
asm(" .section .text\n\ __asm__ (" .section .text\n\
.global __dummy_isp\n\ .global __dummy_isp\n\
__dummy_isp:\n\ __dummy_isp:\n\
mov.l r14,@-r15\n\ mov.l r14,@-r15\n\