[Linuxconsole-commit]CVS: ruby/ruby-2.6/drivers/video/console dummycon.c,NONE,1.1 vgacon.c,NONE,1.1

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/video/console
In directory sc8-pr-cvs1:/tmp/cvs-serv30919/ruby-2.6/drivers/video/console

Added Files:
	dummycon.c vgacon.c 
Log Message:
Synced to 2.6.0-test3

--- NEW FILE: dummycon.c ---
/*
 *  linux/drivers/video/dummycon.c -- A dummy console driver
 *
 *  To be used if there's no other console driver (e.g. for plain VGA text)
 *  available, usually until fbcon takes console over.
 */

#include <linux/types.h>
#include <linux/kdev_t.h>
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/vt_kern.h>
#include <linux/init.h>

/*
 *  Dummy console driver
 */

#if defined(__arm__)
#define DUMMY_COLUMNS	ORIG_VIDEO_COLS
#define DUMMY_ROWS	ORIG_VIDEO_LINES
#elif defined(__hppa__)
/* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */
#include <linux/config.h>
#define DUMMY_COLUMNS	CONFIG_DUMMY_CONSOLE_COLUMNS
#define DUMMY_ROWS	CONFIG_DUMMY_CONSOLE_ROWS
#else
#define DUMMY_COLUMNS	80
#define DUMMY_ROWS	25
#endif

static struct vt_struct dummy_vt;
static struct vc_data default_mode;

static const char *dummycon_startup(struct vt_struct *vt, int init)
{
	vt->default_mode = &default_mode;		
	return "dummy device";
}

static void dummycon_init(struct vc_data *vc, int init)
{
    vc->vc_can_do_color = 1;
    if (init) {
	vc->vc_cols = DUMMY_COLUMNS;
	vc->vc_rows = DUMMY_ROWS;
    } else
	vc_resize(vc, DUMMY_COLUMNS, DUMMY_ROWS);
}

static int dummycon_dummy(void)
{
    return 0;
}

#define DUMMY	(void *)dummycon_dummy

/*
 *  The console `switch' structure for the dummy console
 *
 *  Most of the operations are dummies.
 */

const struct consw dummy_con = {
    .con_startup 	= dummycon_startup,
    .con_init 		= dummycon_init,
    .con_deinit 	= DUMMY,
    .con_clear 		= DUMMY,
    .con_putc 		= DUMMY,
    .con_putcs 		= DUMMY,
    .con_cursor		= DUMMY,
    .con_scroll_region 	= DUMMY,
    .con_bmove	 	= DUMMY,
    .con_switch 	= DUMMY,
    .con_blank 		= DUMMY,
    .con_font_op 	= DUMMY,
    .con_set_palette 	= DUMMY,
    .con_scroll 	= DUMMY,
};

int __init dumbcon_init(void)
{
	const char *display_desc = NULL;

	memset(&dummy_vt, 0, sizeof(struct vt_struct));
	dummy_vt.kmalloced = 0;
	dummy_vt.vt_sw = &dummy_con;
	display_desc = vt_map_display(&dummy_vt, 1);
	if (!display_desc) return -ENODEV;
	printk("Console: mono %s %dx%d\n", display_desc,
		dummy_vt.default_mode->vc_cols,	
		dummy_vt.default_mode->vc_rows);
	return 0;
}


--- NEW FILE: vgacon.c ---
/*
 *  linux/drivers/video/vgacon.c -- Low level VGA based console driver
 *
 *	Created 28 Sep 1997 by Geert Uytterhoeven
 *
 *	Rewritten by Martin Mares <mj...@uc...>, July 1998
 *
 *  This file is based on the old console.c, vga.c and vesa_blank.c drivers.
 *
 *	Copyright (C) 1991, 1992  Linus Torvalds
 *			    1995  Jay Estabrook
 *
 *	User definable mapping table and font loading by Eugene G. Crosser,
 *	<cr...@av...>
 *
 *	Improved loadable font/UTF-8 support by H. Peter Anvin
 *	Feb-Sep 1995 <pet...@li...>
 *
 *	Colour palette handling, by Simon Tatham
[...1064 lines suppressed...]
	.con_invert_region	= vgacon_invert_region,
};

int __init vga_console_init(void)
{
	const char *display_desc = NULL;

	memset(&vga_vt, 0, sizeof(struct vt_struct));
	vga_vt.kmalloced = 0;
	vga_vt.vt_sw = &vga_con;
	display_desc = vt_map_display(&vga_vt, 1);
	if (!display_desc) return -ENODEV;
	printk("Console: %s %s %dx%d\n",
			vga_vt.default_mode->vc_can_do_color ? "Colour" : "Mono",
			display_desc, vga_vt.default_mode->vc_cols,
			vga_vt.default_mode->vc_rows);
	return 0;
}	

MODULE_LICENSE("GPL");