This patch removes most of the #ifdefs in libc/console.c, and

replaces it with two queues (input, output) where drivers (serial,
keyboard, video, usb) can attach.

The only things left with #ifdefs are initialization (at some point
the drivers must get a chance to register)


Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3679 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi
2008-10-21 15:08:18 +00:00
parent 97f56a4b7e
commit 657a6dc390
6 changed files with 89 additions and 32 deletions

View File

@ -145,7 +145,7 @@ int keyboard_add_reset_handler(void (*new_handler)(void));
*/
void serial_init(void);
void serial_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits);
void serial_putchar(unsigned char c);
void serial_putchar(unsigned int c);
int serial_havechar(void);
int serial_getchar(void);
void serial_clear(void);
@ -192,7 +192,7 @@ int get_option(void *dest, char *name);
* @{
*/
void console_init(void);
int putchar(int c);
int putchar(unsigned int c);
int puts(const char *s);
int havekey(void);
int getchar(void);
@ -200,6 +200,22 @@ int getchar_timeout(int *ms);
extern int last_putchar;
struct console_input_driver;
struct console_input_driver {
struct console_input_driver *next;
int (*havekey) (void);
int (*getchar) (void);
};
struct console_output_driver;
struct console_output_driver {
struct console_output_driver *next;
void (*putchar) (unsigned int);
};
void console_add_output_driver(struct console_output_driver *out);
void console_add_input_driver(struct console_input_driver *in);
#define havechar havekey
/** @} */