patch-2.1.23 linux/drivers/char/busmouse.c

• Lines: 38
• Date: Sun Jan 26 12:07:14 1997
• Orig file: v2.1.22/linux/drivers/char/busmouse.c
• Orig date: Tue Oct 29 19:58:05 1996

diff -u --recursive --new-file v2.1.22/linux/drivers/char/busmouse.c linux/drivers/char/busmouse.c
@@ -41,6 +41,7 @@
 #include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
+#include <linux/poll.h>
 #include <linux/miscdevice.h>
 #include <linux/random.h>
 #include <linux/delay.h>
@@ -216,15 +217,13 @@
 }
 
 /*
- * select for mouse input
+ * poll for mouse input
  */
-static int mouse_select(struct inode *inode, struct file *file, int sel_type, select_table * wait)
+static unsigned int mouse_poll(struct file *file, poll_table * wait)
 {
-	if (sel_type == SEL_IN) {
-	    	if (mouse.ready)
-			return 1;
-		select_wait(&mouse.wait, wait);
-    	}
+	poll_wait(&mouse.wait, wait);
+	if (mouse.ready)
+		return POLLIN | POLLRDNORM;
 	return 0;
 }
 
@@ -233,7 +232,7 @@
 	read_mouse,
 	write_mouse,
 	NULL, 		/* mouse_readdir */
-	mouse_select, 	/* mouse_select */
+	mouse_poll, 	/* mouse_poll */
 	NULL, 		/* mouse_ioctl */
 	NULL,		/* mouse_mmap */
 	open_mouse,