Hi Hans, On Thu, Aug 15, 2019 at 03:23:47PM +0200, Hans Verkuil wrote: > On 8/14/19 10:28 PM, Jacopo Mondi wrote: > > Add support for the newly defined V4L2_CID_LOCATION read-only control > > used to report the camera device mounting position. > > > > Signed-off-by: Jacopo Mondi <[email protected]> > > --- > > drivers/media/v4l2-core/v4l2-ctrls.c | 7 +++++++ > > include/uapi/linux/v4l2-controls.h | 4 ++++ > > 2 files changed, 11 insertions(+) > > > > diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c > > b/drivers/media/v4l2-core/v4l2-ctrls.c > > index 7d3a33258748..8ab0857df59a 100644 > > --- a/drivers/media/v4l2-core/v4l2-ctrls.c > > +++ b/drivers/media/v4l2-core/v4l2-ctrls.c > > @@ -943,6 +943,7 @@ const char *v4l2_ctrl_get_name(u32 id) > > case V4L2_CID_AUTO_FOCUS_RANGE: return "Auto Focus, Range"; > > case V4L2_CID_PAN_SPEED: return "Pan, Speed"; > > case V4L2_CID_TILT_SPEED: return "Tilt, Speed"; > > + case V4L2_CID_LOCATION: return "Location"; > > > > /* FM Radio Modulator controls */ > > /* Keep the order of the 'case's the same as in v4l2-controls.h! */ > > @@ -1300,6 +1301,12 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum > > v4l2_ctrl_type *type, > > break; > > case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS: > > *type = V4L2_CTRL_TYPE_FWHT_PARAMS; > > Missing break! >
Sorry, this was a trivial mistake. Thanks for spotting!
> Regards,
>
> Hans
>
> > + case V4L2_CID_LOCATION:
> > + *type = V4L2_CTRL_TYPE_INTEGER;
> > + *flags |= V4L2_CTRL_FLAG_READ_ONLY;
> > + *min = V4L2_LOCATION_FRONT;
> > + *max = V4L2_LOCATION_BACK;
> > + *step = 1;
> > break;
> > default:
> > *type = V4L2_CTRL_TYPE_INTEGER;
> > diff --git a/include/uapi/linux/v4l2-controls.h
> > b/include/uapi/linux/v4l2-controls.h
> > index 37807f23231e..5c4c7b245921 100644
> > --- a/include/uapi/linux/v4l2-controls.h
> > +++ b/include/uapi/linux/v4l2-controls.h
> > @@ -889,6 +889,10 @@ enum v4l2_auto_focus_range {
> > #define V4L2_CID_PAN_SPEED (V4L2_CID_CAMERA_CLASS_BASE+32)
> > #define V4L2_CID_TILT_SPEED
> > (V4L2_CID_CAMERA_CLASS_BASE+33)
> >
> > +#define V4L2_CID_LOCATION (V4L2_CID_CAMERA_CLASS_BASE+34)
> > +#define V4L2_LOCATION_FRONT (0 << 0)
> > +#define V4L2_LOCATION_BACK (1 << 0)
> > +
> > /* FM Modulator class control IDs */
> >
> > #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900)
> >
>
signature.asc
Description: PGP signature
