patch-2.3.99-pre6 linux/drivers/usb/mousedev.c

• Lines: 39
• Date: Fri Apr 21 13:22:59 2000
• Orig file: v2.3.99-pre5/linux/drivers/usb/mousedev.c
• Orig date: Tue Apr 11 15:09:20 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/usb/mousedev.c linux/drivers/usb/mousedev.c
@@ -39,11 +39,11 @@
 #include <linux/input.h>
 #include <linux/config.h>
 
-#ifndef CONFIG_MOUSEDEV_SCREEN_X
-#define CONFIG_MOUSEDEV_SCREEN_X	1024
+#ifndef CONFIG_INPUT_MOUSEDEV_SCREEN_X
+#define CONFIG_INPUT_MOUSEDEV_SCREEN_X	1024
 #endif
-#ifndef CONFIG_MOUSEDEV_SCREEN_Y
-#define CONFIG_MOUSEDEV_SCREEN_Y	768
+#ifndef CONFIG_INPUT_MOUSEDEV_SCREEN_Y
+#define CONFIG_INPUT_MOUSEDEV_SCREEN_Y	768
 #endif
 
 struct mousedev {
@@ -93,12 +93,12 @@
 					switch (code) {
 						case ABS_X:	
 							size = handle->dev->absmax[ABS_X] - handle->dev->absmin[ABS_X];
-							list->dx += (value * CONFIG_MOUSEDEV_SCREEN_X - list->oldx) / size;
+							list->dx += (value * CONFIG_INPUT_MOUSEDEV_SCREEN_X - list->oldx) / size;
 							list->oldx += list->dx * size;
 							break;
 						case ABS_Y:
 							size = handle->dev->absmax[ABS_Y] - handle->dev->absmin[ABS_Y];
-							list->dy -= (value * CONFIG_MOUSEDEV_SCREEN_Y - list->oldy) / size;
+							list->dy -= (value * CONFIG_INPUT_MOUSEDEV_SCREEN_Y - list->oldy) / size;
 							list->oldy -= list->dy * size;
 							break;
 					}
@@ -365,6 +365,7 @@
 	return count;	
 }
 
+/* No kernel lock - fine */
 static unsigned int mousedev_poll(struct file *file, poll_table *wait)
 {
 	struct mousedev_list *list = file->private_data;