Menu
▾
▴
[Linuxconsole-commit]CVS: ruby/linux/drivers/char Config.in,1.27,1.28 Makefile,1.28,1.29 sysrq.c,1.15,1.16 vt.c,1.109,1.110
|
From: James S. <jsi...@us...> - 2001-10-29 00:11:03
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv10630/drivers/char
Modified Files:
Config.in Makefile sysrq.c vt.c
Log Message:
Synced to 2.4.13
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Config.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Config.in 2001/10/15 01:13:17 1.27
+++ Config.in 2001/10/29 00:10:59 1.28
@@ -142,6 +142,7 @@
tristate ' Berkshire Products PC Watchdog' CONFIG_PCWATCHDOG
tristate ' Acquire SBC Watchdog Timer' CONFIG_ACQUIRE_WDT
tristate ' Advantech SBC Watchdog Timer' CONFIG_ADVANTECH_WDT
+ tristate ' IB700 SBC Watchdog Timer' CONFIG_IB700_WDT
tristate ' SBC-60XX Watchdog Timer' CONFIG_60XX_WDT
tristate ' W83877F (EMACS) Watchdog Timer' CONFIG_W83877F_WDT
tristate ' Mixcom Watchdog' CONFIG_MIXCOMWD
@@ -178,7 +179,7 @@
tristate 'Double Talk PC internal speech card support' CONFIG_DTLK
tristate 'Siemens R3964 line discipline' CONFIG_R3964
tristate 'Applicom intelligent fieldbus card support' CONFIG_APPLICOM
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_X86" = "y" ]; then
dep_tristate 'Sony Vaio Programmable I/O Control Device support' CONFIG_SONYPI $CONFIG_PCI
fi
@@ -206,4 +207,7 @@
if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
source drivers/char/pcmcia/Config.in
fi
+
+tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
+
endmenu
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile 2001/10/15 01:13:17 1.28
+++ Makefile 2001/10/29 00:10:59 1.29
@@ -115,6 +115,7 @@
obj-$(CONFIG_PCWATCHDOG) += pcwd.o
obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
+obj-$(CONFIG_IB700_WDT) += ib700wdt.o
obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
obj-$(CONFIG_WDT) += wdt.o
@@ -123,8 +124,13 @@
obj-$(CONFIG_977_WATCHDOG) += wdt977.o
obj-$(CONFIG_I810_TCO) += i810-tco.o
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
+obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+subdir-$(CONFIG_MWAVE) += mwave
+ifeq ($(CONFIG_MWAVE),y)
+ obj-y += mwave/mwave.o
+endif
include $(TOPDIR)/Rules.make
Index: sysrq.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/sysrq.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sysrq.c 2001/10/08 18:28:04 1.15
+++ sysrq.c 2001/10/29 00:10:59 1.16
@@ -47,13 +47,13 @@
int i;
i = key - '0';
console_loglevel = 7;
- printk("%d\n", i);
+ printk("Loglevel set to %d\n", i);
console_loglevel = i;
}
static struct sysrq_key_op sysrq_loglevel_op = {
handler: sysrq_handle_loglevel,
help_msg: "loglevel0-8",
- action_msg: "Loglevel set to ",
+ action_msg: "Changing Loglevel",
};
@@ -71,7 +71,7 @@
static struct sysrq_key_op sysrq_SAK_op = {
handler: sysrq_handle_SAK,
help_msg: "saK",
- action_msg: "SAK\n",
+ action_msg: "SAK",
};
#endif
@@ -87,7 +87,7 @@
static struct sysrq_key_op sysrq_unraw_op = {
handler: sysrq_handle_unraw,
help_msg: "unRaw",
- action_msg: "Keyboard mode set to XLATE\n",
+ action_msg: "Keyboard mode set to XLATE",
};
@@ -99,7 +99,7 @@
static struct sysrq_key_op sysrq_reboot_op = {
handler: sysrq_handle_reboot,
help_msg: "reBoot",
- action_msg: "Resetting\n",
+ action_msg: "Resetting",
};
@@ -230,7 +230,7 @@
static struct sysrq_key_op sysrq_sync_op = {
handler: sysrq_handle_sync,
help_msg: "Sync",
- action_msg: "Emergency Sync\n",
+ action_msg: "Emergency Sync",
};
static void sysrq_handle_mountro(int key, struct pt_regs *pt_regs,
@@ -241,7 +241,7 @@
static struct sysrq_key_op sysrq_mountro_op = {
handler: sysrq_handle_mountro,
help_msg: "Unmount",
- action_msg: "Emergency Remount R/0\n",
+ action_msg: "Emergency Remount R/O",
};
/* END SYNC SYSRQ HANDLERS BLOCK */
@@ -257,7 +257,7 @@
static struct sysrq_key_op sysrq_showregs_op = {
handler: sysrq_handle_showregs,
help_msg: "showPc",
- action_msg: "Show Regs\n",
+ action_msg: "Show Regs",
};
@@ -268,7 +268,7 @@
static struct sysrq_key_op sysrq_showstate_op = {
handler: sysrq_handle_showstate,
help_msg: "showTasks",
- action_msg: "Show State\n",
+ action_msg: "Show State",
};
@@ -279,7 +279,7 @@
static struct sysrq_key_op sysrq_showmem_op = {
handler: sysrq_handle_showmem,
help_msg: "showMem",
- action_msg: "Show Memory\n",
+ action_msg: "Show Memory",
};
/* SHOW SYSRQ HANDLERS BLOCK */
@@ -312,7 +312,7 @@
static struct sysrq_key_op sysrq_term_op = {
handler: sysrq_handle_term,
help_msg: "tErm",
- action_msg: "Terminate All Tasks\n",
+ action_msg: "Terminate All Tasks",
};
static void sysrq_handle_kill(int key, struct pt_regs *pt_regs,
@@ -323,7 +323,7 @@
static struct sysrq_key_op sysrq_kill_op = {
handler: sysrq_handle_kill,
help_msg: "kIll",
- action_msg: "Kill All Tasks\n",
+ action_msg: "Kill All Tasks",
};
static void sysrq_handle_killall(int key, struct pt_regs *pt_regs,
@@ -334,7 +334,7 @@
static struct sysrq_key_op sysrq_killall_op = {
handler: sysrq_handle_killall,
help_msg: "killalL",
- action_msg: "Kill All Tasks (even init)\n",
+ action_msg: "Kill All Tasks (even init)",
};
/* END SIGNAL SYSRQ HANDLERS BLOCK */
@@ -467,8 +467,9 @@
op_p = __sysrq_get_key_op(key);
if (op_p) {
- printk ("%s", op_p->action_msg);
- op_p->handler(key, pt_regs, kbd, tty);
+ printk ("%s\n", op_p->action_msg);
+ console_loglevel = orig_log_level;
+ op_p->handler(key, pt_regs, kbd, tty);
} else {
printk("HELP : ");
/* Only print the help msg once per handler */
@@ -479,8 +480,8 @@
printk ("%s ", sysrq_key_table[i]->help_msg);
}
printk ("\n");
+ console_loglevel = orig_log_level;
}
- console_loglevel = orig_log_level;
}
EXPORT_SYMBOL(handle_sysrq);
Index: vt.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/vt.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- vt.c 2001/10/05 03:58:58 1.109
+++ vt.c 2001/10/29 00:10:59 1.110
@@ -522,22 +522,30 @@
if (sw->con_invert_region)
sw->con_invert_region(vc, p, count);
else {
- u16 *q = p;
int cnt = count;
+ u16 *q = p;
+ u16 a;
if (!can_do_color) {
- while (cnt--) *q++ ^= 0x0800;
+ while (cnt--) {
+ a = scr_readw(q);
+ a ^= 0x0800;
+ scr_writew(a, q);
+ q++;
+ }
} else if (hi_font_mask == 0x100) {
while (cnt--) {
u16 a = scr_readw(q);
a = ((a) & 0x11ff) | (((a) & 0xe000) >> 4) | (((a) & 0x0e00) << 4);
- scr_writew(a, q++);
+ scr_writew(a, q);
+ q++;
}
} else {
while (cnt--) {
u16 a = scr_readw(q);
a = ((a) & 0x88ff) | (((a) & 0x7000) >> 4) | (((a) & 0x0700) << 4);
- scr_writew(a, q++);
+ scr_writew(a, q);
+ q++;
}
}
}
|
