diff options
| author | Alexander Viro <viro@www.linux.org.uk> | 2004-07-29 08:47:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-29 08:47:21 -0700 |
| commit | a95b87eaf0df41e7d1b47cf769181fdc5841e514 (patch) | |
| tree | 2513280a35a394bcbf468e6d01a9ed2083ec6b60 /include | |
| parent | 3c9841b90a3fa9160c30a30e53a6fdac2edb960c (diff) | |
[PATCH] con_font_op split
Preparations for cleanups: con_font_op() is turned into a switch calling
con_font_{get,set,default,copy} depending on the operation required;
method ->con_font_op() also split, with NULL resulting in -ENOSYS on
operation in question.
Code that used to be in con_font_op() got slightly cleaned up after move
into new helpers (we are beginning to untangle the mess; there will be
more cleanups in the next patches).
Methods are currently using exact same arguments as old ->con_font_op().
That will change in subsequent patches, method by method (right now there's
a hell of a scary field reuse between them, making impossible to do any
static checks and practically begging for bugs).
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 | 5 | ||||
| -rw-r--r-- | include/linux/vt_kern.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 488678c037a1..357e7711f08e 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -40,7 +40,10 @@ struct consw { void (*con_bmove)(struct vc_data *, int, int, int, int, int, int); int (*con_switch)(struct vc_data *); int (*con_blank)(struct vc_data *, int, int); - int (*con_font_op)(struct vc_data *, struct console_font_op *); + 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_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 *); int (*con_scrolldelta)(struct vc_data *, int); diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 9a559f910820..383a93cbbeeb 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h @@ -50,6 +50,10 @@ void do_unblank_screen(int leaving_gfx); void unblank_screen(void); void poke_blanked_console(void); int con_font_op(int currcons, struct console_font_op *op); +int con_font_set(int currcons, struct console_font_op *op); +int con_font_get(int currcons, struct console_font_op *op); +int con_font_default(int currcons, struct console_font_op *op); +int con_font_copy(int currcons, struct console_font_op *op); int con_set_cmap(unsigned char __user *cmap); int con_get_cmap(unsigned char __user *cmap); void scrollback(int); |