From owner-cvs-src@FreeBSD.ORG Thu Jun 22 03:29:12 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6A4316A474; Thu, 22 Jun 2006 03:29:12 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED49243D45; Thu, 22 Jun 2006 03:29:11 +0000 (GMT) (envelope-from scottl@samsco.org) Received: from [192.168.254.11] (junior.samsco.home [192.168.254.11]) (authenticated bits=0) by pooker.samsco.org (8.13.4/8.13.4) with ESMTP id k5M3T5fc022775; Wed, 21 Jun 2006 21:29:10 -0600 (MDT) (envelope-from scottl@samsco.org) Message-ID: <449A0E7F.7090200@samsco.org> Date: Wed, 21 Jun 2006 21:29:03 -0600 From: Scott Long User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20051230 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Kostik Belousov References: <200606212103.k5LL3OsA040402@repoman.freebsd.org> <20060622031111.GA5115@deviant.kiev.zoral.com.ua> In-Reply-To: <20060622031111.GA5115@deviant.kiev.zoral.com.ua> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.4 required=3.8 tests=ALL_TRUSTED autolearn=failed version=3.1.1 X-Spam-Checker-Version: SpamAssassin 3.1.1 (2006-03-10) on pooker.samsco.org Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org, John Baldwin Subject: Re: cvs commit: src/sys/pci if_dc.c if_dcreg.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jun 2006 03:29:12 -0000 Kostik Belousov wrote: > On Wed, Jun 21, 2006 at 09:03:24PM +0000, John Baldwin wrote: > >>jhb 2006-06-21 21:03:24 UTC >> >> FreeBSD src repository >> >> Modified files: (Branch: RELENG_6) >> sys/pci if_dc.c if_dcreg.h >> Log: >> MFC various cleanups: >> - Switch on the full 32-bit device ID to avoid collisions between the >> vendor-specific device ids across vendors. >> - Include the revision in the dc_devs[] array instead of special casing >> the revid handling in dc_devtype(). >> - Use PCI bus accessors to read registers instead of pci_read_config() >> where possible. >> - Use an 8-bit write to update the latency timer. >> - Use PCIR_xxx constants and remove unused DC_xxx related to standard >> PCI config registers. > > It seems that file sys/dev/mii/dcphy.c references removed constant from > the if_dcreg.h. That file was removed itself from the CURRENT by imp > several month ago. But it is still alive on RELENG_6. > > With the MFC, I got buildkernel errors: > > cc -O2 -fno-strict-aliasing -pipe -march=pentiumpro -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I- -DHAVE_KERNEL_OPTION_HEADERS -include /usr/bsd/obj/usr/bsd/src/sys/POOMA/opt_global.h -I. -I@ -I@/contrib/altq -I@/../include -finline-limit=8000 -fno-common -g -I/usr/bsd/obj/usr/bsd/src/sys/POOMA -mno-align-long-strings-mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions -std=c99 -c /usr/bsd/src/sys/modules/mii/../../dev/mii/dcphy.c > /usr/bsd/src/sys/modules/mii/../../dev/mii/dcphy.c: In function `dcphy_attach': > /usr/bsd/src/sys/modules/mii/../../dev/mii/dcphy.c:172: error: `DC_PCI_CSID' undeclared (first use in this function) > /usr/bsd/src/sys/modules/mii/../../dev/mii/dcphy.c:172: error: (Each undeclared identifier is reported only once > /usr/bsd/src/sys/modules/mii/../../dev/mii/dcphy.c:172: error: for each function it appears in.) > *** Error code 1 > > Stop in /usr/bsd/src/sys/modules/mii. Once again, an incomplete and untested change was made to the stable branch. I'll commit the fix as soon as I have it tested. Scott