Commit 3a41cf34 authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: Fix up mmal-parameters.h 



Fixes up all the checkpatch error "line over 80 characters" in
mmal-parameters.h

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33cc62fa

drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h

+159 −102
Original line number Diff line number Diff line
@@ -37,29 +37,37 @@ 


/* Common parameters */

enum mmal_parameter_common_type {

	MMAL_PARAMETER_UNUSED  /**< Never a valid parameter ID */

		= MMAL_PARAMETER_GROUP_COMMON,

	MMAL_PARAMETER_SUPPORTED_ENCODINGS, /**< MMAL_PARAMETER_ENCODING_T */

	MMAL_PARAMETER_URI, /**< MMAL_PARAMETER_URI_T */

		/**< Never a valid parameter ID */

	MMAL_PARAMETER_UNUSED = MMAL_PARAMETER_GROUP_COMMON,



		/**< MMAL_PARAMETER_ENCODING_T */

	MMAL_PARAMETER_SUPPORTED_ENCODINGS,

		/**< MMAL_PARAMETER_URI_T */

	MMAL_PARAMETER_URI,

		/** MMAL_PARAMETER_CHANGE_EVENT_REQUEST_T */

	MMAL_PARAMETER_CHANGE_EVENT_REQUEST,



		/** MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_ZERO_COPY,



		/**< MMAL_PARAMETER_BUFFER_REQUIREMENTS_T */

	MMAL_PARAMETER_BUFFER_REQUIREMENTS,



	MMAL_PARAMETER_STATISTICS, /**< MMAL_PARAMETER_STATISTICS_T */

	MMAL_PARAMETER_CORE_STATISTICS, /**< MMAL_PARAMETER_CORE_STATISTICS_T */

	MMAL_PARAMETER_MEM_USAGE, /**< MMAL_PARAMETER_MEM_USAGE_T */

	MMAL_PARAMETER_BUFFER_FLAG_FILTER, /**< MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_SEEK, /**< MMAL_PARAMETER_SEEK_T */

	MMAL_PARAMETER_POWERMON_ENABLE, /**< MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_LOGGING, /**< MMAL_PARAMETER_LOGGING_T */

	MMAL_PARAMETER_SYSTEM_TIME, /**< MMAL_PARAMETER_UINT64_T */

	MMAL_PARAMETER_NO_IMAGE_PADDING  /**< MMAL_PARAMETER_BOOLEAN_T */

		/**< MMAL_PARAMETER_STATISTICS_T */

	MMAL_PARAMETER_STATISTICS,

		/**< MMAL_PARAMETER_CORE_STATISTICS_T */

	MMAL_PARAMETER_CORE_STATISTICS,

		/**< MMAL_PARAMETER_MEM_USAGE_T */

	MMAL_PARAMETER_MEM_USAGE,

		/**< MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_BUFFER_FLAG_FILTER,

		/**< MMAL_PARAMETER_SEEK_T */

	MMAL_PARAMETER_SEEK,

		/**< MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_POWERMON_ENABLE,

		/**< MMAL_PARAMETER_LOGGING_T */

	MMAL_PARAMETER_LOGGING,

		/**< MMAL_PARAMETER_UINT64_T */

	MMAL_PARAMETER_SYSTEM_TIME,

