From owner-freebsd-arch@FreeBSD.ORG Sun Nov 27 11:35:29 2011 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 663BE106564A; Sun, 27 Nov 2011 11:35:29 +0000 (UTC) (envelope-from rmh.aybabtu@gmail.com) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 115FF8FC0A; Sun, 27 Nov 2011 11:35:28 +0000 (UTC) Received: by iakl21 with SMTP id l21so10951011iak.13 for ; Sun, 27 Nov 2011 03:35:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=+yY3N2ymx2zaISbP+f6MFMz4q+AGw5FxJe5zDUeDasI=; b=WN0QiqTyj49MGE60XTqlxiM2xxnDU1U83NMjUpEUyvRziGLB1cDIJdvwdyexf1pawm 6BYoR0d4kMz7QTiegBKKkm2Q75mcVfaTbk9DGbq0qydjxEM5Xi4mew8Yym+jDEZ220JV 6jaIAJYTh3kzPnATd3JEZ1D01CFBtXeM/Ge+Q= MIME-Version: 1.0 Received: by 10.50.149.165 with SMTP id ub5mr45264785igb.23.1322393728440; Sun, 27 Nov 2011 03:35:28 -0800 (PST) Sender: rmh.aybabtu@gmail.com Received: by 10.42.222.200 with HTTP; Sun, 27 Nov 2011 03:35:28 -0800 (PST) In-Reply-To: <20111127131422.D802@besplex.bde.org> References: <20111123070036.GA29952@thorin> <20111124141821.O932@besplex.bde.org> <20111125150324.G1018@besplex.bde.org> <20111126200749.GA72056@thorin> <20111127131422.D802@besplex.bde.org> Date: Sun, 27 Nov 2011 12:35:28 +0100 X-Google-Sender-Auth: 9XIihjs8RyFaVJU_yXBf9-MEQiw Message-ID: From: Robert Millan To: Bruce Evans Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Kostik Belousov , Adrian Chadd , freebsd-current@freebsd.org, freebsd-arch@freebsd.org Subject: Re: [PATCH] Detect GNU/kFreeBSD in user-visible kernel headers (v2) X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2011 11:35:29 -0000 Hi Bruce, 2011/11/27 Bruce Evans : > % Index: sys/cam/scsi/scsi_low.h > % =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > % --- sys/cam/scsi/scsi_low.h =C2=A0 (revision 227956) > % +++ sys/cam/scsi/scsi_low.h =C2=A0 (working copy) > % @@ -53,10 +53,10 @@ > % =C2=A0#define =C2=A0 =C2=A0 =C2=A0SCSI_LOW_INTERFACE_XS > % =C2=A0#endif =C2=A0 =C2=A0 =C2=A0 /* __NetBSD__ */ > % % -#ifdef =C2=A0 =C2=A0 __FreeBSD__ > % +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) > % =C2=A0#define =C2=A0 =C2=A0 =C2=A0SCSI_LOW_INTERFACE_CAM > % =C2=A0#define =C2=A0 =C2=A0 =C2=A0CAM > % -#endif =C2=A0 =C2=A0 =C2=A0 /* __FreeBSD__ */ > % +#endif /* __FreeBSD__ || __FreeBSD_kernel__ */ > > It still has the whitespace-after tab style change for cam. My initial patch didn't have it. Precisely I thought that you requested this in your first mail. Did I missunderstand? > % Index: sys/dev/firewire/firewirereg.h > % =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > % --- sys/dev/firewire/firewirereg.h =C2=A0 =C2=A0(revision 227956) > % +++ sys/dev/firewire/firewirereg.h =C2=A0 =C2=A0(working copy) > % @@ -75,7 +75,8 @@ > % =C2=A0}; > % % =C2=A0struct firewire_softc { > % -#if defined(__FreeBSD__) && __FreeBSD_version >=3D 500000 > % +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && \ > % + =C2=A0 =C2=A0__FreeBSD_version >=3D 500000 > % =C2=A0 =C2=A0 =C2=A0 struct cdev *dev; > % =C2=A0#endif > % =C2=A0 =C2=A0 =C2=A0 struct firewire_comm *fc; > > Here is a pre-existing problem that you didn't fix on a line that you > changed. Yes. I didn't say I would fix all pre-existing problems in lines that need to be modified. In some cases I did, and in some cases I opted to preserve the status quo. > __FreeBSD_version it is impossible to determine if the data structure > has new fields like the cdev in it. =C2=A0 is a prerequisite > for almost all kernel .c files, so this prerequisite should be satisfied > automatically for them, Earlier you asked not to include . If is a prerequisite, why not just include it then?