staging: bcm2835-camera: Use enums for max value in controls

Controls of type MMAL_CONTROL_TYPE_STD_MENU call v4l2_ctrl_new_std_menu
with a max value and a mask. The max value is one of the defined
values for the control, however in the config array there are several
entries where raw numbers have been used instead. Replace these
with the appropriate enum.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
index bc2f3f4..038b9b9 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
@@ -58,19 +58,6 @@ static const u32 iso_values[] = {
        0, 100, 200, 400, 800,
 };
 
-static const s64 mains_freq_qmenu[] = {
-       V4L2_CID_POWER_LINE_FREQUENCY_DISABLED,
-       V4L2_CID_POWER_LINE_FREQUENCY_50HZ,
-       V4L2_CID_POWER_LINE_FREQUENCY_60HZ,
-       V4L2_CID_POWER_LINE_FREQUENCY_AUTO
-};
-
-/* Supported video encode modes */
-static const s64 bitrate_mode_qmenu[] = {
-       (s64)V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
-       (s64)V4L2_MPEG_VIDEO_BITRATE_MODE_CBR,
-};
-
 enum bm2835_mmal_ctrl_type {
        MMAL_CONTROL_TYPE_STD,
        MMAL_CONTROL_TYPE_STD_MENU,
@@ -972,8 +959,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        },
        {
                V4L2_CID_ISO_SENSITIVITY_AUTO, MMAL_CONTROL_TYPE_STD_MENU,
-               0, 1, V4L2_ISO_SENSITIVITY_AUTO, 1, NULL,
-               MMAL_PARAMETER_ISO,
+               0, V4L2_ISO_SENSITIVITY_AUTO, V4L2_ISO_SENSITIVITY_AUTO, 1,
+               NULL, MMAL_PARAMETER_ISO,
                ctrl_set_iso,
                false
        },
@@ -990,8 +977,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
  */
        {
                V4L2_CID_EXPOSURE_AUTO, MMAL_CONTROL_TYPE_STD_MENU,
-               ~0x03, 3, V4L2_EXPOSURE_AUTO, 0, NULL,
-               MMAL_PARAMETER_EXPOSURE_MODE,
+               ~0x03, V4L2_EXPOSURE_APERTURE_PRIORITY, V4L2_EXPOSURE_AUTO, 0,
+               NULL, MMAL_PARAMETER_EXPOSURE_MODE,
                ctrl_set_exposure,
                false
        },
@@ -1027,7 +1014,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        {
                V4L2_CID_EXPOSURE_METERING,
                MMAL_CONTROL_TYPE_STD_MENU,
-               ~0x7, 2, V4L2_EXPOSURE_METERING_AVERAGE, 0, NULL,
+               ~0x7, V4L2_EXPOSURE_METERING_SPOT,
+               V4L2_EXPOSURE_METERING_AVERAGE, 0, NULL,
                MMAL_PARAMETER_EXP_METERING_MODE,
                ctrl_set_metering_mode,
                false
@@ -1035,7 +1023,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        {
                V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE,
                MMAL_CONTROL_TYPE_STD_MENU,
-               ~0x3ff, 9, V4L2_WHITE_BALANCE_AUTO, 0, NULL,
+               ~0x3ff, V4L2_WHITE_BALANCE_SHADE, V4L2_WHITE_BALANCE_AUTO, 0,
+               NULL,
                MMAL_PARAMETER_AWB_MODE,
                ctrl_set_awb_mode,
                false
@@ -1056,7 +1045,7 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        },
        {
                V4L2_CID_COLORFX, MMAL_CONTROL_TYPE_STD_MENU,
-               0, 15, V4L2_COLORFX_NONE, 0, NULL,
+               0, V4L2_COLORFX_SET_CBCR, V4L2_COLORFX_NONE, 0, NULL,
                MMAL_PARAMETER_IMAGE_EFFECT,
                ctrl_set_image_effect,
                false
@@ -1091,8 +1080,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        },
        {
                V4L2_CID_MPEG_VIDEO_BITRATE_MODE, MMAL_CONTROL_TYPE_STD_MENU,
-               0, ARRAY_SIZE(bitrate_mode_qmenu) - 1,
-               0, 0, bitrate_mode_qmenu,
+               0, V4L2_MPEG_VIDEO_BITRATE_MODE_CBR,
+               0, 0, NULL,
                MMAL_PARAMETER_RATECONTROL,
                ctrl_set_bitrate_mode,
                false
@@ -1114,8 +1103,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        },
        {
                V4L2_CID_POWER_LINE_FREQUENCY, MMAL_CONTROL_TYPE_STD_MENU,
-               0, ARRAY_SIZE(mains_freq_qmenu) - 1,
-               1, 1, mains_freq_qmenu,
+               0, V4L2_CID_POWER_LINE_FREQUENCY_AUTO,
+               1, 1, NULL,
                MMAL_PARAMETER_FLICKER_AVOID,
                ctrl_set_flicker_avoidance,
                false