diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-03-08 04:25:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-03-08 04:25:54 -0500 |
| commit | def7102a5bd2d60b1a96a58a39846150285d7c77 (patch) | |
| tree | df0e6726c593a7e1f820a3341c627835a1c0d5ce /include/linux/console_struct.h | |
| parent | a4bc8f1c791fa542a6f0f8043b670690894bd440 (diff) | |
| parent | 09aa3367ff6a0bbff7ce35eb770aab23bc9d4213 (diff) | |
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/net-drivers-2.6
Diffstat (limited to 'include/linux/console_struct.h')
| -rw-r--r-- | include/linux/console_struct.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index 062049ca5c44..725be90ef55e 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -26,6 +26,7 @@ struct vc_data { const struct consw *vc_sw; unsigned short *vc_screenbuf; /* In-memory character/attribute buffer */ unsigned int vc_screenbuf_size; + unsigned char vc_mode; /* KD_TEXT, ... */ /* attributes for all characters on screen */ unsigned char vc_attr; /* Current attributes */ unsigned char vc_def_color; /* Default colors */ @@ -48,6 +49,11 @@ struct vc_data { unsigned int vc_state; /* Escape sequence parser state */ unsigned int vc_npar,vc_par[NPAR]; /* Parameters of current escape sequence */ struct tty_struct *vc_tty; /* TTY we are attached to */ + /* data for manual vt switching */ + struct vt_mode vt_mode; + int vt_pid; + int vt_newvt; + wait_queue_head_t paste_wait; /* mode flags */ unsigned int vc_charset : 1; /* Character set G0 / G1 */ unsigned int vc_s_charset : 1; /* Saved character set */ @@ -89,7 +95,6 @@ struct vc_data { struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg console for this display */ unsigned long vc_uni_pagedir; unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ - struct vt_struct *vc_vt; /* additional information is in vt_kern.h */ }; |