patch-2.3.13 linux/drivers/char/adbmouse.c

• Lines: 344
• Date: Mon Aug 2 09:54:29 1999
• Orig file: v2.3.12/linux/drivers/char/adbmouse.c
• Orig date: Wed Jul 21 15:46:48 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/char/adbmouse.c linux/drivers/char/adbmouse.c
@@ -21,6 +21,9 @@
  * 1996/02/11 Andreas Schwab
  * Module support
  * Allow multiple open's
+ *
+ * Converted to use new generic busmouse code.  11 July 1998
+ *   Russell King <rmk@arm.uk.linux.org>
  */
 
 #include <linux/module.h>
@@ -34,7 +37,6 @@
 #include <linux/init.h>
 
 #include <asm/adb_mouse.h>
-#include <asm/uaccess.h>
 #ifdef __powerpc__
 #include <asm/processor.h>
 #endif
@@ -42,227 +44,129 @@
 #include <asm/setup.h>
 #endif
 
-static struct mouse_status mouse;
+#include "busmouse.h"
+
+static int msedev;
 static unsigned char adb_mouse_buttons[16];
 
 extern void (*adb_mouse_interrupt_hook)(unsigned char *, int);
 extern int adb_emulate_buttons;
 extern int adb_button2_keycode;
 extern int adb_button3_keycode;
-
 extern int console_loglevel;
 
 /*
- *	XXX: need to figure out what ADB mouse packets mean ... 
- *	This is the stuff stolen from the Atari driver ...
+ *    XXX: need to figure out what ADB mouse packets mean ... 
+ *      This is the stuff stolen from the Atari driver ...
  */
 static void adb_mouse_interrupt(unsigned char *buf, int nb)
 {
-    int buttons, id;
+	int buttons, id;
+	char dx, dy;
 
-/*
-    Handler 1 -- 100cpi original Apple mouse protocol.
-    Handler 2 -- 200cpi original Apple mouse protocol.
+	/*
+	   Handler 1 -- 100cpi original Apple mouse protocol.
+	   Handler 2 -- 200cpi original Apple mouse protocol.
 
-    For Apple's standard one-button mouse protocol the data array will
-    contain the following values:
+	   For Apple's standard one-button mouse protocol the data array will
+	   contain the following values:
 
-                BITS    COMMENTS
-    data[0] = dddd 1100 ADB command: Talk, register 0, for device dddd.
-    data[1] = bxxx xxxx First button and x-axis motion.
-    data[2] = byyy yyyy Second button and y-axis motion.
-
-    Handler 4 -- Apple Extended mouse protocol.
-
-    For Apple's 3-button mouse protocol the data array will contain the
-    following values:
-
-		BITS    COMMENTS
-    data[0] = dddd 1100 ADB command: Talk, register 0, for device dddd.
-    data[1] = bxxx xxxx Left button and x-axis motion.
-    data[2] = byyy yyyy Second button and y-axis motion.
-    data[3] = byyy bxxx Third button and fourth button.  
-    	      Y is additional high bits of y-axis motion.  
-    	      X is additional high bits of x-axis motion.
-
-    This procedure also gets called from the keyboard code if we
-    are emulating mouse buttons with keys.  In this case data[0] == 0
-    (data[0] cannot be 0 for a real ADB packet).
-
-    'buttons' here means 'button down' states!
-    Button 1 (left)  : bit 2, busmouse button 3
-    Button 2 (middle): bit 1, busmouse button 2
-    Button 3 (right) : bit 0, busmouse button 1
-*/
-
-    /* x/y and buttons swapped */
-    
-    if (console_loglevel >= 8)
-	printk("KERN_DEBUG adb_mouse: %s data; ", buf[0]? "real": "fake"); 
-
-    id = (buf[0] >> 4) & 0xf;
-    buttons = adb_mouse_buttons[id];
-
-    /* button 1 (left, bit 2) */
-    buttons = (buttons&3) | (buf[1] & 0x80 ? 4 : 0); /* 1+2 unchanged */
-
-    /* button 2 (middle) */
-    buttons = (buttons&5) | (buf[2] & 0x80 ? 2 : 0); /* 2+3 unchanged */
-
-    /* button 3 (right) present?
-     *  on a logitech mouseman, the right and mid buttons sometimes behave
-     *  strangely until they both have been pressed after booting. */
-    /* data valid only if extended mouse format ! */
-    if (nb >= 4)
-	buttons = (buttons&6) | (buf[3] & 0x80 ? 1 : 0); /* 1+3 unchanged */
-
-    add_mouse_randomness(((~buttons&7) << 16) + ((buf[2]&0x7f) << 8) + (buf[1]&0x7f));
-
-    adb_mouse_buttons[id] = buttons;
-    /* a button is down if it is down on any mouse */
-    for (id = 0; id < 16; ++id)
-	buttons &= adb_mouse_buttons[id];
-
-    mouse.buttons = buttons;
-    mouse.dx += ((buf[2]&0x7f) < 64 ? (buf[2]&0x7f) : (buf[2]&0x7f)-128 );
-    mouse.dy -= ((buf[1]&0x7f) < 64 ? (buf[1]&0x7f) : (buf[1]&0x7f)-128 );
-
-    if (console_loglevel >= 8)
-        printk(" %X %X %X buttons %x dx %d dy %d \n", 
-               buf[1], buf[2], buf[3], mouse.buttons, mouse.dx, mouse.dy);
- 
-    mouse.ready = 1;
-    wake_up_interruptible(&mouse.wait);
-    if (mouse.fasyncptr)
-	kill_fasync(mouse.fasyncptr, SIGIO);
-}
+		       BITS    COMMENTS
+	   data[0] = dddd 1100 ADB command: Talk, register 0, for device dddd.
+	   data[1] = bxxx xxxx First button and x-axis motion.
+	   data[2] = byyy yyyy Second button and y-axis motion.
 
