[Linuxconsole-commit]CVS: ruby/linux/drivers/input/keyboard atkbd.c,1.33,1.34 Config.help,1.2,NONE Config.in,1.3,NONE Makefile,1.5,NONE amikbd.c,1.13,NONE maple_keyb.c,1.2,NONE ps2serkbd.c,1.6,NONE sunkbd.c,1.15,NONE xtkbd.c,1.12,NONE

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/keyboard
In directory usw-pr-cvs1:/tmp/cvs-serv10580/linux/drivers/input/keyboard

Modified Files:
	atkbd.c 
Removed Files:
	Config.help Config.in Makefile amikbd.c maple_keyb.c 
	ps2serkbd.c sunkbd.c xtkbd.c 
Log Message:
Syned to 2.5.25

Index: atkbd.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/keyboard/atkbd.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- atkbd.c	12 Feb 2002 09:34:34 -0000	1.33
+++ atkbd.c	10 Jul 2002 18:08:04 -0000	1.34
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/serio.h>
+#include <linux/tqueue.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vo...@uc...>");
 MODULE_DESCRIPTION("AT and PS/2 keyboard driver");
@@ -120,14 +121,12 @@
 	struct serio *serio;
 	char name[64];
 	char phys[32];
-	struct tq_struct tq;
 	unsigned char cmdbuf[4];
 	unsigned char cmdcnt;
 	unsigned char set;
-	char release;
-	char ack;
-	char emul;
-	char error;
+	unsigned char release;
+	signed char ack;
+	unsigned char emul;
 	unsigned short id;
 };
 
@@ -161,8 +160,7 @@
 
 	switch (atkbd->keycode[code]) {
 		case ATKBD_KEY_BAT:
-			queue_task(&atkbd->tq, &tq_immediate);
-			mark_bh(IMMEDIATE_BH);
+			serio_rescan(atkbd->serio);
 			return;
 		case ATKBD_KEY_EMUL0:
 			atkbd->emul = 1;
@@ -431,21 +429,6 @@
 }
 
 /*
- * atkbd_powerup() is called when the keyboard sends the 0xaa character,
- * meaning that it was disconnected and reconnected. We close the port
- * in that case and let the upper layer find an appropriate driver for
- * the device that was connected. It may be a mouse, or a keyboard, we
- * don't know yet.
- */
-
-static void atkbd_powerup(void *data)
-{
-	struct atkbd *atkbd = data;
-	mdelay(40); /* FIXME!!! Wait some nicer way */
-	serio_rescan(atkbd->serio);
-}
-
-/*
  * atkbd_connect() is called when the serio module finds and interface
  * that isn't handled yet by an appropriate device driver. We check if
  * there is an AT keyboard out there and if yes, we register ourselves
@@ -476,9 +459,6 @@
 	atkbd->dev.event = atkbd_event;
 	atkbd->dev.private = atkbd;
 
-	atkbd->tq.routine = atkbd_powerup;
-	atkbd->tq.data = atkbd;
-
 	serio->private = atkbd;
 
 	if (serio_open(serio, dev)) {
@@ -503,7 +483,7 @@
 
 	if (atkbd->set == 4) {
 		atkbd->dev.ledbit[0] |= BIT(LED_COMPOSE) | BIT(LED_SUSPEND) | BIT(LED_SLEEP) | BIT(LED_MUTE);
-		sprintf(atkbd->name, "AT Set 2 Extended keyboard\n");
+		sprintf(atkbd->name, "AT Set 2 Extended keyboard");
 	} else
 		sprintf(atkbd->name, "AT Set %d keyboard", atkbd->set);
 

--- Config.help DELETED ---

--- Config.in DELETED ---

--- Makefile DELETED ---

--- amikbd.c DELETED ---

--- maple_keyb.c DELETED ---

--- ps2serkbd.c DELETED ---

--- sunkbd.c DELETED ---

--- xtkbd.c DELETED ---