Update of /cvsroot/linuxconsole/ruby/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv27583/linux/include/linux
Modified Files:
gameport.h input.h serio.h
Log Message:
Sync input drivers to the BK tree.
Index: gameport.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/gameport.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gameport.h 25 May 2002 20:32:04 -0000 1.21
+++ gameport.h 10 Jul 2002 22:34:00 -0000 1.22
@@ -74,7 +74,7 @@
void gameport_close(struct gameport *gameport);
void gameport_rescan(struct gameport *gameport);
-#ifdef CONFIG_INPUT_GAMEPORT
+#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
void gameport_register_port(struct gameport *gameport);
void gameport_unregister_port(struct gameport *gameport);
#else
Index: input.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/input.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- input.h 31 May 2002 10:35:49 -0000 1.68
+++ input.h 10 Jul 2002 22:34:01 -0000 1.69
@@ -507,6 +507,7 @@
#define BUS_AMIGA 0x16
#define BUS_ADB 0x17
#define BUS_I2C 0x18
+#define BUS_HOST 0x19
/*
* Values describing the status of an effect
Index: serio.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/serio.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serio.h 10 Jul 2002 20:45:55 -0000 1.22
+++ serio.h 10 Jul 2002 22:34:01 -0000 1.23
@@ -76,6 +76,7 @@
int serio_open(struct serio *serio, struct serio_dev *dev);
void serio_close(struct serio *serio);
void serio_rescan(struct serio *serio);
+void serio_interrupt(struct serio *serio, unsigned char data, unsigned int flags);
void serio_register_port(struct serio *serio);
void serio_unregister_port(struct serio *serio);
@@ -91,12 +92,6 @@
{
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
|