-static int fasync_mouse(int fd, struct file *filp, int on)
-{
-	int retval;
+	   Handler 4 -- Apple Extended mouse protocol.
 
-	retval = fasync_helper(fd, filp, on, &mouse.fasyncptr);
-	if (retval < 0)
-		return retval;
-	return 0;
-}
+	   For Apple's 3-button mouse protocol the data array will contain the
+	   following values:
 
-static int release_mouse(struct inode *inode, struct file *file)
-{
-    fasync_mouse(-1, file, 0);
-    if (--mouse.active)
-      return 0;
-
-    adb_mouse_interrupt_hook = NULL;
-    MOD_DEC_USE_COUNT;
-    return 0;
-}
+		       BITS    COMMENTS
+	   data[0] = dddd 1100 ADB command: Talk, register 0, for device dddd.
+	   data[1] = bxxx xxxx Left button and x-axis motion.
+	   data[2] = byyy yyyy Second button and y-axis motion.
+	   data[3] = byyy bxxx Third button and fourth button.  
+		   Y is additiona. high bits of y-axis motion.  
+		   X is additional high bits of x-axis motion.
 
-static int open_mouse(struct inode *inode, struct file *file)
-{
-    int id;
+	   'buttons' here means 'button down' states!
+	   Button 1 (left)  : bit 2, busmouse button 3
+	   Button 2 (right) : bit 0, busmouse button 1
+	   Button 3 (middle): bit 1, busmouse button 2
+	 */
 
-    if (mouse.active++)
-	return 0;
-	
-    mouse.ready = 0;
+	/* x/y and buttons swapped */
 
-    mouse.dx = mouse.dy = 0;
-    for (id = 0; id < 16; ++id)
-	adb_mouse_buttons[id] = 7;	/* all buttons up */
-    MOD_INC_USE_COUNT;
-    adb_mouse_interrupt_hook = adb_mouse_interrupt;
-    return 0;
-}
+	id = (buf[0] >> 4) & 0xf;
 
-static ssize_t write_mouse(struct file *file, const char *buffer,
-			   size_t count, loff_t *ppos)
-{
-    return -EINVAL;
-}
+	buttons = adb_mouse_buttons[id];
 
