From owner-freebsd-hackers@FreeBSD.ORG  Fri Oct  8 19:08:48 2010
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AEE610657DE;
	Fri,  8 Oct 2010 19:08:48 +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 3CDF28FC18;
	Fri,  8 Oct 2010 19:08:48 +0000 (UTC)
Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net
	[66.111.2.69])
	by cyrus.watson.org (Postfix) with ESMTPSA id E19C446B1A;
	Fri,  8 Oct 2010 15:08:47 -0400 (EDT)
Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id EA0528A04E;
	Fri,  8 Oct 2010 15:08:46 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: Garrett Cooper <yanegomi@gmail.com>
Date: Fri, 8 Oct 2010 15:06:25 -0400
User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20100819; KDE/4.4.5; amd64; ; )
References: <AANLkTikiaTONmZbLdWW5Np7h1EwxFBeyjsWTxZd43CUt@mail.gmail.com>
In-Reply-To: <AANLkTikiaTONmZbLdWW5Np7h1EwxFBeyjsWTxZd43CUt@mail.gmail.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Message-Id: <201010081506.26087.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1
	(bigwig.baldwin.cx); Fri, 08 Oct 2010 15:08:46 -0400 (EDT)
X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx
Cc: freebsd-hackers@freebsd.org, sbruno@freebsd.org, scottl@freebsd.org
Subject: Re: Fix mfiutil compile with -DDEBUG
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Oct 2010 19:08:48 -0000

On Sunday, October 03, 2010 10:33:17 pm Garrett Cooper wrote:
>     make -DDEBUG is broken in mfiutil:
> 
> $ make -DDEBUG
> cc -O2 -pipe -fno-strict-aliasing -pipe -O2 -march=nocona
> -fno-builtin-strftime -DDEBUG -Wall -Wcast-align -Woverflow
> -Wsign-compare -Wunused -std=gnu99 -fstack-protector -Wsystem-headers
> -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter
> -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
> -Wno-uninitialized -Wno-pointer-sign -c
> /usr/src/usr.sbin/mfiutil/mfi_config.c
> /usr/src/usr.sbin/mfiutil/mfi_config.c: In function 'dump_config':
> /usr/src/usr.sbin/mfiutil/mfi_config.c:1027: error: 'union mfi_pd_ref'
> has no member named 'device_id'
> /usr/src/usr.sbin/mfiutil/mfi_config.c:1083: error: 'union mfi_pd_ref'
> has no member named 'device_id'
> *** Error code 1
> 
> Stop in /usr/src/usr.sbin/mfiutil.
> $
> 
>     device_id is a field in the v field in the mfi_pd_ref union
> (/sys/dev/mfi/mfireg.h):
> 
> union mfi_pd_ref {
>         struct {
>                 uint16_t        device_id;
>                 uint16_t        seq_num;
>         } v;
>         uint32_t        ref;
> } __packed;

Yes, there were different versions of these definitions in mfireg.h at one 
point.  Your patch is fine.

-- 
John Baldwin