[alsa-cvslog] alsa-driver: ALSA driver repository - compatibility code, new drivers and standalone building branch, master now at v1.0.19-45-g8faf58a

[<nor...@al...>]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  8faf58aa7e07b8baa754e66c7f8da4b8a93f4a47 (commit)
      from  71b0443fa732d208cad07472669548bfaeadb42a (commit)

- Log -----------------------------------------------------------------
commit 8faf58aa7e07b8baa754e66c7f8da4b8a93f4a47
Author:     Jaroslav Kysela <pe...@pe...>
AuthorDate: Wed Apr 8 18:00:01 2009 +0200
Commit:     Jaroslav Kysela <pe...@pe...>
CommitDate: Wed Apr 8 18:00:01 2009 +0200

    tea57xx: try to resolved compilation problems for 2.6.27 kernels
    
    Signed-off-by: Jaroslav Kysela <pe...@pe...>

-----------------------------------------------------------------------

Diffstat:
 configure.in                  |    9 +++++++
 i2c/other/Makefile            |    1 -
 i2c/other/tea575x-tuner-old.h |   54 +++++++++++++++++++++++++++++++++++++++++
 i2c/other/tea575x-tuner.c     |    9 ++++---
 4 files changed, 68 insertions(+), 5 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/configure.in b/configure.in
index bb743bb..c1fb83c 100644
--- a/configure.in
+++ b/configure.in
@@ -2122,6 +2122,15 @@ CONFIG_VIDEO_V4L1="y"
 fi
 fi
 
+dnl Check for CONFIG_VIDEO_V4L2
+if test "$CONFIG_VIDEO_DEV" = "y"; then
+if test "$kversion.$kpatchlevel" = "2.6" -a "$ksublevel" -gt 17; then
+CHECK_KERNEL_CONFIG(CONFIG_VIDEO_V4L2, [V4L2 layer])
+else
+CONFIG_VIDEO_V4L2="y"
+fi
+fi
+
 dnl Check for old io_remap_page_range()
 AC_MSG_CHECKING(for io_remap_pfn_range)
 io_remap_pfn_range="0"
diff --git a/i2c/other/Makefile b/i2c/other/Makefile
index e67067f..37f1603 100644
--- a/i2c/other/Makefile
+++ b/i2c/other/Makefile
@@ -6,7 +6,6 @@ include $(SND_TOPDIR)/toplevel.config
 include $(SND_TOPDIR)/Makefile.conf
 
 export-objs += ak4xxx-adda.o ak4114.o ak4117.o pt2258.o tea575x-tuner.o
-clean-files += tea575x-tuner.c
 
 include $(SND_TOPDIR)/alsa-kernel/i2c/other/Makefile
 
diff --git a/i2c/other/tea575x-tuner-old.h b/i2c/other/tea575x-tuner-old.h
new file mode 100644
index 0000000..b6870cb
--- /dev/null
+++ b/i2c/other/tea575x-tuner-old.h
@@ -0,0 +1,54 @@
+#ifndef __SOUND_TEA575X_TUNER_H
+#define __SOUND_TEA575X_TUNER_H
+
+/*
+ *   ALSA driver for TEA5757/5759 Philips AM/FM tuner chips
+ *
+ *	Copyright (c) 2004 Jaroslav Kysela <pe...@pe...>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/videodev.h>
+#include <media/v4l2-dev.h>
+
+struct snd_tea575x;
+
+struct snd_tea575x_ops {
+	void (*write)(struct snd_tea575x *tea, unsigned int val);
+	unsigned int (*read)(struct snd_tea575x *tea);
+	void (*mute)(struct snd_tea575x *tea, unsigned int mute);
+};
+
+struct snd_tea575x {
+	struct snd_card *card;
+	struct video_device vd;		/* video device */
+	struct file_operations fops;
+	int dev_nr;			/* requested device number + 1 */
+	int vd_registered;		/* video device is registered */
+	int tea5759;			/* 5759 chip is present */
+	unsigned int freq_fixup;	/* crystal onboard */
+	unsigned int val;		/* hw value */
+	unsigned long freq;		/* frequency */
+	unsigned long in_use;		/* set if the device is in use */
+	struct snd_tea575x_ops *ops;
+	void *private_data;
+};
+
+void snd_tea575x_init(struct snd_tea575x *tea);
+void snd_tea575x_exit(struct snd_tea575x *tea);
+
+#endif /* __SOUND_TEA575X_TUNER_H */
diff --git a/i2c/other/tea575x-tuner.c b/i2c/other/tea575x-tuner.c
index 9c15d63..a658bfc 100644
--- a/i2c/other/tea575x-tuner.c
+++ b/i2c/other/tea575x-tuner.c
@@ -6,9 +6,10 @@
 #endif
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,29)
-#include "tea575x-tuner-old.c"
-#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
 #include "adriver.h"
-#include "../../alsa-kernel/sound/i2c/other/tea575a-tuner.c"
+#include "../../alsa-kernel/i2c/other/tea575x-tuner.c"
+#else
+#include "tea575x-tuner-old.h"
+#include "tea575x-tuner-old.c"
 #endif
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  71b0443fa732d208cad07472669548bfaeadb42a \
  8faf58aa7e07b8baa754e66c7f8da4b8a93f4a47