From a8d0dbd30532c3c341f468fe2b03034b82b9b793 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 1 Nov 2002 23:09:05 +0000 Subject: 2002-11-01 Joel Sherrill * console/console.c, start/start.c: Removed warnings. --- c/src/lib/libbsp/m68k/efi332/ChangeLog | 4 ++ c/src/lib/libbsp/m68k/efi332/console/console.c | 62 +++++++++++++------------- c/src/lib/libbsp/m68k/efi332/start/start.c | 14 +++--- 3 files changed, 42 insertions(+), 38 deletions(-) (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog index b9a5b0a45f..b1ecae44f0 100644 --- a/c/src/lib/libbsp/m68k/efi332/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi332/ChangeLog @@ -1,3 +1,7 @@ +2002-11-01 Joel Sherrill + + * console/console.c, start/start.c: Removed warnings. + 2002-10-21 Ralf Corsepius * .cvsignore: Reformat. diff --git a/c/src/lib/libbsp/m68k/efi332/console/console.c b/c/src/lib/libbsp/m68k/efi332/console/console.c index 19653c5167..4be4139312 100644 --- a/c/src/lib/libbsp/m68k/efi332/console/console.c +++ b/c/src/lib/libbsp/m68k/efi332/console/console.c @@ -41,36 +41,36 @@ static volatile char _debug_flag = 0; /* _catchSCIint, _catchCTSint, and _catchSPURIOUSint are the interrupt front-ends */ extern void _catchSCIint(); -asm(" .text - .align 2 - .globl _catchSCIint -_catchSCIint: - 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 _catchSCIint\n\ +_catchSCIint:\n\ + moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */\n\ + jbsr uart_interrupt\n\ + moveml %sp@+,%d0-%d7/%a0-%a6 \n\ + rte\n\ "); extern void _catchCTSint(); -asm(" .text - .align 2 - .globl _catchCTSint -_catchCTSint: - moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */ - jbsr cts_interrupt - moveml %sp@+,%d0-%d7/%a0-%a6 - rte +asm(" .text\n\ + .align 2\n\ + .globl _catchCTSint\n\ +_catchCTSint:\n\ + moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */\n\ + jbsr cts_interrupt\n\ + moveml %sp@+,%d0-%d7/%a0-%a6 \n\ + rte\n\ "); extern void _catchSPURIOUSint(); -asm(" .text - .align 2 - .globl _catchSPURIOUSint -_catchSPURIOUSint: - moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */ - jbsr spurious_interrupt - moveml %sp@+,%d0-%d7/%a0-%a6 - rte +asm(" .text\n\ + .align 2\n\ + .globl _catchSPURIOUSint\n\ +_catchSPURIOUSint:\n\ + moveml %d0-%d7/%a0-%a6,%sp@- /* save registers */\n\ + jbsr spurious_interrupt\n\ + moveml %sp@+,%d0-%d7/%a0-%a6 \n\ + rte\n\ "); int _spurious_int_counter=0; @@ -84,13 +84,13 @@ void spurious_interrupt(void) { UART_ISR_LEVEL) as a trap #1 to enter the debugger */ /* *****fix me; this is for 68000 w/jsr ram exception table ******* */ -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) /* 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) /* jump exception 1 */\n\ "); /* dispatch UART interrupt */ diff --git a/c/src/lib/libbsp/m68k/efi332/start/start.c b/c/src/lib/libbsp/m68k/efi332/start/start.c index 03e98b8195..97e305d243 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/start.c +++ b/c/src/lib/libbsp/m68k/efi332/start/start.c @@ -24,16 +24,16 @@ void dumby_start() { /* 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; - moveal #M68Kvec, %a0; - movec %a0, %vbr; - movel #end, %d0; - addl " STACK_SIZE ",%d0; - movel %d0,%sp; + asm volatile ( "oriw #0x0700, %sr;\n\ + moveal #M68Kvec, %a0;\n\ + movec %a0, %vbr;\n\ + movel #end, %d0;\n\ + addl " STACK_SIZE ",%d0;\n\ + movel %d0,%sp;\n\ movel %d0,%a6" ); -- cgit v1.2.3