diff options
| author | Alexander Viro <viro@www.linux.org.uk> | 2004-07-29 08:47:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-29 08:47:32 -0700 |
| commit | bd048df6f4e1e6da6246041e6d46b3448b66a2ef (patch) | |
| tree | 892c049f6312b8fbe19221cfdfeb99163e7809a9 /include | |
| parent | a95b87eaf0df41e7d1b47cf769181fdc5841e514 (diff) | |
[PATCH] con_font_default sanitized
->con_font_default() sanitized. We copy font name (if any) from userland
in the caller and pass it explicitly. We are also beginning to get rid
of console_font_op in method arguments.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/console.h | 3 | ||||
| -rw-r--r-- | include/linux/kd.h | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 357e7711f08e..56f907bff455 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -19,6 +19,7 @@ struct vc_data; struct console_font_op; +struct console_font; struct module; /* @@ -42,7 +43,7 @@ struct consw { int (*con_blank)(struct vc_data *, int, int); int (*con_font_set)(struct vc_data *, struct console_font_op *); int (*con_font_get)(struct vc_data *, struct console_font_op *); - int (*con_font_default)(struct vc_data *, struct console_font_op *); + int (*con_font_default)(struct vc_data *, struct console_font *, char *); int (*con_font_copy)(struct vc_data *, struct console_font_op *); int (*con_resize)(struct vc_data *, unsigned int, unsigned int); int (*con_set_palette)(struct vc_data *, unsigned char *); diff --git a/include/linux/kd.h b/include/linux/kd.h index f8c48b497533..834885b8da63 100644 --- a/include/linux/kd.h +++ b/include/linux/kd.h @@ -152,6 +152,12 @@ struct console_font_op { unsigned char *data; /* font data with height fixed to 32 */ }; +struct console_font { + unsigned int width, height; /* font size */ + unsigned int charcount; + unsigned char *data; /* font data with height fixed to 32 */ +}; + #define KD_FONT_OP_SET 0 /* Set font */ #define KD_FONT_OP_GET 1 /* Get font */ #define KD_FONT_OP_SET_DEFAULT 2 /* Set font to default, data points to name / NULL */ |