2000-11-17 20:41:32

by Jani Monoses

Subject: [patch] vgacon

Hi James,

here is a patch for vgacon.c could you please check it?

1) removes explicit 0 initialisation of statics

2) removes an apparently unnecesary line in vgacon_scroll:
as I see it scr_end is computed anyway after the if statement so
no need to put it on the else branch.

Jani.

--- /usr/src/linux-2.4.0/drivers/video/vgacon.c Thu Nov 16 20:04:52 2000
+++ vgacon.c Fri Nov 17 10:42:29 2000
@@ -104,7 +104,7 @@
static u16 vga_video_port_val; /* Video register value port */
static unsigned int vga_video_num_columns; /* Number of text columns */
static unsigned int vga_video_num_lines; /* Number of text lines */
-static int vga_can_do_color = 0; /* Do we support colors? */
+static int vga_can_do_color; /* Do we support colors? */
static unsigned int vga_default_font_height; /* Height of default screen font */
static unsigned char vga_video_type; /* Card type */
static unsigned char vga_hardscroll_enabled;
@@ -112,7 +112,7 @@
/*
* SoftSDV doesn't have hardware assist VGA scrolling
*/
-static unsigned char vga_hardscroll_user_enable = 0;
+static unsigned char vga_hardscroll_user_enable;
#else
static unsigned char vga_hardscroll_user_enable = 1;
#endif
@@ -122,7 +122,7 @@
static int vga_is_gfx;
static int vga_512_chars;
static int vga_video_font_height;
-static unsigned int vga_rolled_over = 0;
+static unsigned int vga_rolled_over;


static int __init no_scroll(char *str)
@@ -965,7 +965,7 @@

static void vgacon_save_screen(struct vc_data *c)
{
- static int vga_bootup_console = 0;
+ static int vga_bootup_console;

if (!vga_bootup_console) {
/* This is a gross hack, but here is the only place we can
@@ -1015,7 +1015,6 @@
vga_rolled_over = 0;
} else
c->vc_origin -= delta;
- c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;
scr_memsetw((u16 *)(c->vc_origin), c->vc_video_erase_char, delta);
}
c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;

2000-11-17 20:52:02

by James Simmons

Subject: Re: [patch] vgacon

On Fri, 17 Nov 2000 [email protected] wrote:

>
> Hi James,
>
> here is a patch for vgacon.c could you please check it?

Okay. Thank for for posting it not as a attachment.

> 1) removes explicit 0 initialisation of statics

Those are fine. I already have in the ruby tree for the linux console
project.

> 2) removes an apparently unnecesary line in vgacon_scroll:
> as I see it scr_end is computed anyway after the if statement so
> no need to put it on the else branch.

Hum. Never noticed that one. I will try this part out just to make sure
their is no problem.

2000-11-17 20:56:23

by Jani Monoses

Subject: Re: [patch] vgacon

> > 2) removes an apparently unnecesary line in vgacon_scroll:
> > as I see it scr_end is computed anyway after the if statement so
> > no need to put it on the else branch.
>
> Hum. Never noticed that one. I will try this part out just to make sure
> their is no problem.
>

I've checked that and it works both on 2.2 and 2.4 but another test won't
hurt :-)

Jani.

2000-11-17 21:00:54

by James Simmons

Subject: Re: [patch] vgacon

> I've checked that and it works both on 2.2 and 2.4 but another test won't
> hurt :-)

No problems here :-)