		/**< MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_NO_IMAGE_PADDING,

};



/* camera parameters */
@@ -67,104 +75,152 @@ enum mmal_parameter_common_type { 
enum mmal_parameter_camera_type {

	/* 0 */

		/** @ref MMAL_PARAMETER_THUMBNAIL_CONFIG_T */

	MMAL_PARAMETER_THUMBNAIL_CONFIGURATION

		= MMAL_PARAMETER_GROUP_CAMERA,

	MMAL_PARAMETER_CAPTURE_QUALITY, /**< Unused? */

	MMAL_PARAMETER_ROTATION, /**< @ref MMAL_PARAMETER_INT32_T */

	MMAL_PARAMETER_EXIF_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_EXIF, /**< @ref MMAL_PARAMETER_EXIF_T */

	MMAL_PARAMETER_AWB_MODE, /**< @ref MMAL_PARAM_AWBMODE_T */

	MMAL_PARAMETER_IMAGE_EFFECT, /**< @ref MMAL_PARAMETER_IMAGEFX_T */

	MMAL_PARAMETER_COLOUR_EFFECT, /**< @ref MMAL_PARAMETER_COLOURFX_T */

	MMAL_PARAMETER_FLICKER_AVOID, /**< @ref MMAL_PARAMETER_FLICKERAVOID_T */

	MMAL_PARAMETER_FLASH, /**< @ref MMAL_PARAMETER_FLASH_T */

	MMAL_PARAMETER_REDEYE, /**< @ref MMAL_PARAMETER_REDEYE_T */

	MMAL_PARAMETER_FOCUS, /**< @ref MMAL_PARAMETER_FOCUS_T */

	MMAL_PARAMETER_FOCAL_LENGTHS, /**< Unused? */

	MMAL_PARAMETER_EXPOSURE_COMP, /**< @ref MMAL_PARAMETER_INT32_T */

	MMAL_PARAMETER_ZOOM, /**< @ref MMAL_PARAMETER_SCALEFACTOR_T */

	MMAL_PARAMETER_MIRROR, /**< @ref MMAL_PARAMETER_MIRROR_T */

	MMAL_PARAMETER_THUMBNAIL_CONFIGURATION =

		MMAL_PARAMETER_GROUP_CAMERA,

		/**< Unused? */

	MMAL_PARAMETER_CAPTURE_QUALITY,

		/**< @ref MMAL_PARAMETER_INT32_T */

	MMAL_PARAMETER_ROTATION,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_EXIF_DISABLE,

		/**< @ref MMAL_PARAMETER_EXIF_T */

	MMAL_PARAMETER_EXIF,

		/**< @ref MMAL_PARAM_AWBMODE_T */

	MMAL_PARAMETER_AWB_MODE,

		/**< @ref MMAL_PARAMETER_IMAGEFX_T */

	MMAL_PARAMETER_IMAGE_EFFECT,

		/**< @ref MMAL_PARAMETER_COLOURFX_T */

	MMAL_PARAMETER_COLOUR_EFFECT,

		/**< @ref MMAL_PARAMETER_FLICKERAVOID_T */

	MMAL_PARAMETER_FLICKER_AVOID,

		/**< @ref MMAL_PARAMETER_FLASH_T */

	MMAL_PARAMETER_FLASH,

		/**< @ref MMAL_PARAMETER_REDEYE_T */

	MMAL_PARAMETER_REDEYE,

		/**< @ref MMAL_PARAMETER_FOCUS_T */

	MMAL_PARAMETER_FOCUS,

		/**< Unused? */

	MMAL_PARAMETER_FOCAL_LENGTHS,

		/**< @ref MMAL_PARAMETER_INT32_T */

	MMAL_PARAMETER_EXPOSURE_COMP,

		/**< @ref MMAL_PARAMETER_SCALEFACTOR_T */

	MMAL_PARAMETER_ZOOM,

		/**< @ref MMAL_PARAMETER_MIRROR_T */

	MMAL_PARAMETER_MIRROR,



	/* 0x10 */

	MMAL_PARAMETER_CAMERA_NUM, /**< @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_CAPTURE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_EXPOSURE_MODE, /**< @ref MMAL_PARAMETER_EXPOSUREMODE_T */

	MMAL_PARAMETER_EXP_METERING_MODE, /**< @ref MMAL_PARAMETER_EXPOSUREMETERINGMODE_T */

	MMAL_PARAMETER_FOCUS_STATUS, /**< @ref MMAL_PARAMETER_FOCUS_STATUS_T */

	MMAL_PARAMETER_CAMERA_CONFIG, /**< @ref MMAL_PARAMETER_CAMERA_CONFIG_T */

	MMAL_PARAMETER_CAPTURE_STATUS, /**< @ref MMAL_PARAMETER_CAPTURE_STATUS_T */

	MMAL_PARAMETER_FACE_TRACK, /**< @ref MMAL_PARAMETER_FACE_TRACK_T */

	MMAL_PARAMETER_DRAW_BOX_FACES_AND_FOCUS, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_JPEG_Q_FACTOR, /**< @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_FRAME_RATE, /**< @ref MMAL_PARAMETER_FRAME_RATE_T */

	MMAL_PARAMETER_USE_STC, /**< @ref MMAL_PARAMETER_CAMERA_STC_MODE_T */

	MMAL_PARAMETER_CAMERA_INFO, /**< @ref MMAL_PARAMETER_CAMERA_INFO_T */

	MMAL_PARAMETER_VIDEO_STABILISATION, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_FACE_TRACK_RESULTS, /**< @ref MMAL_PARAMETER_FACE_TRACK_RESULTS_T */

	MMAL_PARAMETER_ENABLE_RAW_CAPTURE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

		/**< @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_CAMERA_NUM,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_CAPTURE,

		/**< @ref MMAL_PARAMETER_EXPOSUREMODE_T */

	MMAL_PARAMETER_EXPOSURE_MODE,

		/**< @ref MMAL_PARAMETER_EXPOSUREMETERINGMODE_T */

	MMAL_PARAMETER_EXP_METERING_MODE,

		/**< @ref MMAL_PARAMETER_FOCUS_STATUS_T */

	MMAL_PARAMETER_FOCUS_STATUS,

		/**< @ref MMAL_PARAMETER_CAMERA_CONFIG_T */

	MMAL_PARAMETER_CAMERA_CONFIG,

		/**< @ref MMAL_PARAMETER_CAPTURE_STATUS_T */

	MMAL_PARAMETER_CAPTURE_STATUS,

		/**< @ref MMAL_PARAMETER_FACE_TRACK_T */

	MMAL_PARAMETER_FACE_TRACK,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_DRAW_BOX_FACES_AND_FOCUS,

		/**< @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_JPEG_Q_FACTOR,

		/**< @ref MMAL_PARAMETER_FRAME_RATE_T */

	MMAL_PARAMETER_FRAME_RATE,

		/**< @ref MMAL_PARAMETER_CAMERA_STC_MODE_T */

	MMAL_PARAMETER_USE_STC,

		/**< @ref MMAL_PARAMETER_CAMERA_INFO_T */

	MMAL_PARAMETER_CAMERA_INFO,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_VIDEO_STABILISATION,

		/**< @ref MMAL_PARAMETER_FACE_TRACK_RESULTS_T */

	MMAL_PARAMETER_FACE_TRACK_RESULTS,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_ENABLE_RAW_CAPTURE,



	/* 0x20 */

	MMAL_PARAMETER_DPF_FILE, /**< @ref MMAL_PARAMETER_URI_T */

	MMAL_PARAMETER_ENABLE_DPF_FILE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_DPF_FAIL_IS_FATAL, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_CAPTURE_MODE, /**< @ref MMAL_PARAMETER_CAPTUREMODE_T */

	MMAL_PARAMETER_FOCUS_REGIONS, /**< @ref MMAL_PARAMETER_FOCUS_REGIONS_T */

	MMAL_PARAMETER_INPUT_CROP, /**< @ref MMAL_PARAMETER_INPUT_CROP_T */

	MMAL_PARAMETER_SENSOR_INFORMATION, /**< @ref MMAL_PARAMETER_SENSOR_INFORMATION_T */

	MMAL_PARAMETER_FLASH_SELECT, /**< @ref MMAL_PARAMETER_FLASH_SELECT_T */

	MMAL_PARAMETER_FIELD_OF_VIEW, /**< @ref MMAL_PARAMETER_FIELD_OF_VIEW_T */

	MMAL_PARAMETER_HIGH_DYNAMIC_RANGE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_DYNAMIC_RANGE_COMPRESSION, /**< @ref MMAL_PARAMETER_DRC_T */

	MMAL_PARAMETER_ALGORITHM_CONTROL, /**< @ref MMAL_PARAMETER_ALGORITHM_CONTROL_T */

	MMAL_PARAMETER_SHARPNESS, /**< @ref MMAL_PARAMETER_RATIONAL_T */

	MMAL_PARAMETER_CONTRAST, /**< @ref MMAL_PARAMETER_RATIONAL_T */

	MMAL_PARAMETER_BRIGHTNESS, /**< @ref MMAL_PARAMETER_RATIONAL_T */

	MMAL_PARAMETER_SATURATION, /**< @ref MMAL_PARAMETER_RATIONAL_T */

		/**< @ref MMAL_PARAMETER_URI_T */

	MMAL_PARAMETER_DPF_FILE,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_ENABLE_DPF_FILE,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_DPF_FAIL_IS_FATAL,

		/**< @ref MMAL_PARAMETER_CAPTUREMODE_T */

	MMAL_PARAMETER_CAPTURE_MODE,

		/**< @ref MMAL_PARAMETER_FOCUS_REGIONS_T */

	MMAL_PARAMETER_FOCUS_REGIONS,

		/**< @ref MMAL_PARAMETER_INPUT_CROP_T */

	MMAL_PARAMETER_INPUT_CROP,

		/**< @ref MMAL_PARAMETER_SENSOR_INFORMATION_T */

	MMAL_PARAMETER_SENSOR_INFORMATION,

		/**< @ref MMAL_PARAMETER_FLASH_SELECT_T */

	MMAL_PARAMETER_FLASH_SELECT,

		/**< @ref MMAL_PARAMETER_FIELD_OF_VIEW_T */

	MMAL_PARAMETER_FIELD_OF_VIEW,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_HIGH_DYNAMIC_RANGE,

		/**< @ref MMAL_PARAMETER_DRC_T */

	MMAL_PARAMETER_DYNAMIC_RANGE_COMPRESSION,

		/**< @ref MMAL_PARAMETER_ALGORITHM_CONTROL_T */

	MMAL_PARAMETER_ALGORITHM_CONTROL,

		/**< @ref MMAL_PARAMETER_RATIONAL_T */

	MMAL_PARAMETER_SHARPNESS,

		/**< @ref MMAL_PARAMETER_RATIONAL_T */

	MMAL_PARAMETER_CONTRAST,

		/**< @ref MMAL_PARAMETER_RATIONAL_T */

	MMAL_PARAMETER_BRIGHTNESS,

		/**< @ref MMAL_PARAMETER_RATIONAL_T */

	MMAL_PARAMETER_SATURATION,



	/* 0x30 */

	MMAL_PARAMETER_ISO, /**< @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_ANTISHAKE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */



		/**< @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_ISO,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_ANTISHAKE,

		/** @ref MMAL_PARAMETER_IMAGEFX_PARAMETERS_T */

	MMAL_PARAMETER_IMAGE_EFFECT_PARAMETERS,



		/** @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_CAMERA_BURST_CAPTURE,



		/** @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_CAMERA_MIN_ISO,



		/** @ref MMAL_PARAMETER_CAMERA_USE_CASE_T */

	MMAL_PARAMETER_CAMERA_USE_CASE,



		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_CAPTURE_STATS_PASS,



		/** @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_CAMERA_CUSTOM_SENSOR_CONFIG,



		/** @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_ENABLE_REGISTER_FILE,



		/** @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_REGISTER_FAIL_IS_FATAL,



		/** @ref MMAL_PARAMETER_CONFIGFILE_T */

	MMAL_PARAMETER_CONFIGFILE_REGISTERS,



		/** @ref MMAL_PARAMETER_CONFIGFILE_CHUNK_T */

	MMAL_PARAMETER_CONFIGFILE_CHUNK_REGISTERS,

	MMAL_PARAMETER_JPEG_ATTACH_LOG, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_ZERO_SHUTTER_LAG, /**< @ref MMAL_PARAMETER_ZEROSHUTTERLAG_T */

	MMAL_PARAMETER_FPS_RANGE, /**< @ref MMAL_PARAMETER_FPS_RANGE_T */

	MMAL_PARAMETER_CAPTURE_EXPOSURE_COMP, /**< @ref MMAL_PARAMETER_INT32_T */

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_JPEG_ATTACH_LOG,

		/**< @ref MMAL_PARAMETER_ZEROSHUTTERLAG_T */

	MMAL_PARAMETER_ZERO_SHUTTER_LAG,

		/**< @ref MMAL_PARAMETER_FPS_RANGE_T */

	MMAL_PARAMETER_FPS_RANGE,

		/**< @ref MMAL_PARAMETER_INT32_T */

	MMAL_PARAMETER_CAPTURE_EXPOSURE_COMP,



	/* 0x40 */

	MMAL_PARAMETER_SW_SHARPEN_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_FLASH_REQUIRED, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_SW_SATURATION_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_SHUTTER_SPEED,             /**< Takes a @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_CUSTOM_AWB_GAINS,          /**< Takes a @ref MMAL_PARAMETER_AWB_GAINS_T */

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_SW_SHARPEN_DISABLE,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_FLASH_REQUIRED,

		/**< @ref MMAL_PARAMETER_BOOLEAN_T */

	MMAL_PARAMETER_SW_SATURATION_DISABLE,

		/**< Takes a @ref MMAL_PARAMETER_UINT32_T */

	MMAL_PARAMETER_SHUTTER_SPEED,

		/**< Takes a @ref MMAL_PARAMETER_AWB_GAINS_T */

	MMAL_PARAMETER_CUSTOM_AWB_GAINS,

};



struct mmal_parameter_rational {
@@ -411,7 +467,8 @@ enum mmal_parameter_video_type { 
	MMAL_PARAMETER_MINIMISE_FRAGMENTATION,



	/** @ref MMAL_PARAMETER_UINT32_T.

	 * Setting the value to zero resets to the default (one slice per frame).

	 * Setting the value to zero resets to the default (one slice per

	 * frame).

	 */

	MMAL_PARAMETER_MB_ROWS_PER_SLICE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE