Menu
▾
▴
[Linuxconsole-commit]CVS: ruby/linux/drivers/char decvte.c,1.17,1.18 keyboard.c,1.70,1.71 vt.c,1.118,1.119 vt_ioctl.c,1.65,1.66
|
From: James S. <jsi...@us...> - 2002-02-20 17:49:37
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv20643/drivers/char
Modified Files:
decvte.c keyboard.c vt.c vt_ioctl.c
Log Message:
Cleanup of keyboard key macros.
Index: decvte.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/decvte.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- decvte.c 18 Aug 2001 22:20:44 -0000 1.17
+++ decvte.c 20 Feb 2002 17:49:34 -0000 1.18
@@ -493,9 +493,9 @@
if (priv4) switch(par[i]) {
case 1: /* DECCKM - Cursor keys mode */
if (on_off)
- set_vc_kbd_mode(&vc->kbd_table, VC_CKMODE);
+ set_kbd_mode(&vc->kbd_table, VC_CKMODE);
else
- clr_vc_kbd_mode(&vc->kbd_table, VC_CKMODE);
+ clr_kbd_mode(&vc->kbd_table, VC_CKMODE);
break;
case 2: /* DECANM - ANSI mode */
break;
@@ -527,9 +527,9 @@
case 8: /* DECARM - Autorepeat mode */
decarm = on_off;
if (on_off)
- set_vc_kbd_mode(&vc->kbd_table, VC_REPEAT);
+ set_kbd_mode(&vc->kbd_table, VC_REPEAT);
else
- clr_vc_kbd_mode(&vc->kbd_table, VC_REPEAT);
+ clr_kbd_mode(&vc->kbd_table, VC_REPEAT);
break;
case 9:
report_mouse = on_off ? 1 : 0;
@@ -547,9 +547,9 @@
case 66: /* DECNKM - Numeric keybad mode */
decnkm = on_off;
if (on_off)
- set_vc_kbd_mode(&vc->kbd_table, VC_APPLIC);
+ set_kbd_mode(&vc->kbd_table, VC_APPLIC);
else
- clr_vc_kbd_mode(&vc->kbd_table, VC_APPLIC);
+ clr_kbd_mode(&vc->kbd_table, VC_APPLIC);
break;
case 67: /* DECBKM - Backarrow key mode */
break;
@@ -574,9 +574,9 @@
break;
case 20: /* Lf, Enter == CrLf/Lf */
if (on_off)
- set_vc_kbd_mode(&vc->kbd_table, VC_CRLF);
+ set_kbd_mode(&vc->kbd_table, VC_CRLF);
else
- clr_vc_kbd_mode(&vc->kbd_table, VC_CRLF);
+ clr_kbd_mode(&vc->kbd_table, VC_CRLF);
break;
}
}
@@ -971,10 +971,10 @@
irm = 0; /* replace */
lnm = 0; /* line feed */
- set_vc_kbd_mode(&vc->kbd_table, VC_REPEAT);
- clr_vc_kbd_mode(&vc->kbd_table, VC_CKMODE);
- clr_vc_kbd_mode(&vc->kbd_table, VC_APPLIC);
- clr_vc_kbd_mode(&vc->kbd_table, VC_CRLF);
+ set_kbd_mode(&vc->kbd_table, VC_REPEAT);
+ clr_kbd_mode(&vc->kbd_table, VC_CKMODE);
+ clr_kbd_mode(&vc->kbd_table, VC_APPLIC);
+ clr_kbd_mode(&vc->kbd_table, VC_CRLF);
vc->kbd_table.lockstate = KBD_DEFLOCK;
vc->kbd_table.slockstate = 0;
vc->kbd_table.ledmode = LED_SHOW_FLAGS;
@@ -1098,7 +1098,7 @@
* DEC VT series processes FF as LF.
*/
vte_lf(vc);
- if (!vc_kbd_mode(&vc->kbd_table, VC_CRLF))
+ if (!get_kbd_mode(&vc->kbd_table, VC_CRLF))
return;
case 0x0d: /* CR - Carriage return */
vte_cr(vc);
@@ -1272,11 +1272,11 @@
return;
case '=': /* DECKPAM - Keypad application mode */
decnkm = 1;
- set_vc_kbd_mode(&vc->kbd_table, VC_APPLIC);
+ set_kbd_mode(&vc->kbd_table, VC_APPLIC);
return;
case '>': /* DECKPNM - Keypad numeric mode */
decnkm = 0;
- clr_vc_kbd_mode(&vc->kbd_table, VC_APPLIC);
+ clr_kbd_mode(&vc->kbd_table, VC_APPLIC);
return;
/* ===== C1 control functions ===== */
Index: keyboard.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/keyboard.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- keyboard.c 20 Feb 2002 17:45:27 -0000 1.70
+++ keyboard.c 20 Feb 2002 17:49:34 -0000 1.71
@@ -996,7 +996,7 @@
rep = (down == 2);
- if (rep && (!vc_kbd_mode(&vc->kbd_table, VC_REPEAT) || (tty &&
+ if (rep && (!get_kbd_mode(&vc->kbd_table, VC_REPEAT) || (tty &&
(!L_ECHO(tty) && tty->driver.chars_in_buffer(tty))))) {
/*
* Don't repeat a key if the input buffers are not empty and the
@@ -1030,7 +1030,7 @@
if (type == KT_LETTER) {
type = KT_LATIN;
- if (vc_kbd_led(&vc->kbd_table, VC_CAPSLOCK)) {
+ if (get_kbd_led(&vc->kbd_table, VC_CAPSLOCK)) {
key_map = key_maps[shift_final ^ (1 << KG_SHIFT)];
if (key_map)
keysym = key_map[keycode];
Index: vt.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/vt.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- vt.c 23 Jan 2002 23:21:30 -0000 1.118
+++ vt.c 20 Feb 2002 17:49:34 -0000 1.119
@@ -103,11 +103,6 @@
*/
int (*console_blank_hook)(int);
-/* keyboard macros */
-#define set_kbd(kbd_table, x) set_vc_kbd_mode(kbd_table, x)
-#define clr_kbd(kbd_table, x) clr_vc_kbd_mode(kbd_table, x)
-#define is_kbd(kbd_table, x) vc_kbd_mode(kbd_table, x)
-
/*
* Console cursor handling
*/
@@ -1292,7 +1287,7 @@
if (!tty || !vc)
return;
- set_vc_kbd_led(&vc->kbd_table, VC_SCROLLOCK);
+ set_kbd_led(&vc->kbd_table, VC_SCROLLOCK);
set_leds();
}
@@ -1305,7 +1300,7 @@
if (!tty || !vc)
return;
- clr_vc_kbd_led(&vc->kbd_table, VC_SCROLLOCK);
+ clr_kbd_led(&vc->kbd_table, VC_SCROLLOCK);
set_leds();
}
Index: vt_ioctl.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/vt_ioctl.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- vt_ioctl.c 14 Nov 2001 17:51:33 -0000 1.65
+++ vt_ioctl.c 20 Feb 2002 17:49:34 -0000 1.66
@@ -786,10 +786,10 @@
case KDSKBMETA:
switch(arg) {
case K_METABIT:
- clr_vc_kbd_mode(kbd, VC_META);
+ clr_kbd_mode(kbd, VC_META);
break;
case K_ESCPREFIX:
- set_vc_kbd_mode(kbd, VC_META);
+ set_kbd_mode(kbd, VC_META);
break;
default:
return -EINVAL;
@@ -797,7 +797,7 @@
return 0;
case KDGKBMETA:
- ucval = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
+ ucval = (get_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
setint:
return put_user(ucval, (int *)arg);
|
