git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From 1a3897bd2ac76ebe2dfb77340e791b18c4015534 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Mon, 29 Oct 2018 16:08:41 +0000
   4 Subject: [PATCH 260/782] staging: bcm2835-camera: Fix up all formatting in
   5  mmal-paramters.h
   6
   7 Fixes up all checkpatch errors in mmal-parameters.h
   8
   9 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  10 ---
  11  .../bcm2835-camera/mmal-parameters.h          | 273 +++++++++++-------
  12  1 file changed, 165 insertions(+), 108 deletions(-)
  13
  14 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
  15 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
  16 @@ -23,148 +23,204 @@
  17  #define MMAL_PARAMETERS_H
  18
  19  /** Common parameter ID group, used with many types of component. */
  20 -#define MMAL_PARAMETER_GROUP_COMMON            (0 << 16)
  21 +#define MMAL_PARAMETER_GROUP_COMMON            (0 << 16)
  22  /** Camera-specific parameter ID group. */
  23 -#define MMAL_PARAMETER_GROUP_CAMERA            (1 << 16)
  24 +#define MMAL_PARAMETER_GROUP_CAMERA            (1 << 16)
  25  /** Video-specific parameter ID group. */
  26 -#define MMAL_PARAMETER_GROUP_VIDEO             (2 << 16)
  27 +#define MMAL_PARAMETER_GROUP_VIDEO             (2 << 16)
  28  /** Audio-specific parameter ID group. */
  29 -#define MMAL_PARAMETER_GROUP_AUDIO             (3 << 16)
  30 +#define MMAL_PARAMETER_GROUP_AUDIO             (3 << 16)
  31  /** Clock-specific parameter ID group. */
  32 -#define MMAL_PARAMETER_GROUP_CLOCK             (4 << 16)
  33 +#define MMAL_PARAMETER_GROUP_CLOCK             (4 << 16)
  34  /** Miracast-specific parameter ID group. */
  35 -#define MMAL_PARAMETER_GROUP_MIRACAST       (5 << 16)
  36 +#define MMAL_PARAMETER_GROUP_MIRACAST          (5 << 16)
  37
  38  /* Common parameters */
  39  enum mmal_parameter_common_type {
  40 -       MMAL_PARAMETER_UNUSED  /**< Never a valid parameter ID */
  41 -               = MMAL_PARAMETER_GROUP_COMMON,
  42 -       MMAL_PARAMETER_SUPPORTED_ENCODINGS, /**< MMAL_PARAMETER_ENCODING_T */
  43 -       MMAL_PARAMETER_URI, /**< MMAL_PARAMETER_URI_T */
  44 +       /**< Never a valid parameter ID */
  45 +       MMAL_PARAMETER_UNUSED = MMAL_PARAMETER_GROUP_COMMON,
  46
  47 -       /** MMAL_PARAMETER_CHANGE_EVENT_REQUEST_T */
  48 +               /**< MMAL_PARAMETER_ENCODING_T */
  49 +       MMAL_PARAMETER_SUPPORTED_ENCODINGS,
  50 +               /**< MMAL_PARAMETER_URI_T */
  51 +       MMAL_PARAMETER_URI,
  52 +               /** MMAL_PARAMETER_CHANGE_EVENT_REQUEST_T */
  53         MMAL_PARAMETER_CHANGE_EVENT_REQUEST,
  54 -
  55 -       /** MMAL_PARAMETER_BOOLEAN_T */
  56 +               /** MMAL_PARAMETER_BOOLEAN_T */
  57         MMAL_PARAMETER_ZERO_COPY,
  58 -
  59 -       /**< MMAL_PARAMETER_BUFFER_REQUIREMENTS_T */
  60 +               /**< MMAL_PARAMETER_BUFFER_REQUIREMENTS_T */
  61         MMAL_PARAMETER_BUFFER_REQUIREMENTS,
  62 -
  63 -       MMAL_PARAMETER_STATISTICS, /**< MMAL_PARAMETER_STATISTICS_T */
  64 -       MMAL_PARAMETER_CORE_STATISTICS, /**< MMAL_PARAMETER_CORE_STATISTICS_T */
  65 -       MMAL_PARAMETER_MEM_USAGE, /**< MMAL_PARAMETER_MEM_USAGE_T */
  66 -       MMAL_PARAMETER_BUFFER_FLAG_FILTER, /**< MMAL_PARAMETER_UINT32_T */
  67 -       MMAL_PARAMETER_SEEK, /**< MMAL_PARAMETER_SEEK_T */
  68 -       MMAL_PARAMETER_POWERMON_ENABLE, /**< MMAL_PARAMETER_BOOLEAN_T */
  69 -       MMAL_PARAMETER_LOGGING, /**< MMAL_PARAMETER_LOGGING_T */
  70 -       MMAL_PARAMETER_SYSTEM_TIME, /**< MMAL_PARAMETER_UINT64_T */
  71 -       MMAL_PARAMETER_NO_IMAGE_PADDING  /**< MMAL_PARAMETER_BOOLEAN_T */
  72 +               /**< MMAL_PARAMETER_STATISTICS_T */
  73 +       MMAL_PARAMETER_STATISTICS,
  74 +               /**< MMAL_PARAMETER_CORE_STATISTICS_T */
  75 +       MMAL_PARAMETER_CORE_STATISTICS,
  76 +               /**< MMAL_PARAMETER_MEM_USAGE_T */
  77 +       MMAL_PARAMETER_MEM_USAGE,
  78 +               /**< MMAL_PARAMETER_UINT32_T */
  79 +       MMAL_PARAMETER_BUFFER_FLAG_FILTER,
  80 +               /**< MMAL_PARAMETER_SEEK_T */
  81 +       MMAL_PARAMETER_SEEK,
  82 +               /**< MMAL_PARAMETER_BOOLEAN_T */
  83 +       MMAL_PARAMETER_POWERMON_ENABLE,
  84 +               /**< MMAL_PARAMETER_LOGGING_T */
  85 +       MMAL_PARAMETER_LOGGING,
  86 +               /**< MMAL_PARAMETER_UINT64_T */
  87 +       MMAL_PARAMETER_SYSTEM_TIME,
  88 +               /**< MMAL_PARAMETER_BOOLEAN_T */
  89 +       MMAL_PARAMETER_NO_IMAGE_PADDING,
  90  };
  91
  92  /* camera parameters */
  93
  94  enum mmal_parameter_camera_type {
  95         /* 0 */
  96 -       /** @ref MMAL_PARAMETER_THUMBNAIL_CONFIG_T */
  97 -       MMAL_PARAMETER_THUMBNAIL_CONFIGURATION
  98 -               = MMAL_PARAMETER_GROUP_CAMERA,
  99 -       MMAL_PARAMETER_CAPTURE_QUALITY, /**< Unused? */
 100 -       MMAL_PARAMETER_ROTATION, /**< @ref MMAL_PARAMETER_INT32_T */
 101 -       MMAL_PARAMETER_EXIF_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 102 -       MMAL_PARAMETER_EXIF, /**< @ref MMAL_PARAMETER_EXIF_T */
 103 -       MMAL_PARAMETER_AWB_MODE, /**< @ref MMAL_PARAM_AWBMODE_T */
 104 -       MMAL_PARAMETER_IMAGE_EFFECT, /**< @ref MMAL_PARAMETER_IMAGEFX_T */
 105 -       MMAL_PARAMETER_COLOUR_EFFECT, /**< @ref MMAL_PARAMETER_COLOURFX_T */
 106 -       MMAL_PARAMETER_FLICKER_AVOID, /**< @ref MMAL_PARAMETER_FLICKERAVOID_T */
 107 -       MMAL_PARAMETER_FLASH, /**< @ref MMAL_PARAMETER_FLASH_T */
 108 -       MMAL_PARAMETER_REDEYE, /**< @ref MMAL_PARAMETER_REDEYE_T */
 109 -       MMAL_PARAMETER_FOCUS, /**< @ref MMAL_PARAMETER_FOCUS_T */
 110 -       MMAL_PARAMETER_FOCAL_LENGTHS, /**< Unused? */
 111 -       MMAL_PARAMETER_EXPOSURE_COMP, /**< @ref MMAL_PARAMETER_INT32_T */
 112 -       MMAL_PARAMETER_ZOOM, /**< @ref MMAL_PARAMETER_SCALEFACTOR_T */
 113 -       MMAL_PARAMETER_MIRROR, /**< @ref MMAL_PARAMETER_MIRROR_T */
 114 +               /** @ref MMAL_PARAMETER_THUMBNAIL_CONFIG_T */
 115 +       MMAL_PARAMETER_THUMBNAIL_CONFIGURATION =
 116 +               MMAL_PARAMETER_GROUP_CAMERA,
 117 +               /**< Unused? */
 118 +       MMAL_PARAMETER_CAPTURE_QUALITY,
 119 +               /**< @ref MMAL_PARAMETER_INT32_T */
 120 +       MMAL_PARAMETER_ROTATION,
 121 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 122 +       MMAL_PARAMETER_EXIF_DISABLE,
 123 +               /**< @ref MMAL_PARAMETER_EXIF_T */
 124 +       MMAL_PARAMETER_EXIF,
 125 +               /**< @ref MMAL_PARAM_AWBMODE_T */
 126 +       MMAL_PARAMETER_AWB_MODE,
 127 +               /**< @ref MMAL_PARAMETER_IMAGEFX_T */
 128 +       MMAL_PARAMETER_IMAGE_EFFECT,
 129 +               /**< @ref MMAL_PARAMETER_COLOURFX_T */
 130 +       MMAL_PARAMETER_COLOUR_EFFECT,
 131 +               /**< @ref MMAL_PARAMETER_FLICKERAVOID_T */
 132 +       MMAL_PARAMETER_FLICKER_AVOID,
 133 +               /**< @ref MMAL_PARAMETER_FLASH_T */
 134 +       MMAL_PARAMETER_FLASH,
 135 +               /**< @ref MMAL_PARAMETER_REDEYE_T */
 136 +       MMAL_PARAMETER_REDEYE,
 137 +               /**< @ref MMAL_PARAMETER_FOCUS_T */
 138 +       MMAL_PARAMETER_FOCUS,
 139 +               /**< Unused? */
 140 +       MMAL_PARAMETER_FOCAL_LENGTHS,
 141 +               /**< @ref MMAL_PARAMETER_INT32_T */
 142 +       MMAL_PARAMETER_EXPOSURE_COMP,
 143 +               /**< @ref MMAL_PARAMETER_SCALEFACTOR_T */
 144 +       MMAL_PARAMETER_ZOOM,
 145 +               /**< @ref MMAL_PARAMETER_MIRROR_T */
 146 +       MMAL_PARAMETER_MIRROR,
 147
 148         /* 0x10 */
 149 -       MMAL_PARAMETER_CAMERA_NUM, /**< @ref MMAL_PARAMETER_UINT32_T */
 150 -       MMAL_PARAMETER_CAPTURE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 151 -       MMAL_PARAMETER_EXPOSURE_MODE, /**< @ref MMAL_PARAMETER_EXPOSUREMODE_T */
 152 -       MMAL_PARAMETER_EXP_METERING_MODE, /**< @ref MMAL_PARAMETER_EXPOSUREMETERINGMODE_T */
 153 -       MMAL_PARAMETER_FOCUS_STATUS, /**< @ref MMAL_PARAMETER_FOCUS_STATUS_T */
 154 -       MMAL_PARAMETER_CAMERA_CONFIG, /**< @ref MMAL_PARAMETER_CAMERA_CONFIG_T */
 155 -       MMAL_PARAMETER_CAPTURE_STATUS, /**< @ref MMAL_PARAMETER_CAPTURE_STATUS_T */
 156 -       MMAL_PARAMETER_FACE_TRACK, /**< @ref MMAL_PARAMETER_FACE_TRACK_T */
 157 -       MMAL_PARAMETER_DRAW_BOX_FACES_AND_FOCUS, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 158 -       MMAL_PARAMETER_JPEG_Q_FACTOR, /**< @ref MMAL_PARAMETER_UINT32_T */
 159 -       MMAL_PARAMETER_FRAME_RATE, /**< @ref MMAL_PARAMETER_FRAME_RATE_T */
 160 -       MMAL_PARAMETER_USE_STC, /**< @ref MMAL_PARAMETER_CAMERA_STC_MODE_T */
 161 -       MMAL_PARAMETER_CAMERA_INFO, /**< @ref MMAL_PARAMETER_CAMERA_INFO_T */
 162 -       MMAL_PARAMETER_VIDEO_STABILISATION, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 163 -       MMAL_PARAMETER_FACE_TRACK_RESULTS, /**< @ref MMAL_PARAMETER_FACE_TRACK_RESULTS_T */
 164 -       MMAL_PARAMETER_ENABLE_RAW_CAPTURE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 165 +               /**< @ref MMAL_PARAMETER_UINT32_T */
 166 +       MMAL_PARAMETER_CAMERA_NUM,
 167 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 168 +       MMAL_PARAMETER_CAPTURE,
 169 +               /**< @ref MMAL_PARAMETER_EXPOSUREMODE_T */
 170 +       MMAL_PARAMETER_EXPOSURE_MODE,
 171 +               /**< @ref MMAL_PARAMETER_EXPOSUREMETERINGMODE_T */
 172 +       MMAL_PARAMETER_EXP_METERING_MODE,
 173 +               /**< @ref MMAL_PARAMETER_FOCUS_STATUS_T */
 174 +       MMAL_PARAMETER_FOCUS_STATUS,
 175 +               /**< @ref MMAL_PARAMETER_CAMERA_CONFIG_T */
 176 +       MMAL_PARAMETER_CAMERA_CONFIG,
 177 +               /**< @ref MMAL_PARAMETER_CAPTURE_STATUS_T */
 178 +       MMAL_PARAMETER_CAPTURE_STATUS,
 179 +               /**< @ref MMAL_PARAMETER_FACE_TRACK_T */
 180 +       MMAL_PARAMETER_FACE_TRACK,
 181 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 182 +       MMAL_PARAMETER_DRAW_BOX_FACES_AND_FOCUS,
 183 +               /**< @ref MMAL_PARAMETER_UINT32_T */
 184 +       MMAL_PARAMETER_JPEG_Q_FACTOR,
 185 +               /**< @ref MMAL_PARAMETER_FRAME_RATE_T */
 186 +       MMAL_PARAMETER_FRAME_RATE,
 187 +               /**< @ref MMAL_PARAMETER_CAMERA_STC_MODE_T */
 188 +       MMAL_PARAMETER_USE_STC,
 189 +               /**< @ref MMAL_PARAMETER_CAMERA_INFO_T */
 190 +       MMAL_PARAMETER_CAMERA_INFO,
 191 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 192 +       MMAL_PARAMETER_VIDEO_STABILISATION,
 193 +               /**< @ref MMAL_PARAMETER_FACE_TRACK_RESULTS_T */
 194 +       MMAL_PARAMETER_FACE_TRACK_RESULTS,
 195 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 196 +       MMAL_PARAMETER_ENABLE_RAW_CAPTURE,
 197
 198         /* 0x20 */
 199 -       MMAL_PARAMETER_DPF_FILE, /**< @ref MMAL_PARAMETER_URI_T */
 200 -       MMAL_PARAMETER_ENABLE_DPF_FILE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 201 -       MMAL_PARAMETER_DPF_FAIL_IS_FATAL, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 202 -       MMAL_PARAMETER_CAPTURE_MODE, /**< @ref MMAL_PARAMETER_CAPTUREMODE_T */
 203 -       MMAL_PARAMETER_FOCUS_REGIONS, /**< @ref MMAL_PARAMETER_FOCUS_REGIONS_T */
 204 -       MMAL_PARAMETER_INPUT_CROP, /**< @ref MMAL_PARAMETER_INPUT_CROP_T */
 205 -       MMAL_PARAMETER_SENSOR_INFORMATION, /**< @ref MMAL_PARAMETER_SENSOR_INFORMATION_T */
 206 -       MMAL_PARAMETER_FLASH_SELECT, /**< @ref MMAL_PARAMETER_FLASH_SELECT_T */
 207 -       MMAL_PARAMETER_FIELD_OF_VIEW, /**< @ref MMAL_PARAMETER_FIELD_OF_VIEW_T */
 208 -       MMAL_PARAMETER_HIGH_DYNAMIC_RANGE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 209 -       MMAL_PARAMETER_DYNAMIC_RANGE_COMPRESSION, /**< @ref MMAL_PARAMETER_DRC_T */
 210 -       MMAL_PARAMETER_ALGORITHM_CONTROL, /**< @ref MMAL_PARAMETER_ALGORITHM_CONTROL_T */
 211 -       MMAL_PARAMETER_SHARPNESS, /**< @ref MMAL_PARAMETER_RATIONAL_T */
 212 -       MMAL_PARAMETER_CONTRAST, /**< @ref MMAL_PARAMETER_RATIONAL_T */
 213 -       MMAL_PARAMETER_BRIGHTNESS, /**< @ref MMAL_PARAMETER_RATIONAL_T */
 214 -       MMAL_PARAMETER_SATURATION, /**< @ref MMAL_PARAMETER_RATIONAL_T */
 215 +               /**< @ref MMAL_PARAMETER_URI_T */
 216 +       MMAL_PARAMETER_DPF_FILE,
 217 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 218 +       MMAL_PARAMETER_ENABLE_DPF_FILE,
 219 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 220 +       MMAL_PARAMETER_DPF_FAIL_IS_FATAL,
 221 +               /**< @ref MMAL_PARAMETER_CAPTUREMODE_T */
 222 +       MMAL_PARAMETER_CAPTURE_MODE,
 223 +               /**< @ref MMAL_PARAMETER_FOCUS_REGIONS_T */
 224 +       MMAL_PARAMETER_FOCUS_REGIONS,
 225 +               /**< @ref MMAL_PARAMETER_INPUT_CROP_T */
 226 +       MMAL_PARAMETER_INPUT_CROP,
 227 +               /**< @ref MMAL_PARAMETER_SENSOR_INFORMATION_T */
 228 +       MMAL_PARAMETER_SENSOR_INFORMATION,
 229 +               /**< @ref MMAL_PARAMETER_FLASH_SELECT_T */
 230 +       MMAL_PARAMETER_FLASH_SELECT,
 231 +               /**< @ref MMAL_PARAMETER_FIELD_OF_VIEW_T */
 232 +       MMAL_PARAMETER_FIELD_OF_VIEW,
 233 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 234 +       MMAL_PARAMETER_HIGH_DYNAMIC_RANGE,
 235 +               /**< @ref MMAL_PARAMETER_DRC_T */
 236 +       MMAL_PARAMETER_DYNAMIC_RANGE_COMPRESSION,
 237 +               /**< @ref MMAL_PARAMETER_ALGORITHM_CONTROL_T */
 238 +       MMAL_PARAMETER_ALGORITHM_CONTROL,
 239 +               /**< @ref MMAL_PARAMETER_RATIONAL_T */
 240 +       MMAL_PARAMETER_SHARPNESS,
 241 +               /**< @ref MMAL_PARAMETER_RATIONAL_T */
 242 +       MMAL_PARAMETER_CONTRAST,
 243 +               /**< @ref MMAL_PARAMETER_RATIONAL_T */
 244 +       MMAL_PARAMETER_BRIGHTNESS,
 245 +               /**< @ref MMAL_PARAMETER_RATIONAL_T */
 246 +       MMAL_PARAMETER_SATURATION,
 247
 248         /* 0x30 */
 249 -       MMAL_PARAMETER_ISO, /**< @ref MMAL_PARAMETER_UINT32_T */
 250 -       MMAL_PARAMETER_ANTISHAKE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 251 -
 252 -       /** @ref MMAL_PARAMETER_IMAGEFX_PARAMETERS_T */
 253 +               /**< @ref MMAL_PARAMETER_UINT32_T */
 254 +       MMAL_PARAMETER_ISO,
 255 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 256 +       MMAL_PARAMETER_ANTISHAKE,
 257 +               /** @ref MMAL_PARAMETER_IMAGEFX_PARAMETERS_T */
 258         MMAL_PARAMETER_IMAGE_EFFECT_PARAMETERS,
 259 -
 260 -       /** @ref MMAL_PARAMETER_BOOLEAN_T */
 261 +               /** @ref MMAL_PARAMETER_BOOLEAN_T */
 262         MMAL_PARAMETER_CAMERA_BURST_CAPTURE,
 263 -
 264 -       /** @ref MMAL_PARAMETER_UINT32_T */
 265 +               /** @ref MMAL_PARAMETER_UINT32_T */
 266         MMAL_PARAMETER_CAMERA_MIN_ISO,
 267 -
 268 -       /** @ref MMAL_PARAMETER_CAMERA_USE_CASE_T */
 269 +               /** @ref MMAL_PARAMETER_CAMERA_USE_CASE_T */
 270         MMAL_PARAMETER_CAMERA_USE_CASE,
 271 -
 272 -       /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 273 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 274         MMAL_PARAMETER_CAPTURE_STATS_PASS,
 275 -
 276 -       /** @ref MMAL_PARAMETER_UINT32_T */
 277 +               /** @ref MMAL_PARAMETER_UINT32_T */
 278         MMAL_PARAMETER_CAMERA_CUSTOM_SENSOR_CONFIG,
 279 -
 280 -       /** @ref MMAL_PARAMETER_BOOLEAN_T */
 281 +               /** @ref MMAL_PARAMETER_BOOLEAN_T */
 282         MMAL_PARAMETER_ENABLE_REGISTER_FILE,
 283 -
 284 -       /** @ref MMAL_PARAMETER_BOOLEAN_T */
 285 +               /** @ref MMAL_PARAMETER_BOOLEAN_T */
 286         MMAL_PARAMETER_REGISTER_FAIL_IS_FATAL,
 287 -
 288 -       /** @ref MMAL_PARAMETER_CONFIGFILE_T */
 289 +               /** @ref MMAL_PARAMETER_CONFIGFILE_T */
 290         MMAL_PARAMETER_CONFIGFILE_REGISTERS,
 291 -
 292 -       /** @ref MMAL_PARAMETER_CONFIGFILE_CHUNK_T */
 293 +               /** @ref MMAL_PARAMETER_CONFIGFILE_CHUNK_T */
 294         MMAL_PARAMETER_CONFIGFILE_CHUNK_REGISTERS,
 295 -       MMAL_PARAMETER_JPEG_ATTACH_LOG, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 296 -       MMAL_PARAMETER_ZERO_SHUTTER_LAG, /**< @ref MMAL_PARAMETER_ZEROSHUTTERLAG_T */
 297 -       MMAL_PARAMETER_FPS_RANGE, /**< @ref MMAL_PARAMETER_FPS_RANGE_T */
 298 -       MMAL_PARAMETER_CAPTURE_EXPOSURE_COMP, /**< @ref MMAL_PARAMETER_INT32_T */
 299 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 300 +       MMAL_PARAMETER_JPEG_ATTACH_LOG,
 301 +               /**< @ref MMAL_PARAMETER_ZEROSHUTTERLAG_T */
 302 +       MMAL_PARAMETER_ZERO_SHUTTER_LAG,
 303 +               /**< @ref MMAL_PARAMETER_FPS_RANGE_T */
 304 +       MMAL_PARAMETER_FPS_RANGE,
 305 +               /**< @ref MMAL_PARAMETER_INT32_T */
 306 +       MMAL_PARAMETER_CAPTURE_EXPOSURE_COMP,
 307
 308         /* 0x40 */
 309 -       MMAL_PARAMETER_SW_SHARPEN_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 310 -       MMAL_PARAMETER_FLASH_REQUIRED, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 311 -       MMAL_PARAMETER_SW_SATURATION_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 312 -       MMAL_PARAMETER_SHUTTER_SPEED,             /**< Takes a @ref MMAL_PARAMETER_UINT32_T */
 313 -       MMAL_PARAMETER_CUSTOM_AWB_GAINS,          /**< Takes a @ref MMAL_PARAMETER_AWB_GAINS_T */
 314 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 315 +       MMAL_PARAMETER_SW_SHARPEN_DISABLE,
 316 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 317 +       MMAL_PARAMETER_FLASH_REQUIRED,
 318 +               /**< @ref MMAL_PARAMETER_BOOLEAN_T */
 319 +       MMAL_PARAMETER_SW_SATURATION_DISABLE,
 320 +       /**< Takes a @ref MMAL_PARAMETER_UINT32_T */
 321 +       MMAL_PARAMETER_SHUTTER_SPEED,
 322 +               /**< Takes a @ref MMAL_PARAMETER_AWB_GAINS_T */
 323 +       MMAL_PARAMETER_CUSTOM_AWB_GAINS,
 324  };
 325
 326  struct mmal_parameter_rational {
 327 @@ -411,7 +467,8 @@ enum mmal_parameter_video_type {
 328         MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
 329
 330         /** @ref MMAL_PARAMETER_UINT32_T.
 331 -        * Setting the value to zero resets to the default (one slice per frame).
 332 +        * Setting the value to zero resets to the default (one slice per
 333 +        * frame).
 334          */
 335         MMAL_PARAMETER_MB_ROWS_PER_SLICE,
 336