GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QEMU debugcon: Move under drivers/emulation/qemu 

Also prepare this console for use in romstage.

Change-Id: I26a4d4b5db1e44a261396a21bb0f0574d72aa86d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5136
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Kyösti Mälkki 2014-02-02 19:12:14 +02:00
parent 207379db12
commit 03731d776c
4 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/console/qemu_debugcon_console.c
View File

@ -19,43 +19,19 @@
*/
#include <console/console.h>
#include <arch/io.h>
static unsigned char readback;
#include <console/qemu_debugcon.h>
static void debugcon_init(void)
{
readback = inb(CONFIG_CONSOLE_QEMU_DEBUGCON_PORT);
printk(BIOS_INFO, "QEMU debugcon %s [port 0x%x]\n",
(readback == 0xe9) ? "detected" : "not found",
CONFIG_CONSOLE_QEMU_DEBUGCON_PORT);
qemu_debugcon_init();
}
static void debugcon_tx_byte(unsigned char data)
{
if (readback == 0xe9) {
outb(data, CONFIG_CONSOLE_QEMU_DEBUGCON_PORT);
}
}
static void debugcon_tx_flush(void)
{
}
static unsigned char debugcon_rx_byte(void)
{
return 0;
}
static int debugcon_tst_byte(void)
{
return 0;
qemu_debugcon_tx_byte(data);
}
static const struct console_driver debugcon_console __console = {
.init = debugcon_init,
.tx_byte = debugcon_tx_byte,
.tx_flush = debugcon_tx_flush,
.rx_byte = debugcon_rx_byte,
.tst_byte = debugcon_tst_byte,
};

3
src/drivers/emulation/qemu/Makefile.inc
View File

@ -1,3 +1,6 @@
romstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c
ramstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c
ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU_BOCHS) += bochs.c
ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU_BOCHS) += cirrus.c
ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU_BOCHS) += ../../pc80/vga/vga_io.c

41
src/drivers/emulation/qemu/qemu_debugcon.c Normal file
View File

@ -0,0 +1,41 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2013 Red Hat Inc.
* Written by Gerd Hoffmann <kraxel@redhat.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <console/console.h>
#include <console/qemu_debugcon.h>
#include <arch/io.h>
#include <arch/early_variables.h>
static int qemu_debugcon_detected CAR_GLOBAL;
void qemu_debugcon_init(void)
{
int detected = (inb(CONFIG_CONSOLE_QEMU_DEBUGCON_PORT) == 0xe9);
car_set_var(qemu_debugcon_detected, detected);
printk(BIOS_INFO, "QEMU debugcon %s [port 0x%x]\n",
detected ? "detected" : "not found",
CONFIG_CONSOLE_QEMU_DEBUGCON_PORT);
}
void qemu_debugcon_tx_byte(unsigned char data)
{
if (car_get_var(qemu_debugcon_detected) != 0)
outb(data, CONFIG_CONSOLE_QEMU_DEBUGCON_PORT);
}

7
src/include/console/qemu_debugcon.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef _QEMU_DEBUGCON_H_
#define _QEMU_DEBUGCON_H_
void qemu_debugcon_init(void);
void qemu_debugcon_tx_byte(unsigned char data);
#endif