diff options
author | Matthew Garrett <mjg@redhat.com> | 2009-11-13 14:57:00 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-11-13 17:23:11 -0500 |
commit | d9b263528e01bfbaf716b51f38606b3dfe5ac1e9 (patch) | |
tree | 0a10b7c3f2298d48af1ab906bb01924ad08d23fb | |
parent | 156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff) |
x86, setup: Store the boot cursor state
Add a field to store the boot cursor state and implement this for VGA on
x86. This can then be used to set the default policy for the boot console.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
LKML-Reference: <1258142222-16092-1-git-send-email-mjg@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r-- | arch/x86/boot/video.c | 6 | ||||
-rw-r--r-- | include/linux/screen_info.h | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c index d42da3802499..f767164cd5df 100644 --- a/arch/x86/boot/video.c +++ b/arch/x86/boot/video.c | |||
@@ -27,6 +27,12 @@ static void store_cursor_position(void) | |||
27 | 27 | ||
28 | boot_params.screen_info.orig_x = oreg.dl; | 28 | boot_params.screen_info.orig_x = oreg.dl; |
29 | boot_params.screen_info.orig_y = oreg.dh; | 29 | boot_params.screen_info.orig_y = oreg.dh; |
30 | |||
31 | if (oreg.ch & 0x20) | ||
32 | boot_params.screen_info.flags |= VIDEO_FLAGS_NOCURSOR; | ||
33 | |||
34 | if ((oreg.ch & 0x1f) > (oreg.cl & 0x1f)) | ||
35 | boot_params.screen_info.flags |= VIDEO_FLAGS_NOCURSOR; | ||
30 | } | 36 | } |
31 | 37 | ||
32 | static void store_video_mode(void) | 38 | static void store_video_mode(void) |
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h index 1ee2c05142f6..899fbb487c94 100644 --- a/include/linux/screen_info.h +++ b/include/linux/screen_info.h | |||
@@ -14,7 +14,8 @@ struct screen_info { | |||
14 | __u16 orig_video_page; /* 0x04 */ | 14 | __u16 orig_video_page; /* 0x04 */ |
15 | __u8 orig_video_mode; /* 0x06 */ | 15 | __u8 orig_video_mode; /* 0x06 */ |
16 | __u8 orig_video_cols; /* 0x07 */ | 16 | __u8 orig_video_cols; /* 0x07 */ |
17 | __u16 unused2; /* 0x08 */ | 17 | __u8 flags; /* 0x08 */ |
18 | __u8 unused2; /* 0x09 */ | ||
18 | __u16 orig_video_ega_bx;/* 0x0a */ | 19 | __u16 orig_video_ega_bx;/* 0x0a */ |
19 | __u16 unused3; /* 0x0c */ | 20 | __u16 unused3; /* 0x0c */ |
20 | __u8 orig_video_lines; /* 0x0e */ | 21 | __u8 orig_video_lines; /* 0x0e */ |
@@ -65,6 +66,8 @@ struct screen_info { | |||
65 | 66 | ||
66 | #define VIDEO_TYPE_EFI 0x70 /* EFI graphic mode */ | 67 | #define VIDEO_TYPE_EFI 0x70 /* EFI graphic mode */ |
67 | 68 | ||
69 | #define VIDEO_FLAGS_NOCURSOR (1 << 0) /* The video mode has no cursor set */ | ||
70 | |||
68 | #ifdef __KERNEL__ | 71 | #ifdef __KERNEL__ |
69 | extern struct screen_info screen_info; | 72 | extern struct screen_info screen_info; |
70 | 73 | ||