From da3237376f8f4d35731ef9abfb7a7e5b94926198 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 25 May 2010 16:17:45 +0000 Subject: Long ago we agreed on kicking the _direct appendix because everything in coreboot is direct. This patch does it. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5586 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/console/Makefile.inc | 2 +- src/console/usbdebug_console.c | 87 +++++++++++++++++++++++++++++++++++ src/console/usbdebug_direct_console.c | 87 ----------------------------------- 3 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 src/console/usbdebug_console.c delete mode 100644 src/console/usbdebug_direct_console.c (limited to 'src/console') diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index cb8c1dfba5..f5fa880b66 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -10,7 +10,7 @@ initobj-y += vtxprintf.o initobj-$(CONFIG_USE_DCACHE_RAM) += console.o driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o -driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_direct_console.o +driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_console.o driver-$(CONFIG_CONSOLE_VGA) += vga_console.o driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o diff --git a/src/console/usbdebug_console.c b/src/console/usbdebug_console.c new file mode 100644 index 0000000000..2e71cc3ea3 --- /dev/null +++ b/src/console/usbdebug_console.c @@ -0,0 +1,87 @@ +/* + * This file is part of the coreboot project. + * + * 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 +#include +#include +#include + +static struct ehci_debug_info dbg_info; + +void set_ehci_base(unsigned ehci_base) +{ + unsigned diff; + + if (!dbg_info.ehci_debug) + return; + + diff = dbg_info.ehci_caps - ehci_base; + dbg_info.ehci_regs -= diff; + dbg_info.ehci_debug -= diff; + dbg_info.ehci_caps = ehci_base; +} + +void set_ehci_debug(unsigned ehci_debug) +{ + dbg_info.ehci_debug = ehci_debug; +} + +unsigned get_ehci_debug(void) +{ + return dbg_info.ehci_debug; +} + +static void dbgp_init(void) +{ + struct ehci_debug_info *dbg_infox; + + /* At this point, all we have to do is copy the fixed address + * debug_info data structure to our version defined above. */ + + dbg_infox = (struct ehci_debug_info *) + ((CONFIG_RAMTOP) - sizeof(struct ehci_debug_info)); + + memcpy(&dbg_info, dbg_infox, sizeof(struct ehci_debug_info)); +} + +static void dbgp_tx_byte(unsigned char data) +{ + if (dbg_info.ehci_debug) + dbgp_bulk_write_x(&dbg_info, &data, 1); +} + +static unsigned char dbgp_rx_byte(void) +{ + unsigned char data = 0xff; + + if (dbg_info.ehci_debug) + dbgp_bulk_read_x(&dbg_info, &data, 1); + + return data; +} + +static int dbgp_tst_byte(void) +{ + return dbg_info.ehci_debug; +} + +static const struct console_driver usbdebug_direct_console __console = { + .init = dbgp_init, + .tx_byte = dbgp_tx_byte, + .rx_byte = dbgp_rx_byte, + .tst_byte = dbgp_tst_byte, +}; diff --git a/src/console/usbdebug_direct_console.c b/src/console/usbdebug_direct_console.c deleted file mode 100644 index d1006598b0..0000000000 --- a/src/console/usbdebug_direct_console.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * 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 -#include -#include -#include - -static struct ehci_debug_info dbg_info; - -void set_ehci_base(unsigned ehci_base) -{ - unsigned diff; - - if (!dbg_info.ehci_debug) - return; - - diff = dbg_info.ehci_caps - ehci_base; - dbg_info.ehci_regs -= diff; - dbg_info.ehci_debug -= diff; - dbg_info.ehci_caps = ehci_base; -} - -void set_ehci_debug(unsigned ehci_debug) -{ - dbg_info.ehci_debug = ehci_debug; -} - -unsigned get_ehci_debug(void) -{ - return dbg_info.ehci_debug; -} - -static void dbgp_init(void) -{ - struct ehci_debug_info *dbg_infox; - - /* At this point, all we have to do is copy the fixed address - * debug_info data structure to our version defined above. */ - - dbg_infox = (struct ehci_debug_info *) - ((CONFIG_RAMTOP) - sizeof(struct ehci_debug_info)); - - memcpy(&dbg_info, dbg_infox, sizeof(struct ehci_debug_info)); -} - -static void dbgp_tx_byte(unsigned char data) -{ - if (dbg_info.ehci_debug) - dbgp_bulk_write_x(&dbg_info, &data, 1); -} - -static unsigned char dbgp_rx_byte(void) -{ - unsigned char data = 0xff; - - if (dbg_info.ehci_debug) - dbgp_bulk_read_x(&dbg_info, &data, 1); - - return data; -} - -static int dbgp_tst_byte(void) -{ - return dbg_info.ehci_debug; -} - -static const struct console_driver usbdebug_direct_console __console = { - .init = dbgp_init, - .tx_byte = dbgp_tx_byte, - .rx_byte = dbgp_rx_byte, - .tst_byte = dbgp_tst_byte, -}; -- cgit v1.2.3