diff options
author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-01-24 12:47:51 +0000 |
---|---|---|
committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-01-24 12:47:51 +0000 |
commit | 9f0443bafbab97831e5c99553bf9f0805537f3fc (patch) | |
tree | f345b364549d6431c6158b899aebf8f191f0d332 /xen/drivers/char | |
parent | 22bf8a6c143701504b7ed71b80a6f39ae53ea39c (diff) | |
download | xen-9f0443bafbab97831e5c99553bf9f0805537f3fc.tar.gz xen-9f0443bafbab97831e5c99553bf9f0805537f3fc.tar.bz2 xen-9f0443bafbab97831e5c99553bf9f0805537f3fc.zip |
xen: infrastructure to have cross-platform video drivers
- introduce a new HAS_VIDEO config variable;
- build xen/drivers/video/font* if HAS_VIDEO;
- rename vga_puts to video_puts;
- rename vga_init to video_init;
- rename vga_endboot to video_endboot.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'xen/drivers/char')
-rw-r--r-- | xen/drivers/char/console.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index e9f696d7a6..ce843c5daa 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -21,7 +21,7 @@ #include <xen/delay.h> #include <xen/guest_access.h> #include <xen/shutdown.h> -#include <xen/vga.h> +#include <xen/video.h> #include <xen/kexec.h> #include <asm/debugger.h> #include <asm/div64.h> @@ -297,7 +297,7 @@ static void dump_console_ring_key(unsigned char key) buf[sofar] = '\0'; sercon_puts(buf); - vga_puts(buf); + video_puts(buf); free_xenheap_pages(buf, order); } @@ -383,7 +383,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) spin_lock_irq(&console_lock); sercon_puts(kbuf); - vga_puts(kbuf); + video_puts(kbuf); if ( opt_console_to_ring ) { @@ -458,7 +458,7 @@ static void __putstr(const char *str) ASSERT(spin_is_locked(&console_lock)); sercon_puts(str); - vga_puts(str); + video_puts(str); if ( !console_locks_busted ) { @@ -586,7 +586,7 @@ void __init console_init_preirq(void) if ( *p == ',' ) p++; if ( !strncmp(p, "vga", 3) ) - vga_init(); + video_init(); else if ( !strncmp(p, "none", 4) ) continue; else if ( (sh = serial_parse_handle(p)) >= 0 ) @@ -688,7 +688,7 @@ void __init console_endboot(void) printk("\n"); } - vga_endboot(); + video_endboot(); /* * If user specifies so, we fool the switch routine to redirect input |