Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 985bc96e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (4343): Fix for compilation without V4L1 or V4L1_COMPAT 



Removed usage of HAVE_V4L1
Including videodev.h will just include videodev2.h if V4L1 is not supported
V4L1 code at core drivers will honor CONFIG_V4L1_COMPAT stuff

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

drivers/media/video/cx88/cx88-video.c

+2 −2
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, 
		struct v4l2_format *f = arg;

		return cx8800_try_fmt(dev,fh,f);

	}

#ifdef HAVE_V4L1

#ifdef CONFIG_V4L1_COMPAT

	/* --- streaming capture ------------------------------------- */

	case VIDIOCGMBUF:

	{
@@ -1585,7 +1585,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, 
		*id = 0;

		return 0;

	}

#ifdef HAVE_V4L1

#ifdef CONFIG_V4L1_COMPAT

	case VIDIOCSTUNER:

	{

		struct video_tuner *v = arg;

drivers/media/video/msp3400-driver.c

+9 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ int msp_sleep(struct msp_state *state, int timeout) 
}



/* ------------------------------------------------------------------------ */



#ifdef CONFIG_VIDEO_V4L1

static int msp_mode_v4l2_to_v4l1(int rxsubchans, int audmode)

{

	if (rxsubchans == V4L2_TUNER_SUB_MONO)
@@ -384,6 +384,7 @@ static int msp_mode_v4l1_to_v4l2(int mode) 
		return V4L2_TUNER_MODE_LANG1;

	return V4L2_TUNER_MODE_MONO;

}

#endif



static int msp_get_ctrl(struct i2c_client *client, struct v4l2_control *ctrl)

{
@@ -509,6 +510,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) 
	/* --- v4l ioctls --- */

	/* take care: bttv does userspace copying, we'll get a

	   kernel pointer here... */

#ifdef CONFIG_VIDEO_V4L1

	case VIDIOCGAUDIO:

	{

		struct video_audio *va = arg;
@@ -577,6 +579,12 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) 
	}



	case VIDIOCSFREQ:

	{

		/* new channel -- kick audio carrier scan */

		msp_wake_thread(client);

		break;

	}

#endif

	case VIDIOC_S_FREQUENCY:

	{

		/* new channel -- kick audio carrier scan */

drivers/media/video/saa7134/saa7134-video.c

+1 −1
Original line number Diff line number Diff line
@@ -2087,7 +2087,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, 
		struct v4l2_format *f = arg;

		return saa7134_try_fmt(dev,fh,f);

	}

#ifdef HAVE_V4L1

#ifdef CONFIG_V4L1_COMPAT

	case VIDIOCGMBUF:

	{

		struct video_mbuf *mbuf = arg;

drivers/media/video/tuner-core.c

+12 −11
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		if (t->standby)

			t->standby (client);

		break;

#ifdef CONFIG_VIDEO_V4L1

	case VIDIOCSAUDIO:

		if (check_mode(t, "VIDIOCSAUDIO") == EINVAL)

			return 0;
@@ -599,17 +600,6 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		/* Should be implemented, since bttv calls it */

		tuner_dbg("VIDIOCSAUDIO not implemented.\n");

		break;

	case TDA9887_SET_CONFIG:

		if (t->type == TUNER_TDA9887) {

			int *i = arg;



			t->tda9887_config = *i;

			set_freq(client, t->tv_freq);

		}

		break;

	/* --- v4l ioctls --- */

	/* take care: bttv does userspace copying, we'll get a

	   kernel pointer here... */

	case VIDIOCSCHAN:

		{

			static const v4l2_std_id map[] = {
@@ -693,7 +683,18 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
				    ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;

			return 0;

		}

#endif

	case TDA9887_SET_CONFIG:

		if (t->type == TUNER_TDA9887) {

			int *i = arg;



			t->tda9887_config = *i;

			set_freq(client, t->tv_freq);

		}

		break;

	/* --- v4l ioctls --- */

	/* take care: bttv does userspace copying, we'll get a

	   kernel pointer here... */

	case VIDIOC_S_STD:

		{

			v4l2_std_id *id = arg;

drivers/media/video/v4l2-common.c

+14 −10
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static char *v4l2_memory_names[] = { 
/* ------------------------------------------------------------------ */

/* debug help functions                                               */



#ifdef HAVE_V4L1

#ifdef CONFIG_V4L1_COMPAT

static const char *v4l1_ioctls[] = {

	[_IOC_NR(VIDIOCGCAP)]       = "VIDIOCGCAP",

	[_IOC_NR(VIDIOCGCHAN)]      = "VIDIOCGCHAN",
@@ -301,7 +301,7 @@ static const char *v4l2_ioctls[] = { 
#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)



static const char *v4l2_int_ioctls[] = {

#ifdef HAVE_VIDEO_DECODER

#ifdef CONFIG_V4L1_COMPAT

	[_IOC_NR(DECODER_GET_CAPABILITIES)]    = "DECODER_GET_CAPABILITIES",

	[_IOC_NR(DECODER_GET_STATUS)]          = "DECODER_GET_STATUS",

	[_IOC_NR(DECODER_SET_NORM)]            = "DECODER_SET_NORM",
@@ -367,7 +367,7 @@ void v4l_printk_ioctl(unsigned int cmd) 
		       (_IOC_NR(cmd) < V4L2_INT_IOCTLS) ?

		       v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);

		break;

#ifdef HAVE_V4L1

#ifdef CONFIG_V4L1_COMPAT

	case 'v':

		printk("v4l1 ioctl %s, dir=%s (0x%08x)\n",

		       (_IOC_NR(cmd) < V4L1_IOCTLS) ?
@@ -414,6 +414,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg) 
		printk ("%s: tuner type=%d\n", s, *p);

		break;

	}

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	case DECODER_SET_VBI_BYPASS:

	case DECODER_ENABLE_OUTPUT:

	case DECODER_GET_STATUS:
@@ -424,6 +425,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg) 
	case VIDIOCCAPTURE:

	case VIDIOCSYNC:

	case VIDIOCSWRITEMODE:

#endif

	case TUNER_SET_TYPE_ADDR:

	case TUNER_SET_STANDBY:

	case TDA9887_SET_CONFIG:
@@ -755,6 +757,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg) 
				p->afc);

		break;

	}

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	case VIDIOCGVBIFMT:

	case VIDIOCSVBIFMT:

	{
@@ -924,6 +927,14 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg) 
				p->clipcount);

		break;

	}

	case VIDIOCGFREQ:

	case VIDIOCSFREQ:

	{

		unsigned long *p=arg;

		printk ("%s: value=%lu\n", s, *p);

		break;

	}

#endif

	case VIDIOC_INT_AUDIO_CLOCK_FREQ:

	case VIDIOC_INT_I2S_CLOCK_FREQ:

	case VIDIOC_INT_S_STANDBY:
@@ -933,13 +944,6 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg) 
		printk ("%s: value=%d\n", s, *p);

		break;

	}

	case VIDIOCGFREQ:

	case VIDIOCSFREQ:

	{

		unsigned long *p=arg;

		printk ("%s: value=%lu\n", s, *p);

		break;

	}

	case VIDIOC_G_STD:

	case VIDIOC_S_STD:

	case VIDIOC_QUERYSTD: