summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/tuner-core.c15
-rw-r--r--v4l/ChangeLog11
2 files changed, 25 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 5676133d6..4dfb65b6a 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-core.c,v 1.62 2005/07/27 10:02:23 mchehab Exp $
+ * $Id: tuner-core.c,v 1.63 2005/07/28 18:19:55 mchehab Exp $
*
* i2c tv tuner chip device driver
* core core, i.e. kernel interfaces, registering and so on
@@ -24,6 +24,8 @@
#include <media/tuner.h>
#include <media/audiochip.h>
+#include "msp3400.h"
+
#define UNSET (-1U)
/* standard i2c insmod options */
@@ -475,6 +477,17 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
break;
}
break;
+ case VIDIOCSAUDIO:
+ if (check_mode(t, "VIDIOCSAUDIO") == EINVAL)
+ return 0;
+ if (check_v4l2(t) == EINVAL)
+ return 0;
+
+ /* Should be implemented, since bttv calls it */
+ tuner_dbg("VIDIOCSAUDIO not implemented.\n");
+
+ break;
+ case MSP_SET_MATRIX:
case TDA9887_SET_CONFIG:
break;
/* --- v4l ioctls --- */
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 54e75ad8f..9dbb2f621 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-28 18:19 mchehab
+
+ * tuner-core.c:
+ - BTTV does generate some Unimplemented IOCTL log:
+ 0x40046d11(dir=1,tp=0x6d,nr=17,sz=4) means that it is sending
+ MSP3400 calls to non-msp3400 tuners. Warning eliminated.
+ VIDIOSAUDIO is also called. debug messages updated. It is still
+ requiring IOCTL implementation.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-07-28 05:19 mkrufky
* bttv-cards.c, bttv.h:
- Added card DViCO FusionHDTV5 Lite.