rpms/xorg-x11-drv-mouse/F-9 mouse-1.3.0-fast-ps2-commands.patch, NONE, 1.1 xorg-x11-drv-mouse.spec, 1.26, 1.27

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-mouse/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12298

Modified Files:
	xorg-x11-drv-mouse.spec 
Added Files:
	mouse-1.3.0-fast-ps2-commands.patch 
Log Message:
* Wed Apr 23 2008 Adam Jackson <ajax at redhat.com> 1.3.0-2
- mouse-1.3.0-fast-ps2-commands.patch: Disable usleep()s in ps2 packet
  writes.  Cuts ~0.3 seconds from server launch.


mouse-1.3.0-fast-ps2-commands.patch:

--- NEW FILE mouse-1.3.0-fast-ps2-commands.patch ---
diff -up xf86-input-mouse-1.3.0/src/mouse.c.jx xf86-input-mouse-1.3.0/src/mouse.c
--- xf86-input-mouse-1.3.0/src/mouse.c.jx	2008-03-20 14:55:51.000000000 -0400
+++ xf86-input-mouse-1.3.0/src/mouse.c	2008-04-23 16:58:30.000000000 -0400
@@ -2915,14 +2915,12 @@ initMouseHW(InputInfoPtr pInfo)
 	    do_ps2Reset(pInfo);
 	    if (paramlen > 0) {
 		if (!ps2SendPacket(pInfo,param,paramlen)) {
-		    usleep(30000);
 		    xf86FlushInput(pInfo->fd);
 		    if (!count--)
 			return TRUE;
 		    goto REDO;
 		}
 		ps2GetDeviceID(pInfo);
-		usleep(30000);
 		xf86FlushInput(pInfo->fd);
 	    }
 	    
@@ -2978,7 +2976,6 @@ initMouseHW(InputInfoPtr pInfo)
 			return TRUE;
 		    goto REDO;
 		}
-		usleep(30000);
 		xf86FlushInput(pInfo->fd);
 		if (!ps2EnableDataReporting(pInfo)) {
 		    xf86Msg(X_INFO, "%s: ps2EnableDataReporting: failed\n",
@@ -3002,7 +2999,6 @@ initMouseHW(InputInfoPtr pInfo)
 	    if (xf86WriteSerial(pInfo->fd, param, paramlen) != paramlen)
 		xf86Msg(X_ERROR, "%s: Mouse initialization failed\n",
 			pInfo->name);
-	    usleep(30000);
 	    xf86FlushInput(pInfo->fd);
 	}
     }
diff -up xf86-input-mouse-1.3.0/src/pnp.c.jx xf86-input-mouse-1.3.0/src/pnp.c
--- xf86-input-mouse-1.3.0/src/pnp.c.jx	2008-03-20 14:55:51.000000000 -0400
+++ xf86-input-mouse-1.3.0/src/pnp.c	2008-04-23 16:57:32.000000000 -0400
@@ -601,7 +601,6 @@ ps2SendPacket(InputInfoPtr pInfo, unsign
     for (i = 0; i < len; i++) {
 	for (j = 0; j < 10; j++) {
 	    xf86WriteSerial(pInfo->fd, bytes + i, 1);
-	    usleep(10000);
 	    if (!readMouse(pInfo,&c)) {
 #ifdef DEBUG
 		xf86ErrorF("sending 0x%x to PS/2 unsuccessful\n",*(bytes + i));
@@ -655,7 +654,6 @@ ps2GetDeviceID(InputInfoPtr pInfo)
     unsigned char u;
     unsigned char packet[] = { 0xf2 };
 
-    usleep(30000);
     xf86FlushInput(pInfo->fd);
     if (!ps2SendPacket(pInfo, packet, sizeof(packet))) 
 	return -1;


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/F-9/xorg-x11-drv-mouse.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-mouse.spec	20 Mar 2008 20:28:29 -0000	1.26
+++ xorg-x11-drv-mouse.spec	23 Apr 2008 21:20:23 -0000	1.27
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
 Version:   1.3.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,6 +13,8 @@
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+Patch0:	    mouse-1.3.0-fast-ps2-commands.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
@@ -24,6 +26,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .zoom
 
 %build
 %configure --disable-static
@@ -46,6 +49,10 @@
 %{_mandir}/man4/mousedrv.4*
 
 %changelog
+* Wed Apr 23 2008 Adam Jackson <ajax at redhat.com> 1.3.0-2
+- mouse-1.3.0-fast-ps2-commands.patch: Disable usleep()s in ps2 packet
+  writes.  Cuts ~0.3 seconds from server launch.
+
 * Thu Mar 20 2008 Adam Jackson <ajax at redhat.com> 1.3.0-1
 - mouse 1.3.0