diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-02-04 14:28:17 +0200 |
---|---|---|
committer | Patrick Georgi <patrick@georgi-clan.de> | 2014-04-09 13:25:14 +0200 |
commit | b04e0fff7da5547e2152dc8f6f23af247e9048ec (patch) | |
tree | feee0da3d558f1428086c16a9d7aaa51a5ffbcde /src/include/console | |
parent | 657e0be46495bb54ddf5a0fbad786fe352c2847f (diff) |
console: Simplify vtxprintf
We do not need ROMCC support here and using wrappers for
console_tx_byte we can simplify this code.
Change-Id: I7f3b5acdfd0bde1d832b16418339dd5e232627e7
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5334
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src/include/console')
-rw-r--r-- | src/include/console/console.h | 1 | ||||
-rw-r--r-- | src/include/console/vtxprintf.h | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h index c184f83e20..e19abec831 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -75,6 +75,7 @@ static inline void do_putchar(unsigned char byte) {} int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); void do_putchar(unsigned char byte); +void wrap_putchar(unsigned char byte, void *data); #define printk(LEVEL, fmt, args...) \ do { \ diff --git a/src/include/console/vtxprintf.h b/src/include/console/vtxprintf.h index c5daf9d340..3f0c63e299 100644 --- a/src/include/console/vtxprintf.h +++ b/src/include/console/vtxprintf.h @@ -34,10 +34,7 @@ typedef __builtin_va_list va_list; #include <stdarg.h> #endif -int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args); - -#if !defined (__ROMCC__) && !defined (__SMM__) -int vtxdprintf(void (*tx_byte)(unsigned char byte, void *data), const char *fmt, va_list args, void *data); -#endif +int vtxprintf(void (*tx_byte)(unsigned char byte, void *data), + const char *fmt, va_list args, void *data); #endif |