Convert the meye driver to the control framework. Some private controls have been replaced with standardized controls (SHARPNESS and JPEGQUAL). The AGC control looks like it can be replaced by the AUTOGAIN control, but it isn't a boolean so I do not know how to interpret it. The FRAMERATE control looks like it can be replaced by S_PARM, but again, without knowing how to interpret it I decided to leave it alone.
Showing the changes to include/uapi (2 of 4 files). Show all
Unified · Split
| @@ -57,10 +57,8 @@ struct meye_params { · 56 unmodified lines | ||
| 57 | 57 | #define MEYEIOC_STILLJCAPT _IOR ('v', BASE_VIDIOC_PRIVATE+5, int) |
| 58 | 58 | |
| 59 | 59 | /* V4L2 private controls */ |
| 60 | −#define V4L2_CID_AGC V4L2_CID_PRIVATE_BASE | |
| 61 | −#define V4L2_CID_MEYE_SHARPNESS (V4L2_CID_PRIVATE_BASE + 1) | |
| 62 | −#define V4L2_CID_PICTURE (V4L2_CID_PRIVATE_BASE + 2) | |
| 63 | −#define V4L2_CID_JPEGQUAL (V4L2_CID_PRIVATE_BASE + 3) | |
| 64 | −#define V4L2_CID_FRAMERATE (V4L2_CID_PRIVATE_BASE + 4) | |
| 60 | +#define V4L2_CID_MEYE_AGC (V4L2_CID_USER_MEYE_BASE + 0) | |
| 61 | +#define V4L2_CID_MEYE_PICTURE (V4L2_CID_USER_MEYE_BASE + 1) | |
| 62 | +#define V4L2_CID_MEYE_FRAMERATE (V4L2_CID_USER_MEYE_BASE + 2) | |
| 65 | 63 | |
| 66 | 64 | #endif |
| @@ -140,6 +140,11 @@ enum v4l2_colorfx { · 139 unmodified lines | ||
| 140 | 140 | /* last CID + 1 */ |
| 141 | 141 | #define V4L2_CID_LASTP1 (V4L2_CID_BASE+43) |
| 142 | 142 | |
| 143 | +/* USER-class private control IDs */ | |
| 144 | + | |
| 145 | +/* The base for the meye driver controls. See linux/meye.h for the list | |
| 146 | + * of controls. We reserve 16 controls for this driver. */ | |
| 147 | +#define V4L2_CID_USER_MEYE_BASE (V4L2_CID_USER_BASE + 0x1000) | |
| 143 | 148 | |
| 144 | 149 | /* MPEG-class control IDs */ |
| 145 | 150 | |