[MPlayer-dev-eng] [PATCH] Remove ugly #include from tvi_bsdbt848.c

[Vladimir Voroshilov]

2007/3/20, Bernd Ernesti <mplayer-dev-eng at lists.veego.de>:

>    On Tue, Mar 20, 2007 at 07:01:13PM +0600, Vladimir Voroshilov wrote:
>    > 2007/3/20, Bernd Ernesti <mplayer-dev-eng at lists.veego.de>:
>    > >
>    > >On Mon, Mar 19, 2007 at 06:54:31PM +0100, Dominik 'Rathann'
Mierzejewski
>    > >wrote:
>    > >> On Monday, 19 March 2007 at 18:33, Vladimir Voroshilov wrote:
>    > >> > Hi, All
>    > >> >
>    > >> > This patch removes ugly #include from *BSD bt848 tv driver
>    > >> > (proper header will be detected by configure).
>    > >
>    > >It does not really check the correct headers, i fou had looked at
your
>    > >patch
>    > >then you would have noticed that you removed more then one header
file.
>    >
>    >
>    > Fixed. I've copy/pasted code from radio detection and forget that
those part
>    > doesn't use ioctl_meteor.h.
>
>    Now we have two checks for the same header files. One for the tv and
the 'old'
>    one for radio.


Also V4L and V4L2. What about moving out such detection from tv/radio
related detection code
and make them independent?


>    > Now both ioctl_meteor.h and ioctl_bt*.h are checked separately.
>    > I've also wrap audioio.h with USE_SUN_AUDIO (configure checks exact
this
>    > header)
>
>    This may be notbe correct on the other BSDs which may use a different
device
>    node and I can't comment if they also have this ioctl.


Quick googling shows following:
OpenBSD, NetBSD and OpenSolaris has identical audio_info struct.
AUDIO_GETINFO ioctl also defined (constants in definition differs, though).
FreeBSD and DragonFlyBSD does not have audioio.h

>    > What will be better:
>    >
>    > 1.
>    > #include MY_AHDR
>    > #include MY_BHDR
>    > where config.h contains:
>    > #define MY_AHDR <ahdr>
>    > #define MY_BHDR <bhdr>
>    >
>    > 2.
>    > #if defined(HAVE_AHDR1) && defined(HAVE_BHDR1)
>    > #include <ahdr1>
>    > #include <bhdr1>
>    > #if defined(HAVE_AHDR2) && defined(HAVE_BHDR2)
>    > #include <ahdr2>
>    > #include <ahdr2>
>    > ...
>    > #endif
>    >
>    > I prefer (1)
>
>    Me too, if this will work in the case where only one of the two headers
>    was found which will be the case on NetBSD because we no longer have
the
>    ioctl_*.h one.


Did you read patch ;) ?
============== cut =============
+#ifdef IOCTL_METEOR_H_NAME
+#include IOCTL_METEOR_H_NAME
+#endif
+
+#ifdef IOCTL_BT848_H_NAME
+#include IOCTL_BT848_H_NAME
+#endif
============== end =============



>    As I said, i can't do any tests, including compile only in the next 2
weeks.


Ok. I'll wait, if nobody else can help.


-- 
Regards,
Vladimir Voroshilov     mailto:voroshil at gmail.com
JID: voroshil at jabber.ru
ICQ: 95587719