Merge tag 'fsnotify_for_v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / include / linux / console.h

diff --git a/include/linux/console.h b/include/linux/console.h
index 75dd206..0670d34 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -24,17 +24,13 @@ struct module;
 struct tty_struct;
 struct notifier_block;
 
-/*
- * this is what the terminal answers to a ESC-Z or csi0c query.
- */
-#define VT100ID "\033[?1;2c"
-#define VT102ID "\033[?6c"
-
 enum con_scroll {
        SM_UP,
        SM_DOWN,
 };
 
+enum vc_intensity;
+
 /**
  * struct consw - callbacks for consoles
  *
@@ -74,8 +70,9 @@ struct consw {
        void    (*con_scrolldelta)(struct vc_data *vc, int lines);
        int     (*con_set_origin)(struct vc_data *vc);
        void    (*con_save_screen)(struct vc_data *vc);
-       u8      (*con_build_attr)(struct vc_data *vc, u8 color, u8 intensity,
-                       u8 blink, u8 underline, u8 reverse, u8 italic);
+       u8      (*con_build_attr)(struct vc_data *vc, u8 color,
+                       enum vc_intensity intensity,
+                       bool blink, bool underline, bool reverse, bool italic);
        void    (*con_invert_region)(struct vc_data *vc, u16 *p, int count);
        u16    *(*con_screen_pos)(struct vc_data *vc, int offset);
        unsigned long (*con_getxy)(struct vc_data *vc, unsigned long position,