Re: [ivtv-devel][PATCH] Eliminate cx18 ivtv vbi symbol collisions ([PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cx18)

[Andy Walls <awalls@xxxxxxxxx>]

On Tue, 2008-04-29 at 23:10 -0300, Mauro Carvalho Chehab wrote:
> On Tue, 29 Apr 2008 19:04:24 -0400
> Andy Walls <awalls@xxxxxxxxx> wrote:
> 
> > Mauro Carvalho Chehab wrote:
> > > On Mon, 28 Apr 2008 22:42:40 +0200
> > > Hans Verkuil <hverkuil at xs4all.nl> wrote:
> > > 
> > > > Hi Mauro,
> > > > 
> > > > Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cx18 for 
> > > > the following:
> > > > 
> > > > - cx18: new driver for the Conexant CX23418 MPEG encoder chip
> > > > - cx18: add new cx18-ctl control utility
> > > > 
> > > 
> > > Also: there are duplicated symbols on ivtv and cx18:
> > > 
> > > drivers/media/video/cx18/built-in.o: In function `get_service_set':
> > > /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:118: multiple definition of `get_service_set'
> > > drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:119: first defined here
> > > drivers/media/video/cx18/built-in.o: In function `expand_service_set':
> > > /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:92: multiple definition of `expand_service_set'
> > > drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:92: first defined here
> > > drivers/media/video/cx18/built-in.o: In function `service2vbi':
> > > /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:44: multiple definition of `service2vbi'
> > > drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:42: first defined here
> > > 
> > > 
> > > Cheers,
> > > Mauro
> > 
> > Hans,
> > 
> > The attached patch should get rid of the symbol collision on the cx18
> > side of things.
> > 
> > I assumed the symbols were cx18 module internal and not directly used
> > from outside the cx18 directory.  Given that the calls were spread
> > across source files, making them file scope by declaring them static was
> > not an option. Please review.
> > 
> > Signed-off-by: Andy Walls <awalls@xxxxxxxxx>
> 
> Hi Andy,
> 
> I've already fixed the collision at cx18 side, before sending the patches to
> Linus, by adding cx18_ prefix to all functions that conflicted.

OK.  I didn't know if you were going to take the time to hunt down the
calls or if you were expecting Hans to do it.


> IMO, the same patch should also be applied at ivtv, since names, like
> "get_service_set" are very generic, and can cause later collisions.

Agree.  I figured Hans would handle that.

Regards
Andy

> Cheers,
> Mauro
> 


_______________________________________________
v4l-dvb-maintainer mailing list
v4l-dvb-maintainer@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/v4l-dvb-maintainer