patch-2.1.111 linux/include/linux/console.h

Next file: linux/include/linux/console_struct.h
Previous file: linux/include/linux/ax25.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.110/linux/include/linux/console.h linux/include/linux/console.h
@@ -15,6 +15,7 @@
 #define _LINUX_CONSOLE_H_ 1
 
 struct vc_data;
+struct console_font_op;
 
 /*
  * this is what the terminal answers to a ESC-Z or csi0c query.
@@ -22,8 +23,6 @@
 #define VT100ID "\033[?1;2c"
 #define VT102ID "\033[?6c"
 
-/* DPC: 1994-04-13 !!! con_putcs is new entry !!! */
-
 struct consw {
 	const char *(*con_startup)(void);
 	void	(*con_init)(struct vc_data *, int);
@@ -36,12 +35,13 @@
 	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	(*con_get_font)(struct vc_data *, int *, int *, char *);
-	int	(*con_set_font)(struct vc_data *, int, int, char *);
+	int	(*con_font_op)(struct vc_data *, struct console_font_op *);
 	int	(*con_set_palette)(struct vc_data *, unsigned char *);
 	int	(*con_scrolldelta)(struct vc_data *, int);
 	int	(*con_set_origin)(struct vc_data *);
 	void	(*con_save_screen)(struct vc_data *);
+	u8	(*con_build_attr)(struct vc_data *, u8, u8, u8, u8, u8);
+	void	(*con_invert_region)(struct vc_data *, u16 *, int);
 };
 
 extern struct consw *conswitchp;
@@ -108,10 +108,10 @@
 extern int unregister_console(struct console *);
 extern struct console *console_drivers;
 
-/* VEA Blanking Levels */
+/* VESA Blanking Levels */
 #define VESA_NO_BLANKING        0
 #define VESA_VSYNC_SUSPEND      1
 #define VESA_HSYNC_SUSPEND      2
 #define VESA_POWERDOWN          3
 
-#endif /* linux/console.h */
+#endif /* _LINUX_CONSOLE_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov