Commit 30c48305 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (4357): V4L2 conversion: radio-typhoon 



Driver conversion to V4L2 API.
Require some testing, since this obsolete hardware is not
common those days.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 55ac7b69

drivers/media/radio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ config RADIO_TRUST_PORT 


config RADIO_TYPHOON

	tristate "Typhoon Radio (a.k.a. EcoRadio)"

	depends on ISA && VIDEO_V4L1

	depends on ISA && VIDEO_V4L2

	---help---

	  Choose Y here if you have one of these FM radio cards, and then fill

	  in the port address and the frequency used for muting below.

drivers/media/radio/radio-typhoon.c

+116 −54
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
 * value where I do expect just noise and turn the speaker volume down.

 * The frequency change is necessary since the card never seems to be

 * completely silent.

 *

 * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>

 */



#include <linux/module.h>	/* Modules                        */
@@ -35,10 +37,32 @@ 
#include <linux/proc_fs.h>	/* radio card status report	  */

#include <asm/io.h>		/* outb, outb_p                   */

#include <asm/uaccess.h>	/* copy to/from user              */

#include <linux/videodev.h>	/* kernel radio structs           */

#include <linux/videodev2.h>	/* kernel radio structs           */

#include <media/v4l2-common.h>



#define BANNER "Typhoon Radio Card driver v0.1\n"

#include <linux/version.h>      /* for KERNEL_VERSION MACRO     */

#define RADIO_VERSION KERNEL_VERSION(0,1,1)

#define BANNER "Typhoon Radio Card driver v0.1.1\n"



static struct v4l2_queryctrl radio_qctrl[] = {

	{

		.id            = V4L2_CID_AUDIO_MUTE,

		.name          = "Mute",

		.minimum       = 0,

		.maximum       = 1,

		.default_value = 1,

		.type          = V4L2_CTRL_TYPE_BOOLEAN,

	},{

		.id            = V4L2_CID_AUDIO_VOLUME,

		.name          = "Volume",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 1<<14,

		.default_value = 0xff,

		.type          = V4L2_CTRL_TYPE_INTEGER,

	}

};





#ifndef CONFIG_RADIO_TYPHOON_PORT

