Commit c0e4b3ad authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

vt: use newly defined CUR_* macros 



We defined macros for all the magic constants in the previous patch. So
let us use the macro in the code now.

No functional change intended.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-usb@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Acked-by: default avatarHelge Deller <deller@gmx.de>
Link: https://lore.kernel.org/r/20200615074910.19267-26-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4dfa3c54

drivers/tty/vt/vt.c

+13 −9
Original line number Diff line number Diff line
@@ -866,17 +866,18 @@ static void add_softcursor(struct vc_data *vc) 
	int i = scr_readw((u16 *) vc->vc_pos);

	u32 type = vc->vc_cursor_type;



	if (!(type & 0x10))

	if (!(type & CUR_SW))

		return;

	if (softcursor_original != -1)

		return;

	softcursor_original = i;

	i |= (type >> 8) & 0xff00;

	i ^= type & 0xff00;

	if ((type & 0x20) && (softcursor_original & 0x7000) == (i & 0x7000))

		i ^= 0x7000;

	if ((type & 0x40) && (i & 0x700) == ((i & 0x7000) >> 4))

		i ^= 0x0700;

	i |= CUR_SET(type);

	i ^= CUR_CHANGE(type);

	if ((type & CUR_ALWAYS_BG) &&

			(softcursor_original & CUR_BG) == (i & CUR_BG))

		i ^= CUR_BG;

	if ((type & CUR_INVERT_FG_BG) && (i & CUR_FG) == ((i & CUR_BG) >> 4))

		i ^= CUR_FG;

	scr_writew(i, (u16 *)vc->vc_pos);

	if (con_should_update(vc))

		vc->vc_sw->con_putc(vc, i, vc->state.y, vc->state.x);
@@ -910,7 +911,7 @@ static void set_cursor(struct vc_data *vc) 
		if (vc_is_sel(vc))

			clear_selection();

		add_softcursor(vc);

		if ((vc->vc_cursor_type & 0x0f) != 1)

		if (CUR_SIZE(vc->vc_cursor_type) != CUR_NONE)

			vc->vc_sw->con_cursor(vc, CM_DRAW);

	} else

		hide_cursor(vc);
@@ -2322,7 +2323,10 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c) 
		case 'c':

			if (vc->vc_priv == EPdec) {

				if (vc->vc_par[0])

					vc->vc_cursor_type = vc->vc_par[0] | (vc->vc_par[1] << 8) | (vc->vc_par[2] << 16);

					vc->vc_cursor_type =

						CUR_MAKE(vc->vc_par[0],

							 vc->vc_par[1],

							 vc->vc_par[2]);

				else

					vc->vc_cursor_type = cur_default;

				return;

drivers/usb/misc/sisusbvga/sisusb_con.c

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ sisusbcon_cursor(struct vc_data *c, int mode) 


	baseline = c->vc_font.height - (c->vc_font.height < 10 ? 1 : 2);



	switch (c->vc_cursor_type & 0x0f) {

	switch (CUR_SIZE(c->vc_cursor_type)) {

		case CUR_BLOCK:		from = 1;

					to   = c->vc_font.height;

					break;

drivers/video/console/mdacon.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static void mdacon_cursor(struct vc_data *c, int mode) 


	mda_set_cursor(c->state.y * mda_num_columns * 2 + c->state.x * 2);



	switch (c->vc_cursor_type & 0x0f) {

	switch (CUR_SIZE(c->vc_cursor_type)) {



		case CUR_LOWER_THIRD:	mda_set_cursor_size(10, 13); break;

		case CUR_LOWER_HALF:	mda_set_cursor_size(7,  13); break;

drivers/video/console/sticon.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void sticon_cursor(struct vc_data *conp, int mode) 
	break;

    case CM_MOVE:

    case CM_DRAW:

	switch (conp->vc_cursor_type & 0x0f) {

	switch (CUR_SIZE(conp->vc_cursor_type)) {

	case CUR_UNDERLINE:

	case CUR_LOWER_THIRD:

	case CUR_LOWER_HALF:

drivers/video/console/vgacon.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static void vgacon_cursor(struct vc_data *c, int mode) 
	case CM_MOVE:

	case CM_DRAW:

		write_vga(14, (c->vc_pos - vga_vram_base) / 2);

		switch (c->vc_cursor_type & 0x0f) {

		switch (CUR_SIZE(c->vc_cursor_type)) {

		case CUR_UNDERLINE:

			vgacon_set_cursor_size(c->state.x,

					       c->vc_font.height -

CRA Git | Maintained and supported by SUSTech CRA and CCSE