staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h (3dad90c5) · Commits · 戴 / test

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1497,7 +1497,7 @@ static int get_num_cameras(struct vchiq_mmal_instance *instance,
		{
		int ret;
		struct vchiq_mmal_component *cam_info_component;
		struct mmal_parameter_camera_info_t cam_info = {0};
		struct mmal_parameter_camera_info cam_info = {0};
		u32 param_size = sizeof(cam_info);
		int i;

drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h

+16 −16

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ enum mmal_parameter_imagefx {
		MMAL_PARAM_IMAGEFX_CARTOON,
		};

		enum MMAL_PARAM_FLICKERAVOID_T {
		enum MMAL_PARAM_FLICKERAVOID {
		MMAL_PARAM_FLICKERAVOID_OFF,
		MMAL_PARAM_FLICKERAVOID_AUTO,
		MMAL_PARAM_FLICKERAVOID_50HZ,
		@@ -723,7 +723,7 @@ struct mmal_parameter_imagefx_parameters {
		#define MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES 2
		#define MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN 16

		struct mmal_parameter_camera_info_camera_t {
		struct mmal_parameter_camera_info_camera {
		u32 port_id;
		u32 max_width;
		u32 max_height;
		@@ -731,7 +731,7 @@ struct mmal_parameter_camera_info_camera_t {
		u8 camera_name[MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN];
		};

		enum mmal_parameter_camera_info_flash_type_t {
		enum mmal_parameter_camera_info_flash_type {
		/* Make values explicit to ensure they match values in config ini */
		MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_XENON = 0,
		MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_LED = 1,
		@@ -739,16 +739,16 @@ enum mmal_parameter_camera_info_flash_type_t {
		MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_MAX = 0x7FFFFFFF
		};

		struct mmal_parameter_camera_info_flash_t {
		enum mmal_parameter_camera_info_flash_type_t flash_type;
		struct mmal_parameter_camera_info_flash {
		enum mmal_parameter_camera_info_flash_type flash_type;
		};

		struct mmal_parameter_camera_info_t {
		struct mmal_parameter_camera_info {
		u32 num_cameras;
		u32 num_flashes;
		struct mmal_parameter_camera_info_camera_t
		struct mmal_parameter_camera_info_camera
		cameras[MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS];
		struct mmal_parameter_camera_info_flash_t
		struct mmal_parameter_camera_info_flash
		flashes[MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES];
		};

Admin message