Commit 1023ca19 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Helge Deller
Browse files

vgacon: cache vc_cell_height in vgacon_cursor() 



There are many places c->vc_cell_height is used in the code of
vgacon_cursor(). Caching the value to a local variable makes the code
much easier to follow.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 93686f6b

drivers/video/console/vgacon.c

+15 −19
Original line number Diff line number Diff line
@@ -470,11 +470,15 @@ static void vgacon_set_cursor_size(int from, int to) 


static void vgacon_cursor(struct vc_data *c, int mode)

{

	unsigned int c_height;



	if (c->vc_mode != KD_TEXT)

		return;



	vgacon_restore_screen(c);



	c_height = c->vc_cell_height;



	switch (mode) {

	case CM_ERASE:

		write_vga(14, (c->vc_pos - vga_vram_base) / 2);
@@ -489,30 +493,22 @@ static void vgacon_cursor(struct vc_data *c, int mode) 
		write_vga(14, (c->vc_pos - vga_vram_base) / 2);

		switch (CUR_SIZE(c->vc_cursor_type)) {

		case CUR_UNDERLINE:

			vgacon_set_cursor_size(c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 2 : 3),

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 1 : 2));

			vgacon_set_cursor_size(c_height -

					       (c_height < 10 ? 2 : 3),

					       c_height -

					       (c_height < 10 ? 1 : 2));

			break;

		case CUR_TWO_THIRDS:

			vgacon_set_cursor_size(c->vc_cell_height / 3,

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 1 : 2));

			vgacon_set_cursor_size(c_height / 3, c_height -

					       (c_height < 10 ? 1 : 2));

			break;

		case CUR_LOWER_THIRD:

			vgacon_set_cursor_size((c->vc_cell_height * 2) / 3,

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 1 : 2));

			vgacon_set_cursor_size(c_height * 2 / 3, c_height -

					       (c_height < 10 ? 1 : 2));

			break;

		case CUR_LOWER_HALF:

			vgacon_set_cursor_size(c->vc_cell_height / 2,

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 1 : 2));

			vgacon_set_cursor_size(c_height / 2, c_height -

					       (c_height < 10 ? 1 : 2));

			break;

		case CUR_NONE:

			if (vga_video_type >= VIDEO_TYPE_VGAC)
@@ -521,7 +517,7 @@ static void vgacon_cursor(struct vc_data *c, int mode) 
				vgacon_set_cursor_size(31, 31);

			break;

		default:

			vgacon_set_cursor_size(1, c->vc_cell_height);

			vgacon_set_cursor_size(1, c_height);

			break;

		}

		break;