V4L/DVB (11207): pvrusb2: Add composite and s-video input support for OnAir devices (2a6b627f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/media/video/pvrusb2/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ pvrusb2-objs := pvrusb2-i2c-core.o \
		pvrusb2-ctrl.o pvrusb2-std.o pvrusb2-devattr.o \
		pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \
		pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \
		pvrusb2-cs53l32a.o \
		$(obj-pvrusb2-dvb-y) \
		$(obj-pvrusb2-sysfs-y) $(obj-pvrusb2-debugifc-y)

drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c

0 → 100644

+95 −0

Original line number	Diff line number	Diff line
		/*
		*
		*
		* Copyright (C) 2005 Mike Isely <isely@pobox.com>
		* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
		*
		* 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
		*
		*/

		/*

		This source file is specifically designed to interface with the
		v4l-dvb cs53l32a module.

		*/

		#include "pvrusb2-cs53l32a.h"


		#include "pvrusb2-hdw-internal.h"
		#include "pvrusb2-debug.h"
		#include <linux/videodev2.h>
		#include <media/v4l2-common.h>
		#include <linux/errno.h>
		#include <linux/slab.h>

		struct routing_scheme {
		const int *def;
		unsigned int cnt;
		};


		static const int routing_scheme1[] = {
		[PVR2_CVAL_INPUT_TV] = 2, /* 1 or 2 seems to work here */
		[PVR2_CVAL_INPUT_RADIO] = 2,
		[PVR2_CVAL_INPUT_COMPOSITE] = 0,
		[PVR2_CVAL_INPUT_SVIDEO] = 0,
		};

		static const struct routing_scheme routing_schemes[] = {
		[PVR2_ROUTING_SCHEME_ONAIR] = {
		.def = routing_scheme1,
		.cnt = ARRAY_SIZE(routing_scheme1),
		},
		};


		void pvr2_cs53l32a_subdev_update(struct pvr2_hdw hdw, struct v4l2_subdev sd)
		{
		if (hdw->input_dirty \|\| hdw->force_dirty) {
		struct v4l2_routing route;
		const struct routing_scheme *sp;
		unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
		pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
		hdw->input_val);
		if ((sid < ARRAY_SIZE(routing_schemes)) &&
		((sp = routing_schemes + sid) != NULL) &&
		(hdw->input_val >= 0) &&
		(hdw->input_val < sp->cnt)) {
		route.input = sp->def[hdw->input_val];
		} else {
		pvr2_trace(PVR2_TRACE_ERROR_LEGS,
		"* WARNING * subdev v4l2 set_input:"
		" Invalid routing scheme (%u)"
		" and/or input (%d)",
		sid, hdw->input_val);
		return;
		}
		route.output = 0;
		sd->ops->audio->s_routing(sd, &route);
		}
		}


		/*
		Stuff for Emacs to see, in order to encourage consistent editing style:
		* Local Variables: *
		* mode: c *
		* fill-column: 70 *
		* tab-width: 8 *
		* c-basic-offset: 8 *
		* End: *
		*/

drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		/*
		*
		*
		* Copyright (C) 2005 Mike Isely <isely@pobox.com>
		* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
		*
		* 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
		*
		*/

		#ifndef __PVRUSB2_CS53L32A_H
		#define __PVRUSB2_CS53L32A_H

		/*

		This module connects the pvrusb2 driver to the I2C chip level
		driver which handles device video processing. This interface is
		used internally by the driver; higher level code should only
		interact through the interface provided by pvrusb2-hdw.h.

		*/


		#include "pvrusb2-hdw-internal.h"
		void pvr2_cs53l32a_subdev_update(struct pvr2_hdw , struct v4l2_subdev );

		#endif /* __PVRUSB2_AUDIO_CS53L32A_H */

		/*
		Stuff for Emacs to see, in order to encourage consistent editing style:
		* Local Variables: *
		* mode: c *
		* fill-column: 70 *
		* tab-width: 8 *
		* c-basic-offset: 8 *
		* End: *
		*/

drivers/media/video/pvrusb2/pvrusb2-devattr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = {
		.flag_has_composite = !0,
		.flag_has_svideo = !0,
		.flag_digital_requires_cx23416 = !0,
		.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
		.signal_routing_scheme = PVR2_ROUTING_SCHEME_ONAIR,
		.digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR,
		.default_std_mask = V4L2_STD_NTSC_M,
		#ifdef CONFIG_VIDEO_PVRUSB2_DVB
		@@ -265,7 +265,7 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
		.flag_has_composite = !0,
		.flag_has_svideo = !0,
		.flag_digital_requires_cx23416 = !0,
		.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
		.signal_routing_scheme = PVR2_ROUTING_SCHEME_ONAIR,
		.digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR,
		.default_std_mask = V4L2_STD_NTSC_M,
		#ifdef CONFIG_VIDEO_PVRUSB2_DVB

drivers/media/video/pvrusb2/pvrusb2-devattr.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ struct pvr2_string_table {

		#define PVR2_ROUTING_SCHEME_HAUPPAUGE 0
		#define PVR2_ROUTING_SCHEME_GOTVIEW 1
		#define PVR2_ROUTING_SCHEME_ONAIR 2

		#define PVR2_DIGITAL_SCHEME_NONE 0
		#define PVR2_DIGITAL_SCHEME_HAUPPAUGE 1