On 01/15/14 12:36, Jianle Wang wrote:
> Hi Hans:
> Thanks for your help. It can work at my side.
>
> BTW: There is a warning during compiling
> drivers/media/v4l2-core/v4l2-subdev.c: In function 'subdev_compat_ioctl32':
> drivers/media/v4l2-core/v4l2-subdev.c:379:2: warning: passing argument
> 3 of 'sd->ops->core->compat_ioctl32' makes pointer from integer
> without a cast [enabled by default]
> drivers/media/v4l2-core/v4l2-subdev.c:379:2: note: expected 'void *'
> but argument is of type 'long unsigned int'
Just replace this:
return v4l2_subdev_call(sd, core, compat_ioctl32, cmd, arg);
by:
return v4l2_subdev_call(sd, core, compat_ioctl32, cmd, (void *)arg);
Alternatively, change the type of arg to unsigned long in v4l2-subdev.h.
I'm not sure what is easier.
Regards,
Hans
>
> 2014/1/15 Hans Verkuil <hverkuil@xxxxxxxxx>:
>> On 01/15/14 09:02, Jianle Wang wrote:
>>> Hi Hans:
>>> Thanks for your patch.
>>> How do we handle the private ioctl defined in struct v4l2_subdev_core.ioctl?
>>> These ioctls are also not supported for compat_ioctl.
>>
>> There is currently no support for that, but try the patch below. That should
>> allow you to add compat_ioctl32 support for your custom ioctls.
>>
>> Regards,
>>
>> Hans
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>>
>> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
>> index 996c248..60d2550 100644
>> --- a/drivers/media/v4l2-core/v4l2-subdev.c
>> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
>> @@ -368,6 +368,17 @@ static long subdev_ioctl(struct file *file, unsigned int cmd,
>> return video_usercopy(file, cmd, arg, subdev_do_ioctl);
>> }
>>
>> +#ifdef CONFIG_COMPAT
>> +static long subdev_compat_ioctl32(struct file *file, unsigned int cmd,
>> + unsigned long arg)
>> +{
>> + struct video_device *vdev = video_devdata(file);
>> + struct v4l2_subdev *sd = vdev_to_v4l2_subdev(vdev);
>> +
>> + return v4l2_subdev_call(sd, core, compat_ioctl32, cmd, arg);
>> +}
>> +#endif
>> +
>> static unsigned int subdev_poll(struct file *file, poll_table *wait)
>> {
>> struct video_device *vdev = video_devdata(file);
>> @@ -389,6 +400,9 @@ const struct v4l2_file_operations v4l2_subdev_fops = {
>> .owner = THIS_MODULE,
>> .open = subdev_open,
>> .unlocked_ioctl = subdev_ioctl,
>> +#ifdef CONFIG_COMPAT
>> + .compat_ioctl32 = subdev_compat_ioctl32,
>> +#endif
>> .release = subdev_close,
>> .poll = subdev_poll,
>> };
>> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
>> index d67210a..3fd91a5 100644
>> --- a/include/media/v4l2-subdev.h
>> +++ b/include/media/v4l2-subdev.h
>> @@ -162,6 +162,9 @@ struct v4l2_subdev_core_ops {
>> int (*g_std)(struct v4l2_subdev *sd, v4l2_std_id *norm);
>> int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
>> long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
>> +#ifdef CONFIG_COMPAT
>> + long (*compat_ioctl32)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
>> +#endif
>> #ifdef CONFIG_VIDEO_ADV_DEBUG
>> int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
>> int (*s_register)(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg);
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
