From owner-freebsd-mobile@FreeBSD.ORG Sat Aug 7 17:11:38 2004 Return-Path: Delivered-To: freebsd-mobile@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0796616A4CE; Sat, 7 Aug 2004 17:11:38 +0000 (GMT) Received: from coruscant.rfc1149.org (coruscant.rfc1149.org [217.160.130.147]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65FA843D2D; Sat, 7 Aug 2004 17:11:37 +0000 (GMT) (envelope-from arne@rfc2549.org) Received: by coruscant.rfc1149.org (Postfix, from userid 110) id 989C93EE6; Sat, 7 Aug 2004 19:11:35 +0200 (CEST) Received: from kamino.rfc1149.org (dsl-213-023-208-004.arcor-ip.net [213.23.208.4]) by coruscant.rfc1149.org (Postfix) with ESMTP id 6F3253EDD; Sat, 7 Aug 2004 19:11:32 +0200 (CEST) Received: by kamino.rfc1149.org (Postfix, from userid 1001) id 14F6A4088; Sat, 7 Aug 2004 19:11:28 +0200 (CEST) To: Peter Osterlund In-Reply-To: (Peter Osterlund's message of "Sun, 18 Apr 2004 21:05:37 +0200 (CEST)") References: From: Arne Schwabe Date: Sat, 07 Aug 2004 19:11:28 +0200 Message-ID: <86u0veq3en.fsf@kamino.rfc1149.org> User-Agent: Gnus/5.110003 (No Gnus v0.3) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on coruscant.rfc1149.org X-Spam-Status: No, hits=-4.8 required=5.0 tests=BAYES_00,RCVD_IN_SORBS autolearn=no version=2.60 X-Spam-Level: cc: freebsd-current@freebsd.org cc: freebsd-mobile@freebsd.org Subject: Re: Synaptics Driver Patch (new Version) X-BeenThere: freebsd-mobile@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Mobile computing with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2004 17:11:38 -0000 Peter Osterlund 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