From owner-cvs-src@FreeBSD.ORG Thu Jun 22 21:45:50 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 9325B16A713; Thu, 22 Jun 2006 21:45:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74AC64581B; Thu, 22 Jun 2006 20:52:29 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5MKqMCF051151; Thu, 22 Jun 2006 16:52:28 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Scott Long Date: Thu, 22 Jun 2006 16:28:05 -0400 User-Agent: KMail/1.9.1 References: <200606212103.k5LL3OsA040402@repoman.freebsd.org> <20060622031111.GA5115@deviant.kiev.zoral.com.ua> <449A0E7F.7090200@samsco.org> In-Reply-To: <449A0E7F.7090200@samsco.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606221628.06391.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, 22 Jun 2006 16:52:28 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1561/Thu Jun 22 11:40:00 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Kostik Belousov , cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org 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 21:45:51 -0000 On Wednesday 21 June 2006 23:29, Scott Long wrote: > 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. The dc(4) kernel module did build. -- John Baldwin