diff options
author | Rudolf Marek <r.marek@assembler.cz> | 2010-07-16 20:02:09 +0000 |
---|---|---|
committer | Rudolf Marek <r.marek@assembler.cz> | 2010-07-16 20:02:09 +0000 |
commit | 4aa93ccd3302d7db0eef00f5963bc991f3f233ff (patch) | |
tree | 20c2eafd1c6178df70682a6565e357314236d082 /src/include | |
parent | 7fc9e291d7581845461efbdd74b56a8e0360f1e0 (diff) |
Add support for the console over Ethernet (through PCI NE2000).
Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Cristian Magherusan-Stanciu <cristi.magherusan@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5666 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/console/console.h | 23 | ||||
-rw-r--r-- | src/include/console/ne2k.h | 27 | ||||
-rw-r--r-- | src/include/ip_checksum.h | 3 |
3 files changed, 52 insertions, 1 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h index 5b5004629b..cab3c9e807 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -131,10 +131,17 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, #include <pc80/serial.c> +#if CONFIG_CONSOLE_NE2K +#include "lib/ne2k.c" +#endif + /* __ROMCC__ */ static void __console_tx_byte(unsigned char byte) { uart_tx_byte(byte); +#if CONFIG_CONSOLE_NE2K + ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT); +#endif } static void __console_tx_nibble(unsigned nibble) @@ -151,6 +158,10 @@ static void __console_tx_char(int loglevel, unsigned char byte) { if (console_loglevel >= loglevel) { uart_tx_byte(byte); +#if CONFIG_CONSOLE_NE2K + ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT); + ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); +#endif } } @@ -160,6 +171,9 @@ static void __console_tx_hex8(int loglevel, unsigned char value) __console_tx_nibble((value >> 4U) & 0x0fU); __console_tx_nibble(value & 0x0fU); } +#if CONFIG_CONSOLE_NE2K + ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); +#endif } static void __console_tx_hex16(int loglevel, unsigned short value) @@ -170,6 +184,9 @@ static void __console_tx_hex16(int loglevel, unsigned short value) __console_tx_nibble((value >> 4U) & 0x0fU); __console_tx_nibble(value & 0x0fU); } +#if CONFIG_CONSOLE_NE2K + ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); +#endif } static void __console_tx_hex32(int loglevel, unsigned int value) @@ -184,6 +201,9 @@ static void __console_tx_hex32(int loglevel, unsigned int value) __console_tx_nibble((value >> 4U) & 0x0fU); __console_tx_nibble(value & 0x0fU); } +#if CONFIG_CONSOLE_NE2K + ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); +#endif } static void __console_tx_string(int loglevel, const char *str) @@ -195,6 +215,9 @@ static void __console_tx_string(int loglevel, const char *str) __console_tx_byte('\r'); __console_tx_byte(ch); } +#if CONFIG_CONSOLE_NE2K + ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); +#endif } } diff --git a/src/include/console/ne2k.h b/src/include/console/ne2k.h new file mode 100644 index 0000000000..45073808da --- /dev/null +++ b/src/include/console/ne2k.h @@ -0,0 +1,27 @@ +#ifndef _NE2K_H__ +#define _NE2K_H__ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Rudolf Marek <r.marek@assembler.cz> + * + * 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 + */ + +#ifndef __ROMCC__ +void ne2k_append_data(unsigned char *d, int len, unsigned int base); +int ne2k_init(unsigned int eth_nic_base); +void ne2k_transmit(unsigned int eth_nic_base); +#endif +#endif /* _NE2K_H */ diff --git a/src/include/ip_checksum.h b/src/include/ip_checksum.h index c2cb938294..de26fa06cc 100644 --- a/src/include/ip_checksum.h +++ b/src/include/ip_checksum.h @@ -1,7 +1,8 @@ #ifndef IP_CHECKSUM_H #define IP_CHECKSUM_H +#ifndef __ROMCC__ unsigned long compute_ip_checksum(void *addr, unsigned long length); unsigned long add_ip_checksums(unsigned long offset, unsigned long sum, unsigned long new); - +#endif #endif /* IP_CHECKSUM_H */ |