vc: separate state

[linux-2.6-microblaze.git] / drivers / video / console / vgacon.c

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 998b0de..d073fa1 100644 (file)
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -718,9 +718,9 @@ static void vgacon_cursor(struct vc_data *c, int mode)
        case CM_ERASE:
                write_vga(14, (c->vc_pos - vga_vram_base) / 2);
                if (vga_video_type >= VIDEO_TYPE_VGAC)
-                       vgacon_set_cursor_size(c->vc_x, 31, 30);
+                       vgacon_set_cursor_size(c->state.x, 31, 30);
                else
-                       vgacon_set_cursor_size(c->vc_x, 31, 31);
+                       vgacon_set_cursor_size(c->state.x, 31, 31);
                break;
 
        case CM_MOVE:
@@ -728,7 +728,7 @@ static void vgacon_cursor(struct vc_data *c, int mode)
                write_vga(14, (c->vc_pos - vga_vram_base) / 2);
                switch (c->vc_cursor_type & 0x0f) {
                case CUR_UNDERLINE:
-                       vgacon_set_cursor_size(c->vc_x,
+                       vgacon_set_cursor_size(c->state.x,
                                               c->vc_font.height -
                                               (c->vc_font.height <
                                                10 ? 2 : 3),
@@ -737,21 +737,21 @@ static void vgacon_cursor(struct vc_data *c, int mode)
                                                10 ? 1 : 2));
                        break;
                case CUR_TWO_THIRDS:
-                       vgacon_set_cursor_size(c->vc_x,
+                       vgacon_set_cursor_size(c->state.x,
                                               c->vc_font.height / 3,
                                               c->vc_font.height -
                                               (c->vc_font.height <
                                                10 ? 1 : 2));
                        break;
                case CUR_LOWER_THIRD:
-                       vgacon_set_cursor_size(c->vc_x,
+                       vgacon_set_cursor_size(c->state.x,
                                               (c->vc_font.height * 2) / 3,
                                               c->vc_font.height -
                                               (c->vc_font.height <
                                                10 ? 1 : 2));
                        break;
                case CUR_LOWER_HALF:
-                       vgacon_set_cursor_size(c->vc_x,
+                       vgacon_set_cursor_size(c->state.x,
                                               c->vc_font.height / 2,
                                               c->vc_font.height -
                                               (c->vc_font.height <
@@ -759,12 +759,12 @@ static void vgacon_cursor(struct vc_data *c, int mode)
                        break;
                case CUR_NONE:
                        if (vga_video_type >= VIDEO_TYPE_VGAC)
-                               vgacon_set_cursor_size(c->vc_x, 31, 30);
+                               vgacon_set_cursor_size(c->state.x, 31, 30);
                        else
-                               vgacon_set_cursor_size(c->vc_x, 31, 31);
+                               vgacon_set_cursor_size(c->state.x, 31, 31);
                        break;
                default:
-                       vgacon_set_cursor_size(c->vc_x, 1,
+                       vgacon_set_cursor_size(c->state.x, 1,
                                               c->vc_font.height);
                        break;
                }
@@ -1352,8 +1352,8 @@ static void vgacon_save_screen(struct vc_data *c)
                 * console initialization routines.
                 */
                vga_bootup_console = 1;
-               c->vc_x = screen_info.orig_x;
-               c->vc_y = screen_info.orig_y;
+               c->state.x = screen_info.orig_x;
+               c->state.y = screen_info.orig_y;
        }
 
        /* We can't copy in more than the size of the video buffer,