if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
- while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x60) != 0x60)
+ while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x20) != 0x20)
if (!timeout--)
// Ran out of time.
return;
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
- while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x40) != 0x40)
+ while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x60) != 0x60)
if (!timeout--)
// Ran out of time.
return;
{
if (! CONFIG_DEBUG_LEVEL)
return;
- if (! CONFIG_COREBOOT)
+ if (CONFIG_DEBUG_IO)
// Send character to debug port.
- outb(c, PORT_BIOS_DEBUG);
+ outb(c, CONFIG_DEBUG_IO_PORT);
if (c == '\n')
debug_serial('\r');
debug_serial(c);
static void
putc_screen(struct putcinfo *action, char c)
{
- if (CONFIG_SCREEN_AND_DEBUG)
+ if (ScreenAndDebug)
putc_debug(&debuginfo, c);
if (c == '\n')
screenc('\r');
va_start(args, fmt);
bvprintf(&screeninfo, fmt, args);
va_end(args);
- if (CONFIG_SCREEN_AND_DEBUG)
+ if (ScreenAndDebug)
debug_serial_flush();
}