#define CONFIG_RADIO_TYPHOON_PORT -1
@@ -170,76 +194,114 @@ static int typhoon_do_ioctl(struct inode *inode, struct file *file, 
	struct typhoon_device *typhoon = dev->priv;



	switch (cmd) {

	case VIDIOCGCAP:

		case VIDIOC_QUERYCAP:

		{

			struct video_capability *v = arg;

			struct v4l2_capability *v = arg;

			memset(v,0,sizeof(*v));

			v->type = VID_TYPE_TUNER;

			v->channels = 1;

			v->audios = 1;

			strcpy(v->name, "Typhoon Radio");

			strlcpy(v->driver, "radio-typhoon", sizeof (v->driver));

			strlcpy(v->card, "Typhoon Radio", sizeof (v->card));

			sprintf(v->bus_info,"ISA");

			v->version = RADIO_VERSION;

			v->capabilities = V4L2_CAP_TUNER;



			return 0;

		}

	case VIDIOCGTUNER:

		case VIDIOC_G_TUNER:

		{

			struct video_tuner *v = arg;

			if (v->tuner)	/* Only 1 tuner */

			struct v4l2_tuner *v = arg;



			if (v->index > 0)

				return -EINVAL;

			v->rangelow = 875 * 1600;

			v->rangehigh = 1080 * 1600;

			v->flags = VIDEO_TUNER_LOW;

			v->mode = VIDEO_MODE_AUTO;

			v->signal = 0xFFFF;	/* We can't get the signal strength */



			memset(v,0,sizeof(*v));

			strcpy(v->name, "FM");

			v->type = V4L2_TUNER_RADIO;



			v->rangelow=(87.5*16000);

			v->rangehigh=(108*16000);

			v->rxsubchans =V4L2_TUNER_SUB_MONO;

			v->capability=V4L2_TUNER_CAP_LOW;

			v->audmode = V4L2_TUNER_MODE_MONO;

			v->signal = 0xFFFF;	/* We can't get the signal strength */



			return 0;

		}

	case VIDIOCSTUNER:

		case VIDIOC_S_TUNER:

		{

			struct video_tuner *v = arg;

			if (v->tuner != 0)

			struct v4l2_tuner *v = arg;



			if (v->index > 0)

				return -EINVAL;

			/* Only 1 tuner so no setting needed ! */



			return 0;

		}

	case VIDIOCGFREQ:

		case VIDIOC_S_FREQUENCY:

		{

		unsigned long *freq = arg;

		*freq = typhoon->curfreq;

			struct v4l2_frequency *f = arg;



			typhoon->curfreq = f->frequency;

			typhoon_setfreq(typhoon, typhoon->curfreq);

			return 0;

		}

	case VIDIOCSFREQ:

		case VIDIOC_G_FREQUENCY:

		{

		unsigned long *freq = arg;

		typhoon->curfreq = *freq;

		typhoon_setfreq(typhoon, typhoon->curfreq);

			struct v4l2_frequency *f = arg;



			f->type = V4L2_TUNER_RADIO;

			f->frequency = typhoon->curfreq;



			return 0;

		}

	case VIDIOCGAUDIO:

		case VIDIOC_QUERYCTRL:

		{

			struct video_audio *v = arg;

			memset(v, 0, sizeof(*v));

			v->flags |= VIDEO_AUDIO_MUTABLE | VIDEO_AUDIO_VOLUME;

			v->mode |= VIDEO_SOUND_MONO;

			v->volume = typhoon->curvol;

			v->step = 1 << 14;

			strcpy(v->name, "Typhoon Radio");

			return 0;

			struct v4l2_queryctrl *qc = arg;

			int i;



			for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {

				if (qc->id && qc->id == radio_qctrl[i].id) {

					memcpy(qc, &(radio_qctrl[i]),

								sizeof(*qc));

					return (0);

				}

	case VIDIOCSAUDIO:

			}

			return -EINVAL;

		}

		case VIDIOC_G_CTRL:

		{

			struct video_audio *v = arg;

			if (v->audio)

			struct v4l2_control *ctrl= arg;



			switch (ctrl->id) {

				case V4L2_CID_AUDIO_MUTE:

					ctrl->value=typhoon->muted;

					return (0);

				case V4L2_CID_AUDIO_VOLUME:

					ctrl->value=typhoon->curvol;

					return (0);

			}

			return -EINVAL;

			if (v->flags & VIDEO_AUDIO_MUTE)

		}

		case VIDIOC_S_CTRL:

		{

			struct v4l2_control *ctrl= arg;



			switch (ctrl->id) {

				case V4L2_CID_AUDIO_MUTE:

					if (ctrl->value) {

						typhoon_mute(typhoon);

			else

					} else {

						typhoon_unmute(typhoon);

			if (v->flags & VIDEO_AUDIO_VOLUME)

				typhoon_setvol(typhoon, v->volume);

			return 0;

					}

					return (0);

				case V4L2_CID_AUDIO_VOLUME:

					typhoon_setvol(typhoon, ctrl->value);

					return (0);

			}

			return -EINVAL;

		}



		default:

		return -ENOIOCTLCMD;

			return v4l_compat_translate_ioctl(inode,file,cmd,arg,

							  typhon_do_ioctl);

	}

}
@@ -270,7 +332,7 @@ static struct video_device typhoon_radio = 
	.owner		= THIS_MODULE,

	.name		= "Typhoon Radio",

	.type		= VID_TYPE_TUNER,

	.hardware	= VID_HARDWARE_TYPHOON,

	.hardware	= 0,

	.fops           = &typhoon_fops,

};