From owner-freebsd-bugs Mon Feb 10 1:50:25 2003 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A449A37B401 for ; Mon, 10 Feb 2003 01:50:22 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32A5043FE5 for ; Mon, 10 Feb 2003 01:50:22 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h1A9oLNS056485 for ; Mon, 10 Feb 2003 01:50:21 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h1A9oLiY056482; Mon, 10 Feb 2003 01:50:21 -0800 (PST) Date: Mon, 10 Feb 2003 01:50:21 -0800 (PST) Message-Id: <200302100950.h1A9oLiY056482@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org Cc: From: parv Subject: Re: kern/48116: Support for Synaptics touchpad Reply-To: parv Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR kern/48116; it has been noted by GNATS. From: parv To: Rahul Siddharthan Cc: f-gnats Subject: Re: kern/48116: Support for Synaptics touchpad Date: Mon, 10 Feb 2003 04:46:39 -0500 in message <20030210043638.GA25030@papagena.rockefeller.edu>, wrote Rahul Siddharthan thusly... > > parv said on Feb 9, 2003 at 23:33:25: > > > This is a patch from Marcin Dalecki for supporting the extra > > > buttons on the Synaptics touchpad, which comes with many laptops. > > ... > > > The diffs are against -current of Feb 9, 2002. > > > I am using such a touchpad & 4.7-release-p3. Are there anything > > -current special which might cause problems? > > No idea, but no harm trying. I don't think psm.c has changed all that > much for quite a while well, there won't be much of a problem (not actually patched, tried patch -C); there doesn't seem to be a src/sys/sys/mouse.h (on -release-p3) however ... unless it is meant to be src/sys/(i386|alpha)/include/mouse.h. If it's really "(i386|alpha)/include/mouse.h", then patch would have (almost) succeeded. > --- src/sys/sys/mouse.h.old Sun Feb 9 16:47:33 2003 > +++ src/sys/sys/mouse.h Sun Feb 9 16:47:37 2003 below is output of "patch -C -d /usr < patch-file"... Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- src/sys/isa/psm.c.old Sun Feb 9 16:47:20 2003 |+++ src/sys/isa/psm.c Sun Feb 9 16:47:37 2003 -------------------------- Patching file src/sys/isa/psm.c using Plan A... Hunk #1 failed at 268. Hunk #2 succeeded at 311 (offset 10 lines). Hunk #3 succeeded at 572 (offset 8 lines). Hunk #4 succeeded at 1952 (offset -7 lines). Hunk #5 succeeded at 1977 (offset 8 lines). Hunk #6 succeeded at 1975 (offset -7 lines). Hunk #7 succeeded at 2017 (offset 8 lines). Hunk #8 succeeded at 2308 (offset -7 lines). Hunk #9 succeeded at 2881 (offset 8 lines). 1 out of 9 hunks failed--saving rejects to src/sys/isa/psm.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- | | |--- src/sys/sys/mouse.h.old Sun Feb 9 16:47:33 2003 |+++ src/sys/sys/mouse.h Sun Feb 9 16:47:37 2003 -------------------------- File to patch: /cdrw/src/sys/i386/include/mouse.h Patching file /cdrw/src/sys/i386/include/mouse.h using Plan A... Hunk #1 succeeded at 119. Hunk #2 succeeded at 140. Hunk #3 failed at 160. Hunk #4 succeeded at 295. 1 out of 4 hunks failed--saving rejects to /cdrw/src/sys/i386/include/mouse.h.rej done - parv -- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message