cvs commit: src/sys/pci if_dc.c if_dcreg.h

[Scott Long]

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