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

vt: redefine world of cursor macros 



The cursor code used to use magic constants, ANDs, ORs, and some macros.
Redefine all this to make some sense.

In particular:
* Drop CUR_DEFAULT, which is CUR_UNDERLINE. CUR_DEFAULT was used only
  for cur_default variable initialization, so use CUR_UNDERLINE there to
  make obvious what's the default.
* Drop CUR_HWMASK. Instead, define CUR_SIZE() which explains it more.
  And use it all over the places.
* Define few more masks and bits which will be used in next patches
  instead of magic constants.
* Define CUR_MAKE to build up cursor value.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Link: https://lore.kernel.org/r/20200615074910.19267-25-jslaby@suse.cz


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

drivers/tty/vt/vt.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ module_param(default_utf8, int, S_IRUGO | S_IWUSR); 
int global_cursor_default = -1;

module_param(global_cursor_default, int, S_IRUGO | S_IWUSR);



static int cur_default = CUR_DEFAULT;

static int cur_default = CUR_UNDERLINE;

module_param(cur_default, int, S_IRUGO | S_IWUSR);



/*

drivers/video/fbdev/core/bitblit.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode, 
		ops->p->cursor_shape = vc->vc_cursor_type;

		cursor.set |= FB_CUR_SETSHAPE;



		switch (ops->p->cursor_shape & CUR_HWMASK) {

		switch (CUR_SIZE(ops->p->cursor_shape)) {

		case CUR_NONE:

			cur_height = 0;

			break;

drivers/video/fbdev/core/fbcon_ccw.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode, 
		ops->p->cursor_shape = vc->vc_cursor_type;

		cursor.set |= FB_CUR_SETSHAPE;



		switch (ops->p->cursor_shape & CUR_HWMASK) {

		switch (CUR_SIZE(ops->p->cursor_shape)) {

		case CUR_NONE:

			cur_height = 0;

			break;

drivers/video/fbdev/core/fbcon_cw.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode, 
		ops->p->cursor_shape = vc->vc_cursor_type;

		cursor.set |= FB_CUR_SETSHAPE;



		switch (ops->p->cursor_shape & CUR_HWMASK) {

		switch (CUR_SIZE(ops->p->cursor_shape)) {

		case CUR_NONE:

			cur_height = 0;

			break;

drivers/video/fbdev/core/fbcon_ud.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode, 
		ops->p->cursor_shape = vc->vc_cursor_type;

		cursor.set |= FB_CUR_SETSHAPE;



		switch (ops->p->cursor_shape & CUR_HWMASK) {

		switch (CUR_SIZE(ops->p->cursor_shape)) {

		case CUR_NONE:

			cur_height = 0;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE