diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-01-19 21:27:39 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-01-19 21:27:39 +0000 |
| commit | 16cc328967c64c8c0bda99c1cdc0cf1a773c2c24 (patch) | |
| tree | c77d2d4cb50365866e8d7c08310d7e22f55c32a5 /c/src/lib/libbsp/i386/shared/comm/uart.c | |
| parent | 2005-01-18 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-16cc328967c64c8c0bda99c1cdc0cf1a773c2c24.tar.bz2 | |
2005-01-19 Joel Sherrill <joel@OARcorp.com>
* pc386/console/vgainit.c, pc386/wd8003/wd8003.c, shared/comm/uart.c:
Fix errors caught by gcc 4.x.
Diffstat (limited to 'c/src/lib/libbsp/i386/shared/comm/uart.c')
| -rw-r--r-- | c/src/lib/libbsp/i386/shared/comm/uart.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/c/src/lib/libbsp/i386/shared/comm/uart.c index 78b4f70cb5..a2a619ec94 100644 --- a/c/src/lib/libbsp/i386/shared/comm/uart.c +++ b/c/src/lib/libbsp/i386/shared/comm/uart.c @@ -831,7 +831,7 @@ BSP_uart_termios_isr_com2() } /* ================= GDB support ===================*/ -static int sav[4] __attribute__ ((unused)); +int BSP_uart_dbgisr_com_regsav[4] __attribute__ ((unused)); /* * Interrupt service routine for COM1 - all, @@ -845,9 +845,9 @@ asm (".p2align 4"); asm (".text"); asm (".globl BSP_uart_dbgisr_com1"); asm ("BSP_uart_dbgisr_com1:"); -asm (" movl %eax, sav"); /* Save eax */ -asm (" movl %ebx, sav + 4"); /* Save ebx */ -asm (" movl %edx, sav + 8"); /* Save edx */ +asm (" movl %eax, BSP_uart_dbgisr_com_regsav"); /* Save eax */ +asm (" movl %ebx, BSP_uart_dbgisr_com_regsav + 4"); /* Save ebx */ +asm (" movl %edx, BSP_uart_dbgisr_com_regsav + 8"); /* Save edx */ asm (" movl $0, %ebx"); /* Clear flag */ @@ -878,37 +878,37 @@ asm (" cmpl $0, %ebx"); asm (" je uart_dbgisr_com1_3"); /* Flag is set */ -asm (" movl sav+4, %ebx"); /* Restore ebx */ -asm (" movl sav+8, %edx"); /* Restore edx */ +asm (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */ +asm (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */ /* Set TF bit */ -asm (" popl %eax"); /* Pop eip */ -asm (" movl %eax, sav + 4"); /* Save it */ -asm (" popl %eax"); /* Pop cs */ -asm (" movl %eax, sav + 8"); /* Save it */ -asm (" popl %eax"); /* Pop flags */ -asm (" orl $0x100, %eax"); /* Modify it */ -asm (" pushl %eax"); /* Push it back */ -asm (" movl sav+8, %eax"); /* Put back cs */ +asm (" popl %eax"); /* Pop eip */ +asm (" movl %eax, BSP_uart_dbgisr_com_regsav + 4"); /* Save it */ +asm (" popl %eax"); /* Pop cs */ +asm (" movl %eax, BSP_uart_dbgisr_com_regsav + 8"); /* Save it */ +asm (" popl %eax"); /* Pop flags */ +asm (" orl $0x100, %eax"); /* Modify it */ +asm (" pushl %eax"); /* Push it back */ +asm (" movl BSP_uart_dbgisr_com_regsav+8, %eax"); /* Put back cs */ asm (" pushl %eax"); -asm (" movl sav+4, %eax"); /* Put back eip */ +asm (" movl BSP_uart_dbgisr_com_regsav+4, %eax"); /* Put back eip */ asm (" pushl %eax"); /* Acknowledge IRQ */ asm (" movb $0x20, %al"); asm (" outb %al, $0x20"); -asm (" movl sav, %eax"); /* Restore eax */ -asm (" iret"); /* Done */ +asm (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */ +asm (" iret"); /* Done */ /* Flag is not set */ asm("uart_dbgisr_com1_3:"); -asm (" movl sav+4, %ebx"); /* Restore ebx */ -asm (" movl sav+8, %edx"); /* Restore edx */ +asm (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */ +asm (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */ /* Acknowledge irq */ asm (" movb $0x20, %al"); asm (" outb %al, $0x20"); -asm (" movl sav, %eax"); /* Restore eax */ +asm (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */ asm (" iret"); /* Done */ /* @@ -922,9 +922,9 @@ asm (".p2align 4"); asm (".text"); asm (".globl BSP_uart_dbgisr_com2"); asm ("BSP_uart_dbgisr_com2:"); -asm (" movl %eax, sav"); /* Save eax */ -asm (" movl %ebx, sav + 4"); /* Save ebx */ -asm (" movl %edx, sav + 8"); /* Save edx */ +asm (" movl %eax, BSP_uart_dbgisr_com_regsav"); /* Save eax */ +asm (" movl %ebx, BSP_uart_dbgisr_com_regsav + 4"); /* Save ebx */ +asm (" movl %edx, BSP_uart_dbgisr_com_regsav + 8"); /* Save edx */ asm (" movl $0, %ebx"); /* Clear flag */ @@ -955,35 +955,35 @@ asm (" cmpl $0, %ebx"); asm (" je uart_dbgisr_com2_3"); /* Flag is set */ -asm (" movl sav+4, %ebx"); /* Restore ebx */ -asm (" movl sav+8, %edx"); /* Restore edx */ +asm (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */ +asm (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */ /* Set TF bit */ asm (" popl %eax"); /* Pop eip */ -asm (" movl %eax, sav + 4"); /* Save it */ +asm (" movl %eax, BSP_uart_dbgisr_com_regsav + 4"); /* Save it */ asm (" popl %eax"); /* Pop cs */ -asm (" movl %eax, sav + 8"); /* Save it */ +asm (" movl %eax, BSP_uart_dbgisr_com_regsav + 8"); /* Save it */ asm (" popl %eax"); /* Pop flags */ asm (" orl $0x100, %eax"); /* Modify it */ asm (" pushl %eax"); /* Push it back */ -asm (" movl sav+8, %eax"); /* Put back cs */ +asm (" movl BSP_uart_dbgisr_com_regsav+8, %eax"); /* Put back cs */ asm (" pushl %eax"); -asm (" movl sav+4, %eax"); /* Put back eip */ +asm (" movl BSP_uart_dbgisr_com_regsav+4, %eax"); /* Put back eip */ asm (" pushl %eax"); /* Acknowledge IRQ */ asm (" movb $0x20, %al"); asm (" outb %al, $0x20"); -asm (" movl sav, %eax"); /* Restore eax */ +asm (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */ asm (" iret"); /* Done */ /* Flag is not set */ asm("uart_dbgisr_com2_3:"); -asm (" movl sav+4, %ebx"); /* Restore ebx */ -asm (" movl sav+8, %edx"); /* Restore edx */ +asm (" movl BSP_uart_dbgisr_com_regsav+4, %ebx"); /* Restore ebx */ +asm (" movl BSP_uart_dbgisr_com_regsav+8, %edx"); /* Restore edx */ /* Acknowledge irq */ asm (" movb $0x20, %al"); asm (" outb %al, $0x20"); -asm (" movl sav, %eax"); /* Restore eax */ +asm (" movl BSP_uart_dbgisr_com_regsav, %eax"); /* Restore eax */ asm (" iret"); /* Done */ |