modify sin led gpio

hc

2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e

 kernel/drivers/video/fbdev/core/fbcon_ccw.c
..
..
@@ -65,7 +65,7 @@
65
65
 {
66
66
 	struct fbcon_ops *ops = info->fbcon_par;
67
67
 	struct fb_copyarea area;
68
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
68
+	u32 vyres = GETVYRES(ops->p, info);
69
69
 
70
70
 	area.sx = sy * vc->vc_font.height;
71
71
 	area.sy = vyres - ((sx + width) * vc->vc_font.width);
..
..
@@ -83,7 +83,7 @@
83
83
 	struct fbcon_ops *ops = info->fbcon_par;
84
84
 	struct fb_fillrect region;
85
85
 	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
86
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
86
+	u32 vyres = GETVYRES(ops->p, info);
87
87
 
88
88
 	region.color = attr_bgcol_ec(bgshift,vc,info);
89
89
 	region.dx = sy * vc->vc_font.height;
..
..
@@ -140,7 +140,7 @@
140
140
 	u32 cnt, pitch, size;
141
141
 	u32 attribute = get_attribute(info, scr_readw(s));
142
142
 	u8 *dst, *buf = NULL;
143
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
143
+	u32 vyres = GETVYRES(ops->p, info);
144
144
 
145
145
 	if (!ops->fontbuffer)
146
146
 		return;
..
..
@@ -225,11 +225,11 @@
225
225
 	struct fbcon_ops *ops = info->fbcon_par;
226
226
 	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
227
227
 	int w = (vc->vc_font.height + 7) >> 3, c;
228
-	int y = real_y(ops->p, vc->vc_y);
229
-	int attribute, use_sw = (vc->vc_cursor_type & 0x10);
228
+	int y = real_y(ops->p, vc->state.y);
229
+	int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
230
230
 	int err = 1, dx, dy;
231
231
 	char *src;
232
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
232
+	u32 vyres = GETVYRES(ops->p, info);
233
233
 
234
234
 	if (!ops->fontbuffer)
235
235
 		return;
..
..
@@ -275,7 +275,7 @@
275
275
 	}
276
276
 
277
277
 	dx = y * vc->vc_font.height;
278
-	dy = vyres - ((vc->vc_x + 1) * vc->vc_font.width);
278
+	dy = vyres - ((vc->state.x + 1) * vc->vc_font.width);
279
279
 
280
280
 	if (ops->cursor_state.image.dx != dx ||
281
281
 	    ops->cursor_state.image.dy != dy ||
..
..
@@ -316,7 +316,7 @@
316
316
 		ops->p->cursor_shape = vc->vc_cursor_type;
317
317
 		cursor.set |= FB_CUR_SETSHAPE;
318
318
 
319
-		switch (ops->p->cursor_shape & CUR_HWMASK) {
319
+		switch (CUR_SIZE(ops->p->cursor_shape)) {
320
320
 		case CUR_NONE:
321
321
 			cur_height = 0;
322
322
 			break;
..
..
@@ -387,7 +387,7 @@
387
387
 {
388
388
 	struct fbcon_ops *ops = info->fbcon_par;
389
389
 	u32 yoffset;
390
-	u32 vyres = GETVYRES(ops->p->scrollmode, info);
390
+	u32 vyres = GETVYRES(ops->p, info);
391
391
 	int err;
392
392
 
393
393
 	yoffset = (vyres - info->var.yres) - ops->var.xoffset;