On Tue 26 February 2013 23:21:19 Sylwester Nawrocki wrote:
> Hi Hans,
>
> On 02/26/2013 06:35 PM, Hans Verkuil wrote:
> > diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
> > index dcd6374..f6ba2fc 100644
> > --- a/include/uapi/linux/v4l2-controls.h
> > +++ b/include/uapi/linux/v4l2-controls.h
> > @@ -146,6 +146,10 @@ enum v4l2_colorfx {
> > * of controls. We reserve 16 controls for this driver. */
> > #define V4L2_CID_USER_MEYE_BASE (V4L2_CID_USER_BASE + 0x1000)
>
> I couldn't find a patch adding this hunk in my e-mail archive so I'm
> commenting here. Shouldn't V4L2_CID_USER_MEYE_BASE start at a higher value,
> e.g. (V4L2_CID_USER_BASE + 0x1010) to account for drivers that already
> use private controls ? There is couple of them with a few control IDs
> starting at V4L2_CID_USER_BASE.
Private controls always had overlapping IDs. During one of the mini-summits
last year we decided to change that so they all had their own ID. The meye
driver is one of the first to have a proper range defined, eventually all
other drivers that have private controls will be added there. That includes
those you found with grep.
So give me time and it will all be fixed :-)
Regards,
Hans
>
> $ git grep V4L2_CID_USER_BASE
>
> drivers/media/i2c/mt9p031.c:#define V4L2_CID_BLC_AUTO
> (V4L2_CID_USER_BASE | 0x1002)
> drivers/media/i2c/mt9p031.c:#define V4L2_CID_BLC_TARGET_LEVEL
> (V4L2_CID_USER_BASE | 0x1003)
> drivers/media/i2c/mt9p031.c:#define V4L2_CID_BLC_ANALOG_OFFSET
> (V4L2_CID_USER_BASE | 0x1004)
> drivers/media/i2c/mt9p031.c:#define V4L2_CID_BLC_DIGITAL_OFFSET
> (V4L2_CID_USER_BASE | 0x1005)
> drivers/media/i2c/mt9t001.c:#define V4L2_CID_TEST_PATTERN_COLOR
> (V4L2_CID_USER_BASE | 0x1001)
> drivers/media/i2c/mt9t001.c:#define V4L2_CID_BLACK_LEVEL_AUTO
> (V4L2_CID_USER_BASE | 0x1002)
> drivers/media/i2c/mt9t001.c:#define V4L2_CID_BLACK_LEVEL_OFFSET
> (V4L2_CID_USER_BASE | 0x1003)
> drivers/media/i2c/mt9t001.c:#define V4L2_CID_BLACK_LEVEL_CALIBRATE
> (V4L2_CID_USER_BASE | 0x1004)
> drivers/media/i2c/mt9v032.c:#define V4L2_CID_TEST_PATTERN_COLOR
> (V4L2_CID_USER_BASE | 0x1001)
> drivers/media/platform/mem2mem_testdev.c:#define
> V4L2_CID_TRANS_TIME_MSEC (V4L2_CID_USER_BASE + 0x1000)
> drivers/media/platform/mem2mem_testdev.c:#define V4L2_CID_TRANS_NUM_BUFS
> (V4L2_CID_USER_BASE + 0x1001)
> drivers/media/platform/vivi.c:#define VIVI_CID_CUSTOM_BASE
> (V4L2_CID_USER_BASE | 0xf000)
> drivers/media/usb/cpia2/cpia2_v4l.c:#define CPIA2_CID_USB_ALT
> (V4L2_CID_USER_BASE | 0xf000)
> drivers/media/usb/pwc/pwc-v4l.c:#define PWC_CID_CUSTOM(ctrl)
> ((V4L2_CID_USER_BASE | 0xf000) + custom_ ## ctrl)
> drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h:#define
> VPFE_ISIF_CID_CRGAIN (V4L2_CID_USER_BASE | 0xa001)
> drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h:#define
> VPFE_ISIF_CID_CGRGAIN (V4L2_CID_USER_BASE | 0xa002)
> drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h:#define
> VPFE_ISIF_CID_CGBGAIN (V4L2_CID_USER_BASE | 0xa003)
> drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h:#define
> VPFE_ISIF_CID_CBGAIN (V4L2_CID_USER_BASE | 0xa004)
> drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h:#define
> VPFE_ISIF_CID_GAIN_OFFSET (V4L2_CID_USER_BASE | 0xa005)
> drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h:#define
> VPFE_CID_DPCM_PREDICTOR (V4L2_CID_USER_BASE | 0xa006)
> include/uapi/linux/v4l2-controls.h:#define V4L2_CID_USER_BASE
> V4L2_CID_BASE
> include/uapi/linux/v4l2-controls.h:#define V4L2_CID_USER_MEYE_BASE
> (V4L2_CID_USER_BASE + 0x1000)
>
> And also
>
> $ git grep V4L2_CTRL_CLASS_CAMERA
>
> drivers/media/i2c/mt9t001.c:#define V4L2_CID_GAIN_RED
> (V4L2_CTRL_CLASS_CAMERA | 0x1001)
> drivers/media/i2c/mt9t001.c:#define V4L2_CID_GAIN_GREEN_RED
> (V4L2_CTRL_CLASS_CAMERA | 0x1002)
> drivers/media/i2c/mt9t001.c:#define V4L2_CID_GAIN_GREEN_BLUE
> (V4L2_CTRL_CLASS_CAMERA | 0x1003)
> drivers/media/i2c/mt9t001.c:#define V4L2_CID_GAIN_BLUE
> (V4L2_CTRL_CLASS_CAMERA | 0x1004)
> drivers/media/i2c/s5k6aa.c:#define V4L2_CID_RED_GAIN
> (V4L2_CTRL_CLASS_CAMERA | 0x1001)
> drivers/media/i2c/s5k6aa.c:#define V4L2_CID_GREEN_GAIN
> (V4L2_CTRL_CLASS_CAMERA | 0x1002)
> drivers/media/i2c/s5k6aa.c:#define V4L2_CID_BLUE_GAIN
> (V4L2_CTRL_CLASS_CAMERA | 0x1003)
>
> > +/* The base for the s2255 driver controls.
> > + * We reserve 8 controls for this driver. */
> > +#define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1010)
> > +
>
> --
>
> Regards,
> Sylwester
>
--
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
