移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/video/fbdev/core/fbcon_ud.c
..
..
@@ -50,8 +50,8 @@
50
50
 {
51
51
 	struct fbcon_ops *ops = info->fbcon_par;
52
52
 	struct fb_copyarea area;
53
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
54
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
53
+	u32 vyres = GETVYRES(ops->p, info);
54
+	u32 vxres = GETVXRES(ops->p, info);
55
55
 
56
56
 	area.sy = vyres - ((sy + height) * vc->vc_font.height);
57
57
 	area.sx = vxres - ((sx + width) * vc->vc_font.width);
..
..
@@ -69,8 +69,8 @@
69
69
 	struct fbcon_ops *ops = info->fbcon_par;
70
70
 	struct fb_fillrect region;
71
71
 	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
72
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
73
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
72
+	u32 vyres = GETVYRES(ops->p, info);
73
+	u32 vxres = GETVXRES(ops->p, info);
74
74
 
75
75
 	region.color = attr_bgcol_ec(bgshift,vc,info);
76
76
 	region.dy = vyres - ((sy + height) * vc->vc_font.height);
..
..
@@ -162,8 +162,8 @@
162
162
 	u32 mod = vc->vc_font.width % 8, cnt, pitch, size;
163
163
 	u32 attribute = get_attribute(info, scr_readw(s));
164
164
 	u8 *dst, *buf = NULL;
165
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
166
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
165
+	u32 vyres = GETVYRES(ops->p, info);
166
+	u32 vxres = GETVXRES(ops->p, info);
167
167
 
168
168
 	if (!ops->fontbuffer)
169
169
 		return;
..
..
@@ -255,12 +255,12 @@
255
255
 	struct fbcon_ops *ops = info->fbcon_par;
256
256
 	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
257
257
 	int w = (vc->vc_font.width + 7) >> 3, c;
258
-	int y = real_y(ops->p, vc->vc_y);
259
-	int attribute, use_sw = (vc->vc_cursor_type & 0x10);
258
+	int y = real_y(ops->p, vc->state.y);
259
+	int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
260
260
 	int err = 1, dx, dy;
261
261
 	char *src;
262
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
263
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
262
+	u32 vyres = GETVYRES(ops->p, info);
263
+	u32 vxres = GETVXRES(ops->p, info);
264
264
 
265
265
 	if (!ops->fontbuffer)
266
266
 		return;
..
..
@@ -306,7 +306,7 @@
306
306
 	}
307
307
 
308
308
 	dy = vyres - ((y * vc->vc_font.height) + vc->vc_font.height);
309
-	dx = vxres - ((vc->vc_x * vc->vc_font.width) + vc->vc_font.width);
309
+	dx = vxres - ((vc->state.x * vc->vc_font.width) + vc->vc_font.width);
310
310
 
311
311
 	if (ops->cursor_state.image.dx != dx ||
312
312
 	    ops->cursor_state.image.dy != dy ||
..
..
@@ -339,7 +339,7 @@
339
339
 		ops->p->cursor_shape = vc->vc_cursor_type;
340
340
 		cursor.set |= FB_CUR_SETSHAPE;
341
341
 
342
-		switch (ops->p->cursor_shape & CUR_HWMASK) {
342
+		switch (CUR_SIZE(ops->p->cursor_shape)) {
343
343
 		case CUR_NONE:
344
344
 			cur_height = 0;
345
345
 			break;
..
..
@@ -410,8 +410,8 @@
410
410
 {
411
411
 	struct fbcon_ops *ops = info->fbcon_par;
412
412
 	int xoffset, yoffset;
413
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
414
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
413
+	u32 vyres = GETVYRES(ops->p, info);
414
+	u32 vxres = GETVXRES(ops->p, info);
415
415
 	int err;
416
416
 
417
417
 	xoffset = vxres - info->var.xres - ops->var.xoffset;