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

vc: separate state 



There are two copies of some members of struct vc_data. This is because
we need to save them and restore later. Move these memebers to a
separate structure called vc_state. So now instead of members like:
  vc_x, vc_y and vc_saved_x, vc_saved_y
we have
  state and saved_state (of type: struct vc_state)
containing
  state.x, state.y and saved_state.x, saved_state.y

This change:
* makes clear what is saved & restored
* eases save & restore by using memcpy (see save_cur and restore_cur)

Finally, we document the newly added struct vc_state using kernel-doc.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200615074910.19267-1-jslaby@suse.cz


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

drivers/accessibility/braille/braille_console.c

+5 −5
Original line number Diff line number Diff line
@@ -109,16 +109,16 @@ static void braille_write(u16 *buf) 
/* Follow the VC cursor*/

static void vc_follow_cursor(struct vc_data *vc)

{

	vc_x = vc->vc_x - (vc->vc_x % WIDTH);

	vc_y = vc->vc_y;

	lastvc_x = vc->vc_x;

	lastvc_y = vc->vc_y;

	vc_x = vc->state.x - (vc->state.x % WIDTH);

	vc_y = vc->state.y;

	lastvc_x = vc->state.x;

	lastvc_y = vc->state.y;

}



/* Maybe the VC cursor moved, if so follow it */

static void vc_maybe_cursor_moved(struct vc_data *vc)

{

	if (vc->vc_x != lastvc_x || vc->vc_y != lastvc_y)

	if (vc->state.x != lastvc_x || vc->state.y != lastvc_y)

		vc_follow_cursor(vc);

}

drivers/staging/speakup/main.c

+14 −14
Original line number Diff line number Diff line
@@ -263,8 +263,8 @@ static unsigned char get_attributes(struct vc_data *vc, u16 *pos) 


static void speakup_date(struct vc_data *vc)

{

	spk_x = spk_cx = vc->vc_x;

	spk_y = spk_cy = vc->vc_y;

	spk_x = spk_cx = vc->state.x;

	spk_y = spk_cy = vc->state.y;

	spk_pos = spk_cp = vc->vc_pos;

	spk_old_attr = spk_attr;

	spk_attr = get_attributes(vc, (u_short *)spk_pos);
@@ -1551,9 +1551,9 @@ static void do_handle_cursor(struct vc_data *vc, u_char value, char up_flag) 
 */

	is_cursor = value + 1;

	old_cursor_pos = vc->vc_pos;

	old_cursor_x = vc->vc_x;

	old_cursor_y = vc->vc_y;

	speakup_console[vc->vc_num]->ht.cy = vc->vc_y;

	old_cursor_x = vc->state.x;

	old_cursor_y = vc->state.y;

	speakup_console[vc->vc_num]->ht.cy = vc->state.y;

	cursor_con = vc->vc_num;

	if (cursor_track == CT_Highlight)

		reset_highlight_buffers(vc);
@@ -1574,8 +1574,8 @@ static void update_color_buffer(struct vc_data *vc, const u16 *ic, int len) 
	i = 0;

	if (speakup_console[vc_num]->ht.highsize[bi] == 0) {

		speakup_console[vc_num]->ht.rpos[bi] = vc->vc_pos;

		speakup_console[vc_num]->ht.rx[bi] = vc->vc_x;

		speakup_console[vc_num]->ht.ry[bi] = vc->vc_y;

		speakup_console[vc_num]->ht.rx[bi] = vc->state.x;

		speakup_console[vc_num]->ht.ry[bi] = vc->state.y;

	}

	while ((hi < COLOR_BUFFER_SIZE) && (i < len)) {

		if (ic[i] > 32) {
@@ -1664,9 +1664,9 @@ static int speak_highlight(struct vc_data *vc) 
		return 0;

	hc = get_highlight_color(vc);

	if (hc != -1) {

		d = vc->vc_y - speakup_console[vc_num]->ht.cy;

		d = vc->state.y - speakup_console[vc_num]->ht.cy;

		if ((d == 1) || (d == -1))

			if (speakup_console[vc_num]->ht.ry[hc] != vc->vc_y)

			if (speakup_console[vc_num]->ht.ry[hc] != vc->state.y)

				return 0;

		spk_parked |= 0x01;

		spk_do_flush();
@@ -1693,8 +1693,8 @@ static void cursor_done(struct timer_list *unused) 
	}

	speakup_date(vc);

	if (win_enabled) {

		if (vc->vc_x >= win_left && vc->vc_x <= win_right &&

		    vc->vc_y >= win_top && vc->vc_y <= win_bottom) {

		if (vc->state.x >= win_left && vc->state.x <= win_right &&

		    vc->state.y >= win_top && vc->state.y <= win_bottom) {

			spk_keydown = 0;

			is_cursor = 0;

			goto out;
@@ -1757,7 +1757,7 @@ static void speakup_con_write(struct vc_data *vc, u16 *str, int len) 
	if (!spin_trylock_irqsave(&speakup_info.spinlock, flags))

		/* Speakup output, discard */

		return;

	if (spk_bell_pos && spk_keydown && (vc->vc_x == spk_bell_pos - 1))

	if (spk_bell_pos && spk_keydown && (vc->state.x == spk_bell_pos - 1))

		bleep(3);

	if ((is_cursor) || (cursor_track == read_all_mode)) {

		if (cursor_track == CT_Highlight)
@@ -1766,8 +1766,8 @@ static void speakup_con_write(struct vc_data *vc, u16 *str, int len) 
		return;

	}

	if (win_enabled) {

		if (vc->vc_x >= win_left && vc->vc_x <= win_right &&

		    vc->vc_y >= win_top && vc->vc_y <= win_bottom) {

		if (vc->state.x >= win_left && vc->state.x <= win_right &&

		    vc->state.y >= win_top && vc->state.y <= win_bottom) {

			spin_unlock_irqrestore(&speakup_info.spinlock, flags);

			return;

		}

drivers/tty/vt/vt.c

+157 −170

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/console/mdacon.c

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

	}



	mda_set_cursor(c->vc_y*mda_num_columns*2 + c->vc_x*2);

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



	switch (c->vc_cursor_type & 0x0f) {

drivers/video/console/sticon.c

+3 −3
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ static void sticon_cursor(struct vc_data *conp, int mode) 
{

    unsigned short car1;



    car1 = conp->vc_screenbuf[conp->vc_x + conp->vc_y * conp->vc_cols];

    car1 = conp->vc_screenbuf[conp->state.x + conp->state.y * conp->vc_cols];

    switch (mode) {

    case CM_ERASE:

	sti_putc(sticon_sti, car1, conp->vc_y, conp->vc_x);

	sti_putc(sticon_sti, car1, conp->state.y, conp->state.x);

	break;

    case CM_MOVE:

    case CM_DRAW:
@@ -146,7 +146,7 @@ static void sticon_cursor(struct vc_data *conp, int mode) 
	case CUR_TWO_THIRDS:

	case CUR_BLOCK:

	    sti_putc(sticon_sti, (car1 & 255) + (0 << 8) + (7 << 11),

		     conp->vc_y, conp->vc_x);

		     conp->state.y, conp->state.x);

	    break;

	}

	break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE