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

Next file: linux/drivers/char/selection.h
Previous file: linux/drivers/char/apm_bios.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.58/linux/drivers/char/busmouse.c linux/drivers/char/busmouse.c
@@ -65,7 +65,6 @@
 	char dx, dy;
 	unsigned char buttons;
 
-	MSE_INT_OFF();
 	outb(MSE_READ_X_LOW, MSE_CONTROL_PORT);
 	dx = (inb(MSE_DATA_PORT) & 0xf);
 	outb(MSE_READ_X_HIGH, MSE_CONTROL_PORT);
@@ -171,6 +170,7 @@
 	int dx;
 	int dy;
 	unsigned char buttons; 
+	/* long flags; */
 
 	if (count < 3)
 		return -EINVAL;
@@ -186,7 +186,8 @@
 	 * so paging in put_user() does not effect mouse tracking.
 	 */
 
-	MSE_INT_OFF();
+	/* save_flags(flags); cli(); */
+	disable_irq(mouse_irq);
 	dx = mouse.dx;
 	dy = mouse.dy;
 	if (dx < -127)
@@ -201,7 +202,8 @@
 	mouse.dx -= dx;
 	mouse.dy -= dy;
 	mouse.ready = 0;
-	MSE_INT_ON();
+	enable_irq(mouse_irq);
+	/* restore_flags(flags); */
 
 	put_user(buttons | 0x80, buffer);
 	put_user((char)dx, buffer + 1);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this