-static ssize_t read_mouse(struct file *file, char *buffer, size_t count,
-			  loff_t *ppos)
-{
-    int dx, dy, buttons;
+	/* button 1 (left, bit 2) */
+	buttons = (buttons & 3) | (buf[1] & 0x80 ? 4 : 0); /* 1+2 unchanged */
+
+	/* button 2 (middle) */
+	buttons = (buttons & 5) | (buf[2] & 0x80 ? 2 : 0); /* 2+3 unchanged */
 
-    if (count < 3)
-	return -EINVAL;
-    if (!mouse.ready)
-	return -EAGAIN;
-    dx = mouse.dx;
-    dy = mouse.dy;
-    buttons = mouse.buttons;
-    if (dx > 127)
-	dx = 127;
-    else if (dx < -128)
-	dx = -128;
-    if (dy > 127)
-	dy = 127;
-    else if (dy < -128)
-	dy = -128;
-    mouse.dx -= dx;
-    mouse.dy -= dy;
-    if (mouse.dx == 0 && mouse.dy == 0)
-	mouse.ready = 0;
-    if (put_user(buttons | 0x80, buffer++) ||
-	put_user((char) dx, buffer++) ||
-	put_user((char) dy, buffer++))
-	return -EFAULT;
-    if (count > 3)
-	if (clear_user(buffer, count - 3))
-	    return -EFAULT;
-    return count;
+	/* button 3 (right) present?
+	 *  on a logitech mouseman, the right and mid buttons sometimes behave
+	 *  strangely until they both have been pressed after booting. */
+	/* data valid only if extended mouse format ! */
+	if (nb >= 4)
+		buttons = (buttons & 6) | (buf[3] & 0x80 ? 1 : 0); /* 1+3 unchanged */
+
+	adb_mouse_buttons[id] = buttons;
+
+	/* a button is down if it is down on any mouse */
+	for (id = 0; id < 16; ++id)
+		buttons &= adb_mouse_buttons[id];
+
+	dx = ((buf[2] & 0x7f) < 64 ? (buf[2] & 0x7f) : (buf[2] & 0x7f) - 128);
+	dy = ((buf[1] & 0x7f) < 64 ? (buf[1] & 0x7f) : (buf[1] & 0x7f) - 128);
+	busmouse_add_movementbuttons(msedev, dx, -dy, buttons);
+
+	if (console_loglevel >= 8)
+		printk(" %X %X %X dx %d dy %d \n",
+		       buf[1], buf[2], buf[3], dx, dy);
 }
 
-static unsigned int mouse_poll(struct file *file, poll_table *wait)
+static int release_mouse(struct inode *inode, struct file *file)
 {
-	poll_wait(file, &mouse.wait, wait);
-	if (mouse.ready)
-		return POLLIN | POLLRDNORM;
+	adb_mouse_interrupt_hook = NULL;
+	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
-struct file_operations adb_mouse_fops = {
-    NULL,		/* mouse_seek */
-    read_mouse,
-    write_mouse,
-    NULL,		/* mouse_readdir */
-    mouse_poll,
-    NULL,		/* mouse_ioctl */
-    NULL,		/* mouse_mmap */
-    open_mouse,
-    NULL,		/* flush */
-    release_mouse,
-    NULL,
-    fasync_mouse,
-};
-
-#define ADB_MOUSE_MINOR	10
+static int open_mouse(struct inode *inode, struct file *file)
+{
+	MOD_INC_USE_COUNT;
+	adb_mouse_interrupt_hook = adb_mouse_interrupt;
+	return 0;
+}
 
-static struct miscdevice adb_mouse = {
-    ADB_MOUSE_MINOR, "adbmouse", &adb_mouse_fops
+static struct busmouse adb_mouse =
+{
+	ADB_MOUSE_MINOR, "adbmouse", open_mouse, close_mouse, 7
 };
 
 __initfunc(int adb_mouse_init(void))
 {
-    mouse.active = 0;
-    mouse.ready = 0;
-    init_waitqueue_head(&mouse.wait);
-
 #ifdef __powerpc__
-    if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )
-	    return -ENODEV;
+	if ((_machine != _MACH_chrp) && (_machine != _MACH_Pmac))
+		return -ENODEV;
 #endif
 #ifdef __mc68000__
-    if (!MACH_IS_MAC)
-	return -ENODEV;
+	if (!MACH_IS_MAC)
+		return -ENODEV;
 #endif
-    printk(KERN_INFO "Macintosh ADB mouse driver installed.\n");
-    misc_register(&adb_mouse);
-    return 0;
-}
 
+	msedev = register_busmouse(&adb_mouse);
+	if (msedev < 0)
+		printk(KERN_WARNING "Unable to register ADB mouse driver.\n");
+	else
+		printk(KERN_INFO "Macintosh ADB mouse driver installed.\n");
+
+	return msedev < 0 ? msedev : 0;
+}
 
 /*
  * XXX this function is misnamed.
@@ -286,11 +190,12 @@
 
 int init_module(void)
 {
-    return adb_mouse_init();
+	return adb_mouse_init();
 }
 
 void cleanup_module(void)
 {
-    misc_deregister(&adb_mouse);
+	unregister_busmouse(msedev);
 }
+
 #endif