diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-08-08 10:18:40 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-08-08 10:18:40 +0200 |
| commit | c23154aab5825fec81d5500c53eaa686646c76b5 (patch) | |
| tree | 32b0aafae49f664a65ced50981492bb031f006b8 /arch/x86 | |
| parent | cb07d74e2e0c0a41533b6bcd551af9bf2ebcf2bc (diff) | |
| parent | 9d195a546179bc732aba9eacccf0a9a3db591288 (diff) | |
| download | u-boot-imx-c23154aab5825fec81d5500c53eaa686646c76b5.zip u-boot-imx-c23154aab5825fec81d5500c53eaa686646c76b5.tar.gz u-boot-imx-c23154aab5825fec81d5500c53eaa686646c76b5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/lib/video.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/lib/video.c b/arch/x86/lib/video.c index dfd2a84..975949d 100644 --- a/arch/x86/lib/video.c +++ b/arch/x86/lib/video.c @@ -104,7 +104,7 @@ static void __video_putc(const char c, int *x, int *y) } } -static void video_putc(const char c) +static void video_putc(struct stdio_dev *dev, const char c) { int x, y, pos; @@ -123,7 +123,7 @@ static void video_putc(const char c) outb_p(0xff & (pos >> 1), vidport+1); } -static void video_puts(const char *s) +static void video_puts(struct stdio_dev *dev, const char *s) { int x, y, pos; char c; @@ -178,8 +178,6 @@ int video_init(void) vga_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_SYSTEM; vga_dev.putc = video_putc; /* 'putc' function */ vga_dev.puts = video_puts; /* 'puts' function */ - vga_dev.tstc = NULL; /* 'tstc' function */ - vga_dev.getc = NULL; /* 'getc' function */ if (stdio_register(&vga_dev) == 0) return 1; @@ -191,8 +189,6 @@ int video_init(void) strcpy(kbd_dev.name, "kbd"); kbd_dev.ext = 0; kbd_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; - kbd_dev.putc = NULL; /* 'putc' function */ - kbd_dev.puts = NULL; /* 'puts' function */ kbd_dev.tstc = i8042_tstc; /* 'tstc' function */ kbd_dev.getc = i8042_getc; /* 'getc' function */ |