From owner-freebsd-ppc@FreeBSD.ORG Thu Jan 29 14:09:46 2009 Return-Path: Delivered-To: powerpc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DA231065676; Thu, 29 Jan 2009 14:09:46 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 5D8398FC08; Thu, 29 Jan 2009 14:09:46 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (pool-98-109-39-197.nwrknj.fios.verizon.net [98.109.39.197]) by cyrus.watson.org (Postfix) with ESMTPSA id 0CD9A46BA5; Thu, 29 Jan 2009 09:09:46 -0500 (EST) Received: from localhost (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.3/8.14.3) with ESMTP id n0TE9Y2l006646; Thu, 29 Jan 2009 09:09:39 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Ed Schouten Date: Thu, 29 Jan 2009 08:19:36 -0500 User-Agent: KMail/1.9.7 References: <200901290559.n0T5xhmL043647@svn.freebsd.org> In-Reply-To: <200901290559.n0T5xhmL043647@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901290819.36839.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 29 Jan 2009 09:09:39 -0500 (EST) X-Virus-Scanned: ClamAV 0.94.2/8919/Thu Jan 29 08:05:38 2009 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: powerpc@freebsd.org Subject: Re: svn commit: r187878 - head/sys/dev/adb X-BeenThere: freebsd-ppc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting FreeBSD to the PowerPC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2009 14:09:48 -0000 On Thursday 29 January 2009 12:59:43 am Ed Schouten wrote: > Author: ed > Date: Thu Jan 29 05:59:42 2009 > New Revision: 187878 > URL: http://svn.freebsd.org/changeset/base/187878 > > Log: > Make adb_mouse use dev2unit() instead of minor(). > > A real fix would be to migrate it to si_drv0 to store the softc > directly, but this is the quickest way to fix it right now. --- //depot/vendor/freebsd/src/sys/dev/adb/adb_mouse.c 2009/01/29 06:00:14 +++ //depot/user/jhb/acpipci/dev/adb/adb_mouse.c 2009/01/29 13:18:24 @@ -46,7 +46,7 @@ #include "adb.h" -#define CDEV_GET_SOFTC(x) devclass_get_softc(adb_mouse_devclass, dev2unit(x) & 0x1f) +#define CDEV_GET_SOFTC(x) (x)->si_drv1 static int adb_mouse_probe(device_t dev); static int adb_mouse_attach(device_t dev); @@ -236,6 +236,7 @@ sc->cdev = make_dev(&ams_cdevsw, device_get_unit(dev), UID_ROOT, GID_OPERATOR, 0644, "ams%d", device_get_unit(dev)); + sc->cdev->si_drv1 = sc; adb_set_autopoll(dev,1); Can someone on powerpc@ test it please? -- John Baldwin