diff options
| author | Michael Brown | 2015-06-29 09:43:16 +0200 |
|---|---|---|
| committer | Michael Brown | 2015-06-29 12:04:10 +0200 |
| commit | 2a696ab963fe71296d9495caed1b748f6f7d8971 (patch) | |
| tree | bb6b45746dcb160819dc075d052b24bd77f958ac /src/arch/i386 | |
| parent | [gdb] Use new UART abstraction in GDB serial transport (diff) | |
| download | ipxe-2a696ab963fe71296d9495caed1b748f6f7d8971.tar.gz ipxe-2a696ab963fe71296d9495caed1b748f6f7d8971.tar.xz ipxe-2a696ab963fe71296d9495caed1b748f6f7d8971.zip | |
[serial] Use new UART abstraction in serial console driver
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/interface/syslinux/comboot_call.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c index 1854501d..4d033409 100644 --- a/src/arch/i386/interface/syslinux/comboot_call.c +++ b/src/arch/i386/interface/syslinux/comboot_call.c @@ -41,8 +41,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/image.h> #include <ipxe/version.h> #include <usr/imgmgmt.h> -#include "config/console.h" -#include "config/serial.h" /** The "SYSLINUX" version string */ static char __bss16_array ( syslinux_version, [32] ); @@ -261,8 +259,10 @@ static __asmcall void int21 ( struct i386_all_regs *ix86 ) { break; case 0x04: /* Write Character to Serial Port */ - serial_putc ( ix86->regs.dl ); - ix86->flags &= ~CF; + if ( serial_console.base ) { + uart_transmit ( &serial_console, ix86->regs.dl ); + ix86->flags &= ~CF; + } break; case 0x09: /* Write DOS String to Console */ @@ -455,15 +455,12 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) { break; case 0x000B: /* Get Serial Console Configuration */ -#if defined(CONSOLE_SERIAL) && !defined(COMPRESERVE) - ix86->regs.dx = COMCONSOLE; - ix86->regs.cx = 115200 / COMSPEED; - ix86->regs.bx = 0; -#else - ix86->regs.dx = 0; -#endif - - ix86->flags &= ~CF; + if ( serial_console.base ) { + ix86->regs.dx = ( ( intptr_t ) serial_console.base ); + ix86->regs.cx = serial_console.divisor; + ix86->regs.bx = 0; + ix86->flags &= ~CF; + } break; case 0x000E: /* Get configuration file name */ |