diff options
| -rw-r--r-- | include/linux/console.h | 58 |
1 files changed, 32 insertions, 26 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index b8920a031a3e..dfd6b0e97855 100644 --- a/include/linux/console.h +++ b/include/linux/console.h | |||
| @@ -46,46 +46,52 @@ enum con_scroll { | |||
| 46 | struct consw { | 46 | struct consw { |
| 47 | struct module *owner; | 47 | struct module *owner; |
| 48 | const char *(*con_startup)(void); | 48 | const char *(*con_startup)(void); |
| 49 | void (*con_init)(struct vc_data *, int); | 49 | void (*con_init)(struct vc_data *vc, int init); |
| 50 | void (*con_deinit)(struct vc_data *); | 50 | void (*con_deinit)(struct vc_data *vc); |
| 51 | void (*con_clear)(struct vc_data *, int, int, int, int); | 51 | void (*con_clear)(struct vc_data *vc, int sy, int sx, int height, |
| 52 | void (*con_putc)(struct vc_data *, int, int, int); | 52 | int width); |
| 53 | void (*con_putcs)(struct vc_data *, const unsigned short *, int, int, int); | 53 | void (*con_putc)(struct vc_data *vc, int c, int ypos, int xpos); |
| 54 | void (*con_cursor)(struct vc_data *, int); | 54 | void (*con_putcs)(struct vc_data *vc, const unsigned short *s, |
| 55 | bool (*con_scroll)(struct vc_data *, unsigned int top, | 55 | int count, int ypos, int xpos); |
| 56 | void (*con_cursor)(struct vc_data *vc, int mode); | ||
| 57 | bool (*con_scroll)(struct vc_data *vc, unsigned int top, | ||
| 56 | unsigned int bottom, enum con_scroll dir, | 58 | unsigned int bottom, enum con_scroll dir, |
| 57 | unsigned int lines); | 59 | unsigned int lines); |
| 58 | int (*con_switch)(struct vc_data *); | 60 | int (*con_switch)(struct vc_data *vc); |
| 59 | int (*con_blank)(struct vc_data *, int, int); | 61 | int (*con_blank)(struct vc_data *vc, int blank, int mode_switch); |
| 60 | int (*con_font_set)(struct vc_data *, struct console_font *, unsigned); | 62 | int (*con_font_set)(struct vc_data *vc, struct console_font *font, |
| 61 | int (*con_font_get)(struct vc_data *, struct console_font *); | 63 | unsigned int flags); |
| 62 | int (*con_font_default)(struct vc_data *, struct console_font *, char *); | 64 | int (*con_font_get)(struct vc_data *vc, struct console_font *font); |
| 63 | int (*con_font_copy)(struct vc_data *, int); | 65 | int (*con_font_default)(struct vc_data *vc, |
| 64 | int (*con_resize)(struct vc_data *, unsigned int, unsigned int, | 66 | struct console_font *font, char *name); |
| 65 | unsigned int); | 67 | int (*con_font_copy)(struct vc_data *vc, int con); |
| 66 | void (*con_set_palette)(struct vc_data *, | 68 | int (*con_resize)(struct vc_data *vc, unsigned int width, |
| 69 | unsigned int height, unsigned int user); | ||
| 70 | void (*con_set_palette)(struct vc_data *vc, | ||
| 67 | const unsigned char *table); | 71 | const unsigned char *table); |
| 68 | void (*con_scrolldelta)(struct vc_data *, int lines); | 72 | void (*con_scrolldelta)(struct vc_data *vc, int lines); |
| 69 | int (*con_set_origin)(struct vc_data *); | 73 | int (*con_set_origin)(struct vc_data *vc); |
| 70 | void (*con_save_screen)(struct vc_data *); | 74 | void (*con_save_screen)(struct vc_data *vc); |
| 71 | u8 (*con_build_attr)(struct vc_data *, u8, u8, u8, u8, u8, u8); | 75 | u8 (*con_build_attr)(struct vc_data *vc, u8 color, u8 intensity, |
| 72 | void (*con_invert_region)(struct vc_data *, u16 *, int); | 76 | u8 blink, u8 underline, u8 reverse, u8 italic); |
| 73 | u16 *(*con_screen_pos)(struct vc_data *, int); | 77 | void (*con_invert_region)(struct vc_data *vc, u16 *p, int count); |
| 74 | unsigned long (*con_getxy)(struct vc_data *, unsigned long, int *, int *); | 78 | u16 *(*con_screen_pos)(struct vc_data *vc, int offset); |
| 79 | unsigned long (*con_getxy)(struct vc_data *vc, unsigned long position, | ||
| 80 | int *px, int *py); | ||
| 75 | /* | 81 | /* |
| 76 | * Flush the video console driver's scrollback buffer | 82 | * Flush the video console driver's scrollback buffer |
| 77 | */ | 83 | */ |
| 78 | void (*con_flush_scrollback)(struct vc_data *); | 84 | void (*con_flush_scrollback)(struct vc_data *vc); |
| 79 | /* | 85 | /* |
| 80 | * Prepare the console for the debugger. This includes, but is not | 86 | * Prepare the console for the debugger. This includes, but is not |
| 81 | * limited to, unblanking the console, loading an appropriate | 87 | * limited to, unblanking the console, loading an appropriate |
| 82 | * palette, and allowing debugger generated output. | 88 | * palette, and allowing debugger generated output. |
| 83 | */ | 89 | */ |
| 84 | int (*con_debug_enter)(struct vc_data *); | 90 | int (*con_debug_enter)(struct vc_data *vc); |
| 85 | /* | 91 | /* |
| 86 | * Restore the console to its pre-debug state as closely as possible. | 92 | * Restore the console to its pre-debug state as closely as possible. |
| 87 | */ | 93 | */ |
| 88 | int (*con_debug_leave)(struct vc_data *); | 94 | int (*con_debug_leave)(struct vc_data *vc); |
| 89 | }; | 95 | }; |
| 90 | 96 | ||
| 91 | extern const struct consw *conswitchp; | 97 | extern const struct consw *conswitchp; |