Update of /cvsroot/linux-vax/kernel-2.5/drivers/input/mouse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5313
Modified Files:
vsxxxaa.c
Log Message:
- Compiles.
- Not yet tested. (I'd update my PeeCee -- I use this driver there for
everyday's use...)
Index: vsxxxaa.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/input/mouse/vsxxxaa.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- vsxxxaa.c 25 Aug 2004 13:36:13 -0000 1.23
+++ vsxxxaa.c 18 Nov 2004 20:41:47 -0000 1.24
@@ -85,8 +85,10 @@
#include <linux/serio.h>
#include <linux/init.h>
+#define DRIVER_DESC "Driver for DEC VSXXX-AA and -GA mice and VSXXX-AB tablet"
+
MODULE_AUTHOR ("Jan-Benedict Glaw <jb...@lu...>");
-MODULE_DESCRIPTION ("Driver for DEC VSXXX-AA and -GA mice and VSXXX-AB tablet");
+MODULE_DESCRIPTION (DRIVER_DESC);
MODULE_LICENSE ("GPL");
#undef VSXXXAA_DEBUG
@@ -407,7 +409,7 @@
* data...) will get shifted out of the buffer after some
* activity on the mouse.
*/
- while (mouse->count > 0 && !IS_HDR_BYTE(buf[0])) {
+ while (mouse->count > 0 && !IS_HDR_BYTE (buf[0])) {
printk (KERN_ERR "%s on %s: Dropping a byte to regain "
"sync with mouse data stream...\n",
mouse->name, mouse->phys);
@@ -487,7 +489,7 @@
}
static void
-vsxxxaa_connect (struct serio *serio, struct serio_dev *dev)
+vsxxxaa_connect (struct serio *serio, struct serio_driver *dev)
{
struct vsxxxaa *mouse;
@@ -545,23 +547,27 @@
printk (KERN_INFO "input: %s on %s\n", mouse->name, mouse->phys);
}
-static struct serio_dev vsxxxaa_dev = {
- .connect = vsxxxaa_connect,
- .interrupt = vsxxxaa_interrupt,
- .disconnect = vsxxxaa_disconnect,
+static struct serio_driver vsxxxaa_drv = {
+ .driver = {
+ .name = "vsxxxaa",
+ },
+ .description = DRIVER_DESC,
+ .connect = vsxxxaa_connect,
+ .interrupt = vsxxxaa_interrupt,
+ .disconnect = vsxxxaa_disconnect,
};
int __init
vsxxxaa_init (void)
{
- serio_register_device (&vsxxxaa_dev);
+ serio_register_driver (&vsxxxaa_drv);
return 0;
}
void __exit
vsxxxaa_exit (void)
{
- serio_unregister_device (&vsxxxaa_dev);
+ serio_unregister_driver (&vsxxxaa_drv);
}
module_init (vsxxxaa_init);
|
