summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--v4l/ChangeLog20
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-audio.c12
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-demod.c11
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-tuner.c11
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-video-v4l.c11
5 files changed, 61 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index c275c8295..fc0c0c4de 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,23 @@
+2006-01-22 03:45 mcisely
+
+ * v4l_experimental/pvrusb2/pvrusb2-audio.c:
+ (pvr2_msp3400_describe), (pvr2_i2c_msp3400_setup):
+ * v4l_experimental/pvrusb2/pvrusb2-demod.c: (demod_describe),
+ (pvr2_i2c_demod_setup):
+ * v4l_experimental/pvrusb2/pvrusb2-tuner.c: (pvr2_tuner_describe),
+ (pvr2_i2c_tuner_setup):
+ * v4l_experimental/pvrusb2/pvrusb2-video-v4l.c: (decoder_describe),
+ (pvr2_i2c_decoder_v4l_setup):
+
+ - Make it easier to find out which pvrusb2 handlers have been
+ assigned to which attached I2C clients. This implements a
+ describe function for each handler and some debug code which can
+ log when a handler is associated. (The describe function hook
+ has been there since the big change back on 31-Dec-2005; new
+ logic here uses that hook.)
+
+ Signed-off-by: Mike Isely <isely@pobox.com>
+
2006-01-22 00:39 mchehab
* linux/drivers/media/video/em28xx/em28xx-video.c:
diff --git a/v4l_experimental/pvrusb2/pvrusb2-audio.c b/v4l_experimental/pvrusb2/pvrusb2-audio.c
index 4d98207ef..215635f93 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-audio.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-audio.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: pvrusb2-audio.c,v 1.7 2006/01/14 19:09:50 mcisely Exp $
+ * $Id: pvrusb2-audio.c,v 1.8 2006/01/22 03:48:34 mcisely Exp $
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -206,10 +206,18 @@ static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt)
}
+static unsigned int pvr2_msp3400_describe(struct pvr2_msp3400_handler *ctxt,char *buf,
+ unsigned int cnt)
+{
+ return scnprintf(buf,cnt,"handler: pvrusb2-audio");
+}
+
+
const static struct pvr2_i2c_handler_functions msp3400_funcs = {
.detach = (void (*)(void *))pvr2_msp3400_detach,
.check = (int (*)(void *))msp3400_check,
.update = (void (*)(void *))msp3400_update,
+ .describe = (unsigned int (*)(void *,char *,unsigned int))pvr2_msp3400_describe,
};
@@ -234,6 +242,8 @@ int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
sizeof(msp3400_ops[0]))) - 1;
cp->handler = &ctxt->i2c_handler;
hdw->audio_stat = &ctxt->astat;
+ pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L1 handler set up",
+ cp->client->addr);
return !0;
}
diff --git a/v4l_experimental/pvrusb2/pvrusb2-demod.c b/v4l_experimental/pvrusb2/pvrusb2-demod.c
index 42f3340f7..f7545b773 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-demod.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-demod.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: pvrusb2-demod.c,v 1.4 2006/01/14 19:09:50 mcisely Exp $
+ * $Id: pvrusb2-demod.c,v 1.5 2006/01/22 03:48:34 mcisely Exp $
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -79,10 +79,17 @@ static void demod_detach(struct pvr2_demod_handler *ctxt)
}
+static unsigned int demod_describe(struct pvr2_demod_handler *ctxt,char *buf,unsigned int cnt)
+{
+ return scnprintf(buf,cnt,"handler: pvrusb2-demod");
+}
+
+
const static struct pvr2_i2c_handler_functions tuner_funcs = {
.detach = (void (*)(void *))demod_detach,
.check = (int (*)(void *))demod_check,
.update = (void (*)(void *))demod_update,
+ .describe = (unsigned int (*)(void *,char *,unsigned int))demod_describe,
};
@@ -101,6 +108,8 @@ int pvr2_i2c_demod_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
ctxt->client = cp;
ctxt->hdw = hdw;
cp->handler = &ctxt->i2c_handler;
+ pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x tda9887 V4L2 handler set up",
+ cp->client->addr);
return !0;
}
diff --git a/v4l_experimental/pvrusb2/pvrusb2-tuner.c b/v4l_experimental/pvrusb2/pvrusb2-tuner.c
index 5223bfcb0..4a6f99177 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-tuner.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-tuner.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: pvrusb2-tuner.c,v 1.11 2006/01/14 19:09:50 mcisely Exp $
+ * $Id: pvrusb2-tuner.c,v 1.12 2006/01/22 03:48:34 mcisely Exp $
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -75,10 +75,17 @@ static void pvr2_tuner_detach(struct pvr2_tuner_handler *ctxt)
}
+static unsigned int pvr2_tuner_describe(struct pvr2_tuner_handler *ctxt,char *buf,unsigned int cnt)
+{
+ return scnprintf(buf,cnt,"handler: pvrusb2-tuner");
+}
+
+
const static struct pvr2_i2c_handler_functions tuner_funcs = {
.detach = (void (*)(void *))pvr2_tuner_detach,
.check = (int (*)(void *))tuner_check,
.update = (void (*)(void *))tuner_update,
+ .describe = (unsigned int (*)(void *,char *,unsigned int))pvr2_tuner_describe,
};
@@ -97,6 +104,8 @@ int pvr2_i2c_tuner_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
ctxt->client = cp;
ctxt->hdw = hdw;
cp->handler = &ctxt->i2c_handler;
+ pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x tuner handler set up",
+ cp->client->addr);
return !0;
}
diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
index 2e3f84cac..f4948a7a7 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: pvrusb2-video-v4l.c,v 1.9 2006/01/14 19:09:50 mcisely Exp $
+ * $Id: pvrusb2-video-v4l.c,v 1.10 2006/01/22 03:48:34 mcisely Exp $
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -190,10 +190,17 @@ static int decoder_is_tuned(struct pvr2_v4l_decoder *ctxt)
}
+static unsigned int decoder_describe(struct pvr2_v4l_decoder *ctxt,char *buf,unsigned int cnt)
+{
+ return scnprintf(buf,cnt,"handler: pvrusb2-video-v4l");
+}
+
+
const static struct pvr2_i2c_handler_functions hfuncs = {
.detach = (void (*)(void *))decoder_detach,
.check = (int (*)(void *))decoder_check,
.update = (void (*)(void *))decoder_update,
+ .describe = (unsigned int (*)(void *,char *,unsigned int))decoder_describe,
};
@@ -222,6 +229,8 @@ int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw,
sizeof(decoder_ops[0]))) - 1;
hdw->decoder_ctrl = &ctxt->ctrl;
cp->handler = &ctxt->handler;
+ pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x saa711x V4L2 handler set up",
+ cp->client->addr);
return !0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 00:27:25 +0000