Date: Sat, 07 Aug 2004 19:11:28 +0200 From: Arne Schwabe <arne@rfc2549.org> To: Peter Osterlund <petero2@telia.com> Cc: freebsd-mobile@freebsd.org Subject: Re: Synaptics Driver Patch (new Version) Message-ID: <86u0veq3en.fsf@kamino.rfc1149.org> In-Reply-To: <Pine.LNX.4.44.0404182101250.465-100000@telia.com> (Peter Osterlund's message of "Sun, 18 Apr 2004 21:05:37 %2B0200 (CEST)") References: <Pine.LNX.4.44.0404182101250.465-100000@telia.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Peter Osterlund <petero2@telia.com> writes: >> > I'll try to merge this into the XFree86 driver, but I don't want to use >> > the patch as is. I'd like to avoid #ifdef's and conditional compilation if >> > possible. My unfinished changes can be found here: >> > >> > http://w1.894.telia.com/~u89404340/syn.tar.bz2 >> >> Okay let me hear If you got something, so I can test it. > > Now I have uploaded a new version to the same URL. You should set Protocol > to "psm" in XF86Config to enable the FreeBSD psm driver protocol. > > Feedback is wanted, because I don't have a FreeBSD system to test on. I am very sorry that I did not reply. It works ;) But since the synpatics support is now in FreeBSD-current kernel, the ioctl change a little bit, patch is attached. There is no need to support the older ioctl. Arne diff -ur synaptics-0.13.4/freebsd_mouse.h synaptics-0.13.4.freebsd-current/freebsd_mouse.h --- synaptics-0.13.4/freebsd_mouse.h Mon Jul 19 22:05:17 2004 +++ synaptics-0.13.4.freebsd-current/freebsd_mouse.h Sun Aug 1 15:36:29 2004 @@ -23,11 +23,7 @@ #define MOUSE_SETVARS _IOW('M', 7, mousevar_t) #define MOUSE_READSTATE _IOWR('M', 8, mousedata_t) #define MOUSE_READDATA _IOWR('M', 9, mousedata_t) -#define MOUSE_SYNGETHWINFO _IOR('M', 10, synapticshw_t) - -#define MOUSE_SYNAPTICS_CMD _IOW('M', 10, char) -#define MOUSE_SYNAPTICS_INFO _IOW('M', 11, char) -#define MOUSE_SYNAPTICS_ENABLE_PASSTHROUGH _IOW('M', 12, char) +#define MOUSE_SYN_GETHWINFO _IOR('M', 100, synapticshw_t) typedef struct synapticshw { diff -ur synaptics-0.13.4/psmcomm.c synaptics-0.13.4.freebsd-current/psmcomm.c --- synaptics-0.13.4/psmcomm.c Mon Jul 19 22:05:17 2004 +++ synaptics-0.13.4.freebsd-current/psmcomm.c Sun Aug 1 15:41:11 2004 @@ -45,7 +45,7 @@ { int ret; - SYSCALL(ret = ioctl(fd, MOUSE_SYNGETHWINFO, ident)); + SYSCALL(ret = ioctl(fd, MOUSE_SYN_GETHWINFO , ident)); if (ret == 0) return TRUE; else -- compiling millions of tiny c-programs...done checking for a working configure script... not found
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86u0veq3en.fsf>