[Linuxconsole-commit]CVS: ruby/linux/include/linux serio.h,1.21,1.22

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

Update of /cvsroot/linuxconsole/ruby/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv29027/include/linux

Modified Files:
	serio.h 
Log Message:
Vojtech's fixes.

Index: serio.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/serio.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serio.h	19 Dec 2001 05:15:21 -0000	1.21
+++ serio.h	10 Jul 2002 20:45:55 -0000	1.22
@@ -42,6 +42,7 @@
 	void *driver;
 	char *name;
 	char *phys;
+	int number;
 
 	unsigned short idbus;
 	unsigned short idvendor;
@@ -49,6 +50,7 @@
 	unsigned short idversion;
 
 	unsigned long type;
+	unsigned long event;
 
 	int (*write)(struct serio *, unsigned char);
 	int (*open)(struct serio *);
@@ -87,9 +89,14 @@
 
 static __inline__ void serio_dev_write_wakeup(struct serio *serio)
 {
-	if (serio->dev && serio->dev->write_wakeup) {
+	if (serio->dev && serio->dev->write_wakeup)
 		serio->dev->write_wakeup(serio);
-	}
+}
+
+static __inline__ void serio_interrupt(struct serio *serio, unsigned char data, unsigned int flags)
+{
+	if (serio->dev && serio->dev->interrupt) 
+		serio->dev->interrupt(serio, data, flags);
 }
 
 #define SERIO_TIMEOUT	1
@@ -122,7 +129,7 @@
 #define SERIO_H3600	0x21
 #define SERIO_PS2SER	0x22
 #define SERIO_TWIDKBD	0x23
-#define SERIO_TWIDJOY   0x24
+#define SERIO_TWIDJOY	0x24
 #define SERIO_HIL	0x25
 
 #define SERIO_ID	0xff00UL