diff options
| author | Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2008-12-16 00:09:38 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-21 14:21:15 +1100 |
| commit | 368c1e3249afe0e59097e7df664435ae55fb9f8d (patch) | |
| tree | bdcfedb358238fa0775b933f7a2393eb3c552a36 | |
| parent | 532774ec7fa396da20ca724c0cf83d93ee76622f (diff) | |
| download | blackbird-obmc-linux-368c1e3249afe0e59097e7df664435ae55fb9f8d.tar.gz blackbird-obmc-linux-368c1e3249afe0e59097e7df664435ae55fb9f8d.zip | |
hvc_console: Escape magic sysrq key
The ctrl-o (^O) is a common control key used by several applications,
such as vim, but hvc_console uses ^O as the magic-sysrq key. This
commit allows users to send ^O to applications by pressing ^O twice
in succession.
To implement this, this commit introduces a check if ^O is pressed
again if the sysrq_pressed variable is already set. In this case,
clear sysrq_pressed state and flip the ^O character to the tty. (The
old behavior has always set "sysrq_pressed" if ^O has been entered,
and it has not flipped the ^O character to the tty.)
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | drivers/char/hvc_console.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 74ecb5b2968e..fb57f67bb427 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c @@ -642,8 +642,11 @@ int hvc_poll(struct hvc_struct *hp) /* Handle the SysRq Hack */ /* XXX should support a sequence */ if (buf[i] == '\x0f') { /* ^O */ - sysrq_pressed = 1; - continue; + /* if ^O is pressed again, reset + * sysrq_pressed and flip ^O char */ + sysrq_pressed = !sysrq_pressed; + if (sysrq_pressed) + continue; } else if (sysrq_pressed) { handle_sysrq(buf[i], tty); sysrq_pressed = 0; |
