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

Commit 15029b39 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9934): v4l2-compat32: add two additional #ifdef __OLD_VIDIOC_ lines 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 92f45bad

drivers/media/video/v4l2-compat-ioctl32.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -695,7 +695,9 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext 
#define VIDIOC_TRY_EXT_CTRLS32  _IOWR('V', 73, struct v4l2_ext_controls32)

#define VIDIOC_TRY_EXT_CTRLS32  _IOWR('V', 73, struct v4l2_ext_controls32)





#define VIDIOC_OVERLAY32	_IOW ('V', 14, s32)

#define VIDIOC_OVERLAY32	_IOW ('V', 14, s32)

#ifdef __OLD_VIDIOC_

#define VIDIOC_OVERLAY32_OLD	_IOWR('V', 14, s32)

#define VIDIOC_OVERLAY32_OLD	_IOWR('V', 14, s32)

#endif

#define VIDIOC_STREAMON32	_IOW ('V', 18, s32)

#define VIDIOC_STREAMON32	_IOW ('V', 18, s32)

#define VIDIOC_STREAMOFF32	_IOW ('V', 19, s32)

#define VIDIOC_STREAMOFF32	_IOW ('V', 19, s32)

#define VIDIOC_G_INPUT32	_IOR ('V', 38, s32)

#define VIDIOC_G_INPUT32	_IOR ('V', 38, s32)
@@ -753,7 +755,9 @@ static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg 
	case VIDIOC_S_EXT_CTRLS32: cmd = VIDIOC_S_EXT_CTRLS; break;

	case VIDIOC_S_EXT_CTRLS32: cmd = VIDIOC_S_EXT_CTRLS; break;

	case VIDIOC_TRY_EXT_CTRLS32: cmd = VIDIOC_TRY_EXT_CTRLS; break;

	case VIDIOC_TRY_EXT_CTRLS32: cmd = VIDIOC_TRY_EXT_CTRLS; break;

	case VIDIOC_OVERLAY32: cmd = VIDIOC_OVERLAY; break;

	case VIDIOC_OVERLAY32: cmd = VIDIOC_OVERLAY; break;

#ifdef __OLD_VIDIOC_

	case VIDIOC_OVERLAY32_OLD: cmd = VIDIOC_OVERLAY; break;

	case VIDIOC_OVERLAY32_OLD: cmd = VIDIOC_OVERLAY; break;

#endif

	case VIDIOC_STREAMON32: cmd = VIDIOC_STREAMON; break;

	case VIDIOC_STREAMON32: cmd = VIDIOC_STREAMON; break;

	case VIDIOC_STREAMOFF32: cmd = VIDIOC_STREAMOFF; break;

	case VIDIOC_STREAMOFF32: cmd = VIDIOC_STREAMOFF; break;

	case VIDIOC_G_INPUT32: cmd = VIDIOC_G_INPUT; break;

	case VIDIOC_G_INPUT32: cmd = VIDIOC_G_INPUT; break;