[Linuxconsole-commit]CVS: ruby/ruby-2.6/include/linux kbd_kern.h,1.1,1.2 vt_kern.h,1.1,1.2

[Aivils S. <ai...@us...>]

Update of /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv26271/ruby-2.6/include/linux

Modified Files:
	kbd_kern.h vt_kern.h 
Log Message:
multiple current tty, variable count of VC per VT, fix screenbuf kmalloced, dummy console configurable, fix dead code.

Index: kbd_kern.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/kbd_kern.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kbd_kern.h	11 Aug 2003 16:26:46 -0000	1.1
+++ kbd_kern.h	12 Sep 2003 08:33:21 -0000	1.2
@@ -96,54 +96,54 @@
 	tasklet_schedule(&keyboard_tasklet);
 }
 
-static inline int get_kbd_mode(struct kbd_struct kbd, int flag)
+static inline int get_kbd_mode(struct kbd_struct * kbd, int flag)
 {
-	return ((kbd.modeflags >> flag) & 1);
+	return ((kbd->modeflags >> flag) & 1);
 }
 
-static inline int get_kbd_led(struct kbd_struct kbd, int flag)
+static inline int get_kbd_led(struct kbd_struct * kbd, int flag)
 {
-	return ((kbd.ledflagstate >> flag) & 1);
+	return ((kbd->ledflagstate >> flag) & 1);
 }
 
-static inline void set_kbd_mode(struct kbd_struct kbd, int flag)
+static inline void set_kbd_mode(struct kbd_struct * kbd, int flag)
 {
-	kbd.modeflags |= 1 << flag;
+	kbd->modeflags |= 1 << flag;
 }
 
-static inline void set_kbd_led(struct kbd_struct kbd, int flag)
+static inline void set_kbd_led(struct kbd_struct * kbd, int flag)
 {
-	kbd.ledflagstate |= 1 << flag;
+	kbd->ledflagstate |= 1 << flag;
 }
 
-static inline void clr_kbd_mode(struct kbd_struct kbd, int flag)
+static inline void clr_kbd_mode(struct kbd_struct * kbd, int flag)
 {
-	kbd.modeflags &= ~(1 << flag);
+	kbd->modeflags &= ~(1 << flag);
 }
 
-static inline void clr_kbd_led(struct kbd_struct kbd, int flag)
+static inline void clr_kbd_led(struct kbd_struct * kbd, int flag)
 {
-	kbd.ledflagstate &= ~(1 << flag);
+	kbd->ledflagstate &= ~(1 << flag);
 }
 
-static inline void chg_kbd_lock(struct kbd_struct kbd, int flag)
+static inline void chg_kbd_lock(struct kbd_struct * kbd, int flag)
 {
-	kbd.lockstate ^= 1 << flag;
+	kbd->lockstate ^= 1 << flag;
 }
 
-static inline void chg_kbd_slock(struct kbd_struct kbd, int flag)
+static inline void chg_kbd_slock(struct kbd_struct * kbd, int flag)
 {
-	kbd.slockstate ^= 1 << flag;
+	kbd->slockstate ^= 1 << flag;
 }
 
-static inline void chg_kbd_mode(struct kbd_struct kbd, int flag)
+static inline void chg_kbd_mode(struct kbd_struct * kbd, int flag)
 {
-	kbd.modeflags ^= 1 << flag;
+	kbd->modeflags ^= 1 << flag;
 }
 
-static inline void chg_kbd_led(struct kbd_struct kbd, int flag)
+static inline void chg_kbd_led(struct kbd_struct * kbd, int flag)
 {
-	kbd.ledflagstate ^= 1 << flag;
+	kbd->ledflagstate ^= 1 << flag;
 }
 
 #define U(x) ((x) ^ 0xf000)

Index: vt_kern.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/vt_kern.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vt_kern.h	11 Aug 2003 16:26:46 -0000	1.1
+++ vt_kern.h	12 Sep 2003 08:33:21 -0000	1.2
@@ -142,6 +142,7 @@
 	unsigned int vc_need_wrap:1;
 	unsigned int vc_can_do_color:1;
 	unsigned int vc_report_mouse:2;
+        unsigned int vc_kmalloced:1;
 	unsigned char vc_utf:1;		/* Unicode UTF-8 encoding */
 	unsigned char vc_utf_count;
 	int vc_utf_char;
@@ -214,7 +215,7 @@
 	struct vc_data *want_vc;	/* VC we want to switch to */
 	int scrollback_delta;
 	int cursor_original;
-	char kmalloced;		/* Did we use kmalloced ? */
+	char vt_kmalloced;		/* Did we use kmalloced ? */
 	char vt_dont_switch;	/* VC switching flag */
 	char vt_blanked;	/* Is this display blanked */
 	int blank_mode;		/* 0:none 1:suspendV 2:suspendH 3:powerdown */
@@ -238,6 +239,7 @@
 	struct input_handle *beeper;	/* Bell noise support */
 	void *data_hook;		/* Hook for driver data */	
 	unsigned int first_vc;
+	unsigned int vc_count;
 	struct vc_data *vc_cons[MAX_NR_USER_CONSOLES];	/* VT's VC pool */
 	struct vt_struct *next;
 };
@@ -255,7 +257,7 @@
 void terminal_emulation(struct tty_struct *tty, int c);
 
 /* vt.c */
-const char *vt_map_display(struct vt_struct *vt, int init);
+const char *vt_map_display(struct vt_struct *vt, int init, int vc_count);
 void vt_map_input(struct vt_struct *vt);
 struct vc_data *find_vc(int currcons);
 struct vc_data *vc_allocate(unsigned int console);
@@ -288,7 +290,8 @@
 inline int resize_screen(struct vc_data *vc, int width, int height);
 inline unsigned short *screenpos(struct vc_data *vc, int offset, int viewed);
 inline void save_screen(struct vc_data *vc);
-void do_blank_screen(int gfx_mode);
+void do_blank_screen(struct vt_struct *vt, int gfx_mode);
+void unblank_vt(struct vt_struct *vt);
 void unblank_screen(void);
 void poke_blanked_console(struct vt_struct *vt);
 int con_font_op(struct vc_data *vc, struct console_font_op *op);