On Sat, Jan 25, 2003 at 03:21:10PM -0500, Kevin Brosius wrote:
>For a previously working setup, mouse protocol auto no longer succeeds
>in configuring the mouse, however it appears not to fail either, leaving
>the server up with a non-working mouse pointer. I do not have
>'AllowMouseOpenFail' set.
Could you try the attached patch, and let me know what happens. The
2nd hunk is the important one, and the problem there resulting on only
the first character of the PnP ID string being read.
David
--
David Dawes
Release Engineer/Architect The XFree86 Project
www.XFree86.org/~dawes
Index: pnp.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/input/mouse/pnp.c,v
retrieving revision 1.14
diff -u -r1.14 pnp.c
--- pnp.c 2003/01/18 15:22:34 1.14
+++ pnp.c 2003/01/26 03:53:20
@@ -134,7 +134,7 @@
static int pnpgets(InputInfoPtr, char *, Bool *prePNP);
static int pnpparse(InputInfoPtr, pnpid_t *, char *, int);
-static Bool prepnpparse(InputInfoPtr pInfo, char *buf);
+static int prepnpparse(InputInfoPtr pInfo, char *buf);
static symtab_t *pnpproto(pnpid_t *);
static symtab_t *gettoken(symtab_t *, char *, int);
static MouseProtocolID getPs2ProtocolPnP(InputInfoPtr pInfo);
@@ -334,7 +334,7 @@
/* we haven't seen `Begin ID' in time... */
goto connect_idle;
}
- if (prePNP)
+ if (*prePNP)
return i;
++c; /* make it `End ID' */
@@ -491,7 +491,7 @@
}
/* We can only identify MS at the moment */
-static Bool
+static int
prepnpparse(InputInfoPtr pInfo, char *buf)
{
if (buf[0] == 'M' && buf[1] == '3')
