--- linux/drivers/video/fbcon.c 2002-02-25 20:38:07.000000000 +0100 +++ linux-koan/drivers/video/fbcon.c 2004-04-04 12:09:07.000000000 +0200 @@ -1,6 +1,16 @@ /* * linux/drivers/video/fbcon.c -- Low level frame buffer based console driver * + * ------------------------------------------------------------------- + * 04-04-2004 : Marco Cavallini fb_info->flags & FBINFO_FLAG_MODULE) || - p->type == FB_TYPE_TEXT) - logo = 0; + p->type == FB_TYPE_TEXT) + logo = 0; +#ifdef CONFIG_FBCON_NOLOGO + logo = 0 ; // (M@) // Disable tux logo +#endif + p->var.xoffset = p->var.yoffset = p->yscroll = 0; /* reset wrap/pan */ if (con == fg_console && p->type != FB_TYPE_TEXT) { @@ -2500,19 +2514,35 @@ pm_fbcon_request(struct pm_dev *dev, pm_ /* * The console `switch' structure for the frame buffer based console */ - + + +static void kfbcon_dummy_op(void) {} + +#define KDUMMY (void *)kfbcon_dummy_op + const struct consw fb_con = { con_startup: fbcon_startup, con_init: fbcon_init, con_deinit: fbcon_deinit, - con_clear: fbcon_clear, - con_putc: fbcon_putc, - con_putcs: fbcon_putcs, - con_cursor: fbcon_cursor, - con_scroll: fbcon_scroll, - con_bmove: fbcon_bmove, - con_switch: fbcon_switch, - con_blank: fbcon_blank, + con_clear: fbcon_clear, + con_putc: fbcon_putc, + +#ifdef CONFIG_FBCON_NOCLEAR + con_putcs: KDUMMY, // (M@) No clearscreen +#else + con_putcs: fbcon_putcs, // (M@) clearscreen +#endif + +#ifdef CONFIG_FBCON_NOCURSOR + con_cursor: KDUMMY, // (M@) No cursor +#else + con_cursor: fbcon_cursor,// (M@) cursor +#endif + + con_scroll: fbcon_scroll, + con_bmove: fbcon_bmove, + con_switch: fbcon_switch, + con_blank: fbcon_blank, con_font_op: fbcon_font_op, con_set_palette: fbcon_set_palette, con_scrolldelta: fbcon_scrolldelta,