RELENG_5 build broken with BKTR_USE_FREEBSD_SMBUS and BKTR_NEW_MSP34XX_DRIVER enabled (fwd)

[Doug White]

Hey folks,

Here's a patch I whipped up to fix compiling the kernel with the options
noted in the subject.  I think this guy is the first one to actually try
both options at once :)  I'm told it works on the right hardware, which I
don't have -- my ancient WinTV doesn't have the msp.

http://people.freebsd.org/~dwhite/msp34xx.c.patch

I can commit this if desired.

-- 
Doug White                    |  FreeBSD: The Power to Serve
dwhite at gumbysoft.com          |  www.FreeBSD.org

---------- Forwarded message ----------
Date: Sun, 29 Aug 2004 16:01:41 -0700 (PDT)
From: Doug White <dwhite at carver.gumbysoft.com>
To: Damian Gerow <dgerow at afflictions.org>
Cc: current at freebsd.org
Subject: Re: RELENG_5 build broken with BKTR_USE_FREEBSD_SMBUS and
    BKTR_NEW_MSP34XX_DRIVER enabled

On Tue, 24 Aug 2004, Damian Gerow wrote:

> In trying to build a kernel with bktr support, I'm using both
> BKTR_USE_FREEBSD_SMBUS and BKTR_NEW_MSP34XX_DRIVER.  This is what I see on a
> compile:
>
>     cc -c -O -pipe -march=pentium4 -Wall -Wredundant-decls -Wnested-externs \
>       -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline \
>       -Wcast-qual  -fformat-extensions -std=c99  -nostdinc -I-  -I. \
>       -I/usr/src/sys -I/usr/src/sys/contrib/dev/acpica \
>       -I/usr/src/sys/contrib/altq -I/usr/src/sys/contrib/ipfilter \
>       -I/usr/src/sys/contrib/pf -I/usr/src/sys/contrib/dev/ath \
>       -I/usr/src/sys/contrib/dev/ath/freebsd \
>       -I/usr/src/sys/contrib/ngatm -D_KERNEL -include opt_global.h \
>       -fno-common -finline-limit=8000 --param inline-unit-growth=100 \
>       --param large-function-growth=1000  -mno-align-long-strings \
>       -mpreferred-stack-boundary=2 -ffreestanding -Werror  \
>       /usr/src/sys/dev/bktr/msp34xx.c
>     In file included from /usr/src/sys/dev/bktr/msp34xx.c:92:
>     /usr/src/sys/dev/bktr/bktr_reg.h:451: error: syntax error before "device_t"
>     *** Error code 1

Please try the patch at:

http://people.freebsd.org/~dwhite/msp34xx.c.patch

Seems to test out OK on my ancient Hauppauge WinTV card.  These options
must not be a frequently used combination since its been months since this
stuff was touched last. There was a PR that fixed a compile bug in one
file related to the smbus option but must not have been tested with the
msp stuff too.

-- 
Doug White                    |  FreeBSD: The Power to Serve
dwhite at gumbysoft.com          |  www.FreeBSD.org