sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-order console output functions, add proper prototypes,

Browse Source 
drop claim that our files were blatantly copied, because they have been
rewritten a very long time ago.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4837 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2009-10-24 13:06:04 +00:00
committed by Stefan Reinauer
parent b53bed1567
commit 52fc6b12cb
10 changed files with 116 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/i386/include/stdint.h
View File

@@ -1,7 +1,7 @@
#ifndef I386_STDINT_H
#define I386_STDINT_H
#if defined(__GNUC__) && !defined(__ROMCC__)
#if defined(__GNUC__)
#define __HAVE_LONG_LONG__ 1
#else
#define __HAVE_LONG_LONG__ 0

13
src/arch/i386/lib/console.c
View File

@@ -1,18 +1,9 @@
#include <console/loglevel.h>
#if CONFIG_USE_PRINTK_IN_CAR == 0
static void __console_tx_byte(unsigned char byte)
{
uart_tx_byte(byte);
}
#include "console_print.c"
#else
/* CONFIG_USE_PRINTK_IN_CAR == 1 */
#else /* CONFIG_USE_PRINTK_IN_CAR == 1 */
#include "console_printk.c"
#endif /* CONFIG_USE_PRINTK_IN_CAR */
#ifndef COREBOOT_EXTRA_VERSION
@@ -32,7 +23,7 @@ static void console_init(void)
}
static void die(const char *str)
void die(const char *str)
{
print_emerg(str);
do {

4
src/arch/i386/lib/console_print.c
View File

@@ -1,3 +1,7 @@
static void __console_tx_byte(unsigned char byte)
{
uart_tx_byte(byte);
}
static void __console_tx_nibble(unsigned nibble)
{

35
src/arch/i386/lib/printk_init.c
View File

@@ -1,31 +1,42 @@
/*
* blantantly copied from linux/kernel/printk.c
* 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.
*
* Copyright (C) 1991, 1992 Linus Torvalds
* 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.
*
* by yhlu moved from arch/ppc/lib/printk_init.c, removed the global variable console_loglevel
* 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 <stdarg.h>
#include <console/vtxprintf.h>
#include <console/loglevel.h>
#include <uart8250.h>
/* printk's without a loglevel use this.. */
#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */
/* Keep together for sysctl support */
/* Using an global varible can cause problem when we reset the stack from cache as ram to ram*/
/* Using a global varible can cause problems when we reset the stack
* from cache as ram to ram. If we make this a define USE_SHARED_STACK
* we could use the same code on all architectures.
*/
#if 0
int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
#else
#define console_loglevel ASM_CONSOLE_LOGLEVEL
#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
#endif
extern int vtxprintf(void (*)(unsigned char), const char *, va_list);
extern void uart8250_tx_byte(unsigned, unsigned char);
void console_tx_byte(unsigned char byte)
{
if (byte == '\n')
uart8250_tx_byte(CONFIG_TTYS0_BASE, '\r');
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
}

28
src/arch/ppc/lib/printk_init.c
View File

@@ -1,26 +1,34 @@
/*
* blantantly copied from linux/kernel/printk.c
* 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.
*
* Copyright (C) 1991, 1992 Linus Torvalds
* 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 <stdarg.h>
#include <console/vtxprintf.h>
#include <console/loglevel.h>
/* printk's without a loglevel use this.. */
#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */
/* Keep together for sysctl support */
#include <uart8250.h>
int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
extern int vtxprintf(void (*)(unsigned char), const char *, va_list);
extern void uart8250_tx_byte(unsigned, unsigned char);
void console_tx_byte(unsigned char byte)
{
if (byte == '\n')
uart8250_tx_byte(CONFIG_TTYS0_BASE, '\r');
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
}