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

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

V4L/DVB (9484): v4l: rename compat_ioctl32.c to v4l2-compat-ioctl32.c 



All core v4l sources should start with 'v4l2-'
This file was the last one for which this was not the case.

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

drivers/media/video/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ stkwebcam-objs := stk-webcam.o stk-sensor.o 


videodev-objs	:=	v4l2-dev.o v4l2-ioctl.o



obj-$(CONFIG_VIDEO_DEV) += videodev.o compat_ioctl32.o v4l2-int-device.o

obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-compat-ioctl32.o v4l2-int-device.o



obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o

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

+42 −50
Original line number Diff line number Diff line
@@ -143,14 +143,12 @@ static int put_video_window32(struct video_window *kp, struct video_window32 __u 
}

#endif



struct v4l2_clip32

{

struct v4l2_clip32 {

	struct v4l2_rect        c;

	compat_caddr_t 		next;

};



struct v4l2_window32

{

struct v4l2_window32 {

	struct v4l2_rect        w;

	enum v4l2_field  	field;

	__u32			chromakey;
@@ -231,15 +229,13 @@ static inline int put_v4l2_vbi_format(struct v4l2_vbi_format *kp, struct v4l2_vb 
	return 0;

}



struct v4l2_format32

{

struct v4l2_format32 {

	enum v4l2_buf_type type;

	union

	{

		struct v4l2_pix_format	pix;  // V4L2_BUF_TYPE_VIDEO_CAPTURE

		struct v4l2_window32	win;  // V4L2_BUF_TYPE_VIDEO_OVERLAY

		struct v4l2_vbi_format	vbi;  // V4L2_BUF_TYPE_VBI_CAPTURE

		__u8	raw_data[200];        // user-defined

	union {

		struct v4l2_pix_format	pix;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE */

		struct v4l2_window32	win;  /* V4L2_BUF_TYPE_VIDEO_OVERLAY */

		struct v4l2_vbi_format	vbi;  /* V4L2_BUF_TYPE_VBI_CAPTURE */

		__u8	raw_data[200];        /* user-defined */

	} fmt;

};
@@ -256,7 +252,7 @@ static int get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user 
	case V4L2_BUF_TYPE_VBI_CAPTURE:

		return get_v4l2_vbi_format(&kp->fmt.vbi, &up->fmt.vbi);

	default:

		printk("compat_ioctl : unexpected VIDIOC_FMT type %d\n",

		printk(KERN_INFO "compat_ioctl: unexpected VIDIOC_FMT type %d\n",

								kp->type);

		return -ENXIO;

	}
@@ -294,8 +290,7 @@ static inline int put_v4l2_standard(struct v4l2_standard *kp, struct v4l2_standa 
	return 0;

}



struct v4l2_standard32

{

struct v4l2_standard32 {

	__u32		     index;

	__u32		     id[2]; /* __u64 would get the alignment wrong */

	__u8		     name[24];
@@ -341,8 +336,7 @@ static inline int put_v4l2_tuner(struct v4l2_tuner *kp, struct v4l2_tuner __user 
	return 0;

}



struct v4l2_buffer32

{

struct v4l2_buffer32 {

	__u32			index;

	enum v4l2_buf_type      type;

	__u32			bytesused;
@@ -431,8 +425,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user 
	return 0;

}



struct v4l2_framebuffer32

{

struct v4l2_framebuffer32 {

	__u32			capability;

	__u32			flags;

	compat_caddr_t 		base;
@@ -495,8 +488,7 @@ static inline int put_v4l2_input(struct v4l2_input *kp, struct v4l2_input __user 
}



#ifdef CONFIG_VIDEO_V4L1_COMPAT

struct video_code32

{

struct video_code32 {

	char		loadwhat[16];	/* name or tag of file being passed */

	compat_int_t	datasize;

	unsigned char	*data;
@@ -525,7 +517,7 @@ static inline int microcode32(struct video_code *kp, struct video_code32 __user 
#endif



/* VIDIOC_ENUMINPUT32 is VIDIOC_ENUMINPUT minus 4 bytes of padding alignement */

#define VIDIOC_ENUMINPUT32	VIDIOC_ENUMINPUT - _IOC(0, 0, 0, 4)

#define VIDIOC_ENUMINPUT32	(VIDIOC_ENUMINPUT - _IOC(0, 0, 0, 4))

#define VIDIOC_G_FMT32		_IOWR ('V',  4, struct v4l2_format32)

#define VIDIOC_S_FMT32		_IOWR ('V',  5, struct v4l2_format32)

#define VIDIOC_QUERYBUF32	_IOWR ('V',  9, struct v4l2_buffer32)