summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-01 23:10:45 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-01 23:10:45 +0000
commit4269a4366f169d42b7cc5c0305143f9317c00143 (patch)
treebc2c86abc72dc5d6922063ec208dcfe1b691b33f
parenta8d0dbd30532c3c341f468fe2b03034b82b9b793 (diff)
downloadrtems-4269a4366f169d42b7cc5c0305143f9317c00143.tar.bz2
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* console/console.c, start/start.c, startup/efi68k_wd.c:
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/console/console.c32
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/start/start.c12
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/startup/efi68k_wd.c18
3 files changed, 31 insertions, 31 deletions
diff --git a/c/src/lib/libbsp/m68k/efi68k/console/console.c b/c/src/lib/libbsp/m68k/efi68k/console/console.c
index 990868b37a..76727cdeeb 100644
--- a/c/src/lib/libbsp/m68k/efi68k/console/console.c
+++ b/c/src/lib/libbsp/m68k/efi68k/console/console.c
@@ -42,26 +42,26 @@ static volatile char _tx_stop = 0;
/* _catchUARTint is the interrupt front-end */
extern void _catchUARTint();
-asm(" .text
- .align 2
- .globl _catchUARTint
-_catchUARTint:
- lea %sp@(4),%sp /* pop return address */
- moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */
- jbsr uart_interrupt
- moveml %sp@+,%d0-%d7/%a0-%a6
- rte
+asm(" .text\n\
+ .align 2\n\
+ .globl _catchUARTint\n\
+_catchUARTint:\n\
+ lea %sp@(4),%sp /* pop return address */\n\
+ moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */\n\
+ jbsr uart_interrupt\n\
+ moveml %sp@+,%d0-%d7/%a0-%a6 \n\
+ rte\n\
");
/* _fake_trap_1 will continue the UART interrupt (%sr *still*
UART_ISR_LEVEL) as a trap #1 to enter the debugger */
-asm(" .text
- .align 2
-_fake_trap_1:
- unlk %a6 /* clear interrupt frame */
- lea %sp@(4),%sp /* remove jbsr instruction */
- moveml %sp@+,%d0-%d7/%a0-%a6 /* pop registers */
- jmp (33*6-12+_VBR) /* jump exception 1 */
+asm(" .text\n\
+ .align 2\n\
+_fake_trap_1:\n\
+ unlk %a6 /* clear interrupt frame */\n\
+ lea %sp@(4),%sp /* remove jbsr instruction */\n\
+ moveml %sp@+,%d0-%d7/%a0-%a6 /* pop registers */\n\
+ jmp (33*6-12+_VBR) /* jump exception 1 */\n\
");
/* dispatch UART interrupt */
diff --git a/c/src/lib/libbsp/m68k/efi68k/start/start.c b/c/src/lib/libbsp/m68k/efi68k/start/start.c
index 1904d34fb8..01674c9c21 100644
--- a/c/src/lib/libbsp/m68k/efi68k/start/start.c
+++ b/c/src/lib/libbsp/m68k/efi68k/start/start.c
@@ -25,15 +25,15 @@ void boot_card();
/* We need to by-pass the link instruction since the RAM chip-
select pins are not yet configured. */
- asm volatile ( ".global start ;
+ asm volatile ( ".global start ;\n\
start:");
/* disable interrupts, load stack pointer */
- asm volatile ( "oriw #0x0700, %sr;
- movel #end, %d0;
- addl " STACK_SIZE ",%d0;
- movel %d0,%sp;
- link %a6, #0"
+ asm volatile ( "oriw #0x0700, %sr;\n\
+ movel #end, %d0;\n\
+ addl " STACK_SIZE ",%d0;\n\
+ movel %d0,%sp;\n\
+ link %a6, #0"\n\
);
/*
* Initialize RAM by copying the .data section out of ROM (if
diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/efi68k_wd.c b/c/src/lib/libbsp/m68k/efi68k/startup/efi68k_wd.c
index 78c3d1e00a..2e94971199 100644
--- a/c/src/lib/libbsp/m68k/efi68k/startup/efi68k_wd.c
+++ b/c/src/lib/libbsp/m68k/efi68k/startup/efi68k_wd.c
@@ -29,15 +29,15 @@ void wd_interrupt(void) {
/* _catchWDint is the interrupt front-end */
extern void _catchWDint();
-asm(" .text
- .align 2
- .globl _catchWDint
-_catchWDint:
- lea %sp@(4),%sp /* pop return address */
- moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */
- jbsr wd_interrupt
- moveml %sp@+,%d0-%d7/%a0-%a6
- rte
+asm(" .text\n\
+ .align 2\n\
+ .globl _catchWDint\n\
+_catchWDint:\n\
+ lea %sp@(4),%sp /* pop return address */\n\
+ moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */\n\
+ jbsr wd_interrupt\n\
+ moveml %sp@+,%d0-%d7/%a0-%a6 \n\
+ rte\n\
");
void watch_dog_init(void) {