[linux-dvb] Patch for analog part for Avermedia A700 fails to apply

Eduard Huguet eduardhc at gmail.com
Tue Feb 5 10:08:53 CET 2008


Hi,
    Bad news: I've been unsuccesfully trying to apply the new patches (as
mentioned in the wiki), with the following results:

1.- analog part applies just fine:

mediacenter v4l-dvb # patch -p1 < ../1_avertv_A700_analog_part.diff
patching file linux/drivers/media/video/saa7134/saa7134-cards.c
patching file linux/drivers/media/video/saa7134/saa7134.h
patching file linux/Documentation/video4linux/CARDLIST.saa7134


2.- Your patch (ZZam's) gives some warnings:

mediacenter v4l-dvb # patch -p1 < ../2_avertv_A700_zzam.diff
patching file linux/drivers/media/video/saa7134/saa7134-cards.c
Hunk #1 succeeded at 4011 with fuzz 2 (offset 19 lines).
Hunk #2 succeeded at 4268 with fuzz 1 (offset 25 lines).
Hunk #3 succeeded at 5266 with fuzz 2 (offset 33 lines).
patching file linux/drivers/media/video/saa7134/saa7134.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
linux/drivers/media/video/saa7134/saa7134.h.rej
patching file linux/Documentation/video4linux/CARDLIST.saa7134
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
linux/Documentation/video4linux/CARDLIST.saa7134.rej
patching file linux/drivers/media/dvb/frontends/Kconfig
patching file linux/drivers/media/dvb/frontends/Makefile
patching file linux/drivers/media/dvb/frontends/zl1003x.c
patching file linux/drivers/media/dvb/frontends/zl1003x.h
patching file linux/drivers/media/dvb/frontends/mt312.c
patching file linux/drivers/media/dvb/frontends/mt312_priv.h
patching file linux/drivers/media/dvb/frontends/mt312.h
patching file linux/drivers/media/video/saa7134/Kconfig
patching file linux/drivers/media/video/saa7134/saa7134-dvb.c


At this point the patched code doens't even compile:
  ...
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/pwc-misc.o
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/pwc-ctrl.o
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/pwc-v4l.o
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/pwc-uncompress.o
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/pwc-dec1.o
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/pwc-dec23.o
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/pwc-kiara.o
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/pwc-timon.o
  CC [M]  /home/root/src/dvb/v4l-dvb/v4l/saa7134-cards.o
/home/root/src/dvb/v4l-dvb/v4l/saa7134-cards.c: In function
'saa7134_board_init1':
/home/root/src/dvb/v4l-dvb/v4l/saa7134-cards.c:5269: error: duplicate case
value
/home/root/src/dvb/v4l-dvb/v4l/saa7134-cards.c:5261: error: previously used
here
make[3]: *** [/home/root/src/dvb/v4l-dvb/v4l/saa7134-cards.o] Error 1
make[2]: *** [_module_/home/root/src/dvb/v4l-dvb/v4l] Error 2
make[2]: Leaving directory `/usr/src/linux-2.6.23-tuxonice-r8'
make[1]: *** [default] Error 2
make[1]: Leaving directory `/home/root/src/dvb/v4l-dvb/v4l'
make: *** [all] Error 2

This is the offending code in  v4l/saa7134-cards.c:

        case SAA7134_BOARD_AVERMEDIA_A700:
                /* write windows gpio values */
                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x80040100,
0x80040100);
                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x80040100,
0x00040100);
                printk("%s: %s: hybrid analog/dvb card\n"
                       "%s: Sorry, only the analog inputs are supported for
now.\n",
                        dev->name,card(dev).name, dev->name);
                break;
        case SAA7134_BOARD_AVERMEDIA_A700:
                /* write windows gpio values */
                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x80040100,
0x80040100);
                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x80040100,
0x00040100);

                /* reset demod */
                saa7134_set_gpio(dev, 23, 1);
                msleep(100);
                saa7134_set_gpio(dev, 23, 3); // back to tristate = input
mode

                break;


Apparently the A700 section is duplicated. I assume that the second section
is the good one, as the first gives only option for analog input. This is
probably related to the patch no aplying cleanly. I've removed the 1st
section and now it seems to compile fine.


3.- Tino's patch gets worse. It even doesn't apply:

mediacenter v4l-dvb # patch -p1 < ../3_avertv_A700_tino.diff
patching file linux/drivers/media/common/ir-keymaps.c
Hunk #1 FAILED at 1898.
1 out of 1 hunk FAILED -- saving rejects to file
linux/drivers/media/common/ir-keymaps.c.rej
patching file linux/drivers/media/dvb/frontends/Kconfig
Hunk #2 succeeded at 374 (offset 7 lines).
patching file linux/drivers/media/dvb/frontends/Makefile
Hunk #1 succeeded at 51 (offset 1 line).
patching file linux/drivers/media/dvb/frontends/zl10039.c
patching file linux/drivers/media/dvb/frontends/zl10039.h
patching file linux/drivers/media/dvb/frontends/zl10039_priv.h
The next patch would create the file
linux/drivers/media/dvb/frontends/zl1003x.c,
which already exists!  Assume -R? [n]
Apply anyway? [n] y
patching file linux/drivers/media/dvb/frontends/zl1003x.c
Patch attempted to create file linux/drivers/media/dvb/frontends/zl1003x.c,
which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file
linux/drivers/media/dvb/frontends/zl1003x.c.rej
The next patch would create the file
linux/drivers/media/dvb/frontends/zl1003x.h,
which already exists!  Assume -R? [n]
Apply anyway? [n] y
patching file linux/drivers/media/dvb/frontends/zl1003x.h
Patch attempted to create file linux/drivers/media/dvb/frontends/zl1003x.h,
which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file
linux/drivers/media/dvb/frontends/zl1003x.h.rej
patching file linux/drivers/media/dvb/frontends/zl10313.c
patching file linux/drivers/media/dvb/frontends/zl10313.h
patching file linux/drivers/media/dvb/frontends/zl10313_priv.h
patching file linux/drivers/media/video/saa7134/Kconfig
Hunk #1 FAILED at 37.
1 out of 1 hunk FAILED -- saving rejects to file
linux/drivers/media/video/saa7134/Kconfig.rej
patching file linux/drivers/media/video/saa7134/saa7134-cards.c
Hunk #1 succeeded at 3280 (offset 11 lines).
Hunk #2 succeeded at 4029 with fuzz 1 (offset 429 lines).
Hunk #3 succeeded at 4096 (offset 429 lines).
Hunk #4 succeeded at 5051 with fuzz 2 (offset 621 lines).
Hunk #5 FAILED at 5305.
1 out of 5 hunks FAILED -- saving rejects to file
linux/drivers/media/video/saa7134/saa7134-cards.c.rej
patching file linux/drivers/media/video/saa7134/saa7134-dvb.c
Hunk #2 succeeded at 668 (offset 3 lines).
Hunk #3 succeeded at 873 (offset 30 lines).
Hunk #4 succeeded at 1112 with fuzz 2 (offset 45 lines).
patching file linux/drivers/media/video/saa7134/saa7134.h
Hunk #1 FAILED at 247.
1 out of 1 hunk FAILED -- saving rejects to file
linux/drivers/media/video/saa7134/saa7134.h.rej
patching file linux/drivers/media/video/saa7134/saa7134-input.c
Hunk #1 succeeded at 304 (offset 44 lines).
Hunk #2 succeeded at 405 (offset 54 lines).
patching file linux/include/media/ir-common.h
Hunk #1 FAILED at 140.
1 out of 1 hunk FAILED -- saving rejects to file linux/include/media/ir-
common.h.rej


This is using a fresh copy of HG tree.

Regards,
  Eduard



2008/2/4, Matthias Schwarzott <zzam at gentoo.org>:
> On Dienstag, 29. Januar 2008, Eduard Huguet wrote:
> > 2008/1/29, Matthias Schwarzott <zzam at gentoo.org>:
> > >
> > > Sure the patch is too old. There was added a new card to saa7134
driver.
> > > So I
> > > needed to update the patch.
> > > You can now get the patch from my last mail (it was attached).
> > > http://thread.gmane.org/gmane.linux.drivers.dvb/38943/focus=38952
> > >
> > > Or you re-download the file linked from the wiki. I uploaded the new
> > > version.
> > >
> > > Greetings
> > > Matthias
> > >
> > > --
> > > Matthias Schwarzott (zzam)
> >
> > Ok, thanks. I'll try it later.
> >
> > Best regards,
> >   Eduard Huguet
>
> Hi Eduard!
> The full patch can be found here: http://dev.gentoo.org/~zzam/dvb/
>
> It is now also linked from here:
> http://www.linuxtv.org/wiki/index.php/AVerMedia_AVerTV_DVB-S_Pro_(A700)
>
> Regards
> Matthias
>
> --
> Matthias Schwarzott (zzam)
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.linuxtv.org/pipermail/linux-dvb/attachments/20080205/486b2fbe/attachment-0001.htm 


More information about the linux-dvb mailing list