From b14f71c46ef88934d27e315739528fb38dfaf238 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Wed, 22 Feb 2006 23:18:23 -0600 Subject: Unexpand all the $Id$ keywords in pvrusb2. From: Mike Isely The $Id$ keywords present in the pvrusb2 driver reflect information from the old SCM, useless here. For now, undo all the expansions. Signed-off-by: Mike Isely --- v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c') diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c index ff8d38063..6faff5276 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-i2c-chips-v4l2.c,v 1.3 2006/01/22 03:55:03 mcisely Exp $ + * $Id$ * * Copyright (C) 2005 Mike Isely * -- cgit v1.2.3 From eb9221b1b87ce87b3d22458d78fa0b6d2dd848c7 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Wed, 22 Feb 2006 23:47:36 -0600 Subject: Implement LOG_STATUS in pvrusb2 From: Mike Isely Implement VIDIOC_LOG_STATUS ioctl() to the application. Implement generation of VIDIOC_LOG_STATUS to the modules. Implement trigger of VIDIOC_LOG_STATUS from sysfs when user cats a few key files, to help with debugging. Signed-off-by: Mike Isely --- v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c') diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c index 6faff5276..2d97653d5 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c @@ -37,6 +37,7 @@ #define OP_FREQ 3 #define OP_AUDIORATE 4 #define OP_SIZE 5 +#define OP_LOG 6 static const struct pvr2_i2c_op * const ops[] = { [OP_STANDARD] = &pvr2_i2c_op_v4l2_standard, @@ -44,6 +45,7 @@ static const struct pvr2_i2c_op * const ops[] = { [OP_VOLUME] = &pvr2_i2c_op_v4l2_volume, [OP_FREQ] = &pvr2_i2c_op_v4l2_frequency, [OP_SIZE] = &pvr2_i2c_op_v4l2_size, + [OP_LOG] = &pvr2_i2c_op_v4l2_log, }; void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) @@ -54,7 +56,8 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) (1 << OP_BCSH) | (1 << OP_VOLUME) | (1 << OP_FREQ) | - (1 << OP_SIZE)); + (1 << OP_SIZE) | + (1 << OP_LOG)); if (id == I2C_DRIVERID_MSP3400) { if (pvr2_i2c_msp3400_setup(hdw,cp)) { -- cgit v1.2.3 From 95b46b95fbbd8226ebaccd556a541aeb061aa980 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 26 Feb 2006 00:55:22 -0400 Subject: moved pvrusb2 driver into the kernel tree From: Michael Krufky Signed-off-by: Michael Krufky --- v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 102 ---------------------- 1 file changed, 102 deletions(-) delete mode 100644 v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c (limited to 'v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c') diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c deleted file mode 100644 index 2d97653d5..000000000 --- a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * - * $Id$ - * - * Copyright (C) 2005 Mike Isely - * - * 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 - * - * 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 "compat.h" -#include "pvrusb2-i2c-core.h" -#include "pvrusb2-hdw-internal.h" -#include "pvrusb2-debug.h" -#include "pvrusb2-i2c-cmd-v4l2.h" -#include "pvrusb2-audio.h" -#include "pvrusb2-tuner.h" -#include "pvrusb2-demod.h" -#include "pvrusb2-video-v4l.h" - -#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__) - -#define OP_STANDARD 0 -#define OP_BCSH 1 -#define OP_VOLUME 2 -#define OP_FREQ 3 -#define OP_AUDIORATE 4 -#define OP_SIZE 5 -#define OP_LOG 6 - -static const struct pvr2_i2c_op * const ops[] = { - [OP_STANDARD] = &pvr2_i2c_op_v4l2_standard, - [OP_BCSH] = &pvr2_i2c_op_v4l2_bcsh, - [OP_VOLUME] = &pvr2_i2c_op_v4l2_volume, - [OP_FREQ] = &pvr2_i2c_op_v4l2_frequency, - [OP_SIZE] = &pvr2_i2c_op_v4l2_size, - [OP_LOG] = &pvr2_i2c_op_v4l2_log, -}; - -void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) -{ - int id; - id = cp->client->driver->id; - cp->ctl_mask = ((1 << OP_STANDARD) | - (1 << OP_BCSH) | - (1 << OP_VOLUME) | - (1 << OP_FREQ) | - (1 << OP_SIZE) | - (1 << OP_LOG)); - - if (id == I2C_DRIVERID_MSP3400) { - if (pvr2_i2c_msp3400_setup(hdw,cp)) { - return; - } - } - if (id == I2C_DRIVERID_TUNER) { - if (pvr2_i2c_tuner_setup(hdw,cp)) { - return; - } - } - if (id == I2C_DRIVERID_SAA711X) { - if (pvr2_i2c_decoder_v4l_setup(hdw,cp)) { - return; - } - } -#ifdef PVR2_ENABLE_DRIVERID_TDA9887 - if (id == I2C_DRIVERID_TDA9887) { - if (pvr2_i2c_demod_setup(hdw,cp)) { - return; - } - } -#endif -} - - -const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx) -{ - if (idx >= sizeof(ops)/sizeof(ops[0])) return 0; - return ops[idx]; -} - - -/* - Stuff for Emacs to see, in order to encourage consistent editing style: - *** Local Variables: *** - *** mode: c *** - *** fill-column: 75 *** - *** tab-width: 8 *** - *** c-basic-offset: 8 *** - *** End: *** - */ -- cgit v1.2.3