2002-11-18 14:06:32

by Petr Vandrovec

[permalink] [raw]
Subject: [PATCH] bttv & 2.5.48

Hi Gerd,
I did not saw this patch posted... PCI now does not have its own name,
and it uses dev's name. Please apply.
Petr Vandrovec
[email protected]


diff -urdN linux/drivers/media/video/bttv-cards.c linux/drivers/media/video/bttv-cards.c
--- linux/drivers/media/video/bttv-cards.c 2002-11-18 13:50:42.000000000 +0000
+++ linux/drivers/media/video/bttv-cards.c 2002-11-18 13:55:51.000000000 +0000
@@ -2990,7 +2990,7 @@

/* print which chipset we have */
while ((dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8,dev)))
- printk(KERN_INFO "bttv: Host bridge is %s\n",dev->name);
+ printk(KERN_INFO "bttv: Host bridge is %s\n",dev->dev.name);

/* print warnings about any quirks found */
if (triton1)


2002-11-19 13:13:59

by Javier Marcet

[permalink] [raw]
Subject: Re: [PATCH] bttv & 2.5.48

* Petr Vandrovec <[email protected]> [021118 16:12]:

> I did not saw this patch posted... PCI now does not have its own name,
>and it uses dev's name. Please apply.


>diff -urdN linux/drivers/media/video/bttv-cards.c linux/drivers/media/video/bttv-cards.c
>--- linux/drivers/media/video/bttv-cards.c 2002-11-18 13:50:42.000000000 +0000
>+++ linux/drivers/media/video/bttv-cards.c 2002-11-18 13:55:51.000000000 +0000
>@@ -2990,7 +2990,7 @@
>
> /* print which chipset we have */
> while ((dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8,dev)))
>- printk(KERN_INFO "bttv: Host bridge is %s\n",dev->name);
>+ printk(KERN_INFO "bttv: Host bridge is %s\n",dev->dev.name);
>
> /* print warnings about any quirks found */
> if (triton1)

This fixes the second of the errors, but not the missing
AUDC_CONFIG_PINNACLE I get first:

make -f scripts/Makefile.build obj=drivers/media/radio
make -f scripts/Makefile.build obj=drivers/media/video
gcc -Wp,-MD,drivers/media/video/.bttv-cards.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=athlon-xp -Iarch/i386/mach-generic -nostdinc -iwithprefix include -DMODULE -DKBUILD_BASENAME=bttv_cards -DKBUILD_MODNAME=bttv -c -o drivers/media/video/bttv-cards.o drivers/media/video/bttv-cards.c
drivers/media/video/bttv-cards.c: In function AUDC_CONFIG_PINNACLE' undeclared (first use in this function)
drivers/media/video/bttv-cards.c:1742: (Each undeclared identifier is reported only once
drivers/media/video/bttv-cards.c:1742: for each function it appears in.)
drivers/media/video/bttv-cards.c: In function name'
make[4]: *** [drivers/media/video/bttv-cards.o] Error 1
make[3]: *** [drivers/media/video] Error 2
make[2]: *** [drivers/media] Error 2
make[1]: *** [drivers] Error 2
make: *** [modules] Error 2

I know this has not changed since 2.5.47, nor couldn't spot any
difference within the /media tree, yet it fails on 2.5.48 while it
compiled fine on 2.5.47

Any idea where the error might be?


--
Javier Marcet <[email protected]>


Attachments:
(No filename) (2.06 kB)
(No filename) (197.00 B)
Download all attachments

2002-11-19 13:21:19

by Petr Vandrovec

[permalink] [raw]
Subject: Re: [PATCH] bttv & 2.5.48

On 19 Nov 02 at 14:21, Javier Marcet wrote:
> drivers/media/video/bttv-cards.c: In function AUDC_CONFIG_PINNACLE' undeclared (first use in this function)
> drivers/media/video/bttv-cards.c:1742: (Each undeclared identifier is reported only once
> drivers/media/video/bttv-cards.c:1742: for each function it appears in.)
> drivers/media/video/bttv-cards.c: In function name'
> make[4]: *** [drivers/media/video/bttv-cards.o] Error 1
> make[3]: *** [drivers/media/video] Error 2
> make[2]: *** [drivers/media] Error 2
> make[1]: *** [drivers] Error 2
> make: *** [modules] Error 2
>
> I know this has not changed since 2.5.47, nor couldn't spot any
> difference within the /media tree, yet it fails on 2.5.48 while it
> compiled fine on 2.5.47
>
> Any idea where the error might be?

I just commented out that offending line, as I do not have Pinnacle,
so it should be never executed ;-)

If you have Pinnacle, then you'll have to get tda9887 driver somewhere.
This driver defines AUD_CONFIG_PINNACLE (as far as I can tell from
missing pieces...).

AFAIK bttv driver at http://bytesex.org/bttv has this fixed.
Best regards,
Petr Vandrovec
[email protected]

2002-11-19 13:48:19

by Javier Marcet

[permalink] [raw]
Subject: Re: [PATCH] bttv & 2.5.48

* Petr Vandrovec <[email protected]> [021119 15:27]:

>> drivers/media/video/bttv-cards.c: In function AUDC_CONFIG_PINNACLE' undeclared (first use in this function)
>> drivers/media/video/bttv-cards.c:1742: (Each undeclared identifier is reported only once
>> drivers/media/video/bttv-cards.c:1742: for each function it appears in.)
>> drivers/media/video/bttv-cards.c: In function name'
>> make[4]: *** [drivers/media/video/bttv-cards.o] Error 1
>> make[3]: *** [drivers/media/video] Error 2
>> make[2]: *** [drivers/media] Error 2
>> make[1]: *** [drivers] Error 2
>> make: *** [modules] Error 2
>>
>> I know this has not changed since 2.5.47, nor couldn't spot any
>> difference within the /media tree, yet it fails on 2.5.48 while it
>> compiled fine on 2.5.47

>> Any idea where the error might be?

>I just commented out that offending line, as I do not have Pinnacle,
>so it should be never executed ;-)

That's the first thing I did, but how's that it compiled fine in 2.5.47
if nothing changed?

>If you have Pinnacle, then you'll have to get tda9887 driver somewhere.
>This driver defines AUD_CONFIG_PINNACLE (as far as I can tell from
>missing pieces...).

It's one of the two cards I have but I'm not have it plugged it ATM.


--
Javier Marcet <[email protected]>


Attachments:
(No filename) (1.25 kB)
(No filename) (197.00 B)
Download all attachments

2002-11-19 14:03:00

by Petr Vandrovec

[permalink] [raw]
Subject: Re: [PATCH] bttv & 2.5.48

On 19 Nov 02 at 14:55, Javier Marcet wrote:
> >> drivers/media/video/bttv-cards.c: In function AUDC_CONFIG_PINNACLE' undeclared (first use in this function)
> >> drivers/media/video/bttv-cards.c:1742: (Each undeclared identifier is reported only once
> >> drivers/media/video/bttv-cards.c:1742: for each function it appears in.)
> >> drivers/media/video/bttv-cards.c: In function name'
> >> make[4]: *** [drivers/media/video/bttv-cards.o] Error 1
> >> make[3]: *** [drivers/media/video] Error 2
> >> make[2]: *** [drivers/media] Error 2
> >> make[1]: *** [drivers] Error 2
> >> make: *** [modules] Error 2
> >>
> >> I know this has not changed since 2.5.47, nor couldn't spot any
> >> difference within the /media tree, yet it fails on 2.5.48 while it
> >> compiled fine on 2.5.47
>
> >> Any idea where the error might be?
>
> >I just commented out that offending line, as I do not have Pinnacle,
> >so it should be never executed ;-)
>
> That's the first thing I did, but how's that it compiled fine in 2.5.47
> if nothing changed?

It did not for me... I have commented it out at least since 2.5.46-c929,
from Nov 8th.
Petr Vandrovec
[email protected]

2002-11-19 14:23:05

by Gerd Knorr

[permalink] [raw]
Subject: Re: [PATCH] bttv & 2.5.48

> This fixes the second of the errors, but not the missing
> AUDC_CONFIG_PINNACLE I get first:
>
> drivers/media/video/bttv-cards.c: In function AUDC_CONFIG_PINNACLE'
> undeclared (first use in this function)

> Any idea where the error might be?

http://bytesex.org/patches/2.5/ has patches for this and other issues.

Files starting with digits are the individual patches,
patch-2.5.48-kraxel.gz is the "all in one" package.

Gerd

--
You can't please everybody. And usually if you _try_ to please
everybody, the end result is one big mess.
-- Linus Torvalds, 2002-04-20