Skip to content

L
linux
Commit 3485507f authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files
Options

staging: bcm2835-camera: Reduce length of enum names 

We have numerous lines over 80 chars, or oddly split. Many
of these are due to using long enum names such as
MMAL_COMPONENT_CAMERA.
Reduce the length of these enum names.
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 db9c9ee4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 112 deletions
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
View file @ 3485507f
...@@ -16,18 +16,18 @@ ...@@ -16,18 +16,18 @@
#define V4L2_CTRL_COUNT 29 /* number of v4l controls */ #define V4L2_CTRL_COUNT 29 /* number of v4l controls */
enum { enum {
MMAL_COMPONENT_CAMERA = 0, COMP_CAMERA = 0,
MMAL_COMPONENT_PREVIEW, COMP_PREVIEW,
MMAL_COMPONENT_IMAGE_ENCODE, COMP_IMAGE_ENCODE,
MMAL_COMPONENT_VIDEO_ENCODE, COMP_VIDEO_ENCODE,
MMAL_COMPONENT_COUNT COMP_COUNT
}; };
enum { enum {
MMAL_CAMERA_PORT_PREVIEW = 0, CAM_PORT_PREVIEW = 0,
MMAL_CAMERA_PORT_VIDEO, CAM_PORT_VIDEO,
MMAL_CAMERA_PORT_CAPTURE, CAM_PORT_CAPTURE,
MMAL_CAMERA_PORT_COUNT CAM_PORT_COUNT
}; };
#define PREVIEW_LAYER 2 #define PREVIEW_LAYER 2
...@@ -61,7 +61,7 @@ struct bm2835_mmal_dev { ...@@ -61,7 +61,7 @@ struct bm2835_mmal_dev {
/* allocated mmal instance and components */ /* allocated mmal instance and components */
struct vchiq_mmal_instance *instance; struct vchiq_mmal_instance *instance;
struct vchiq_mmal_component *component[MMAL_COMPONENT_COUNT]; struct vchiq_mmal_component *component[COMP_COUNT];
int camera_use_count; int camera_use_count;
struct v4l2_window overlay; struct v4l2_window overlay;
......
drivers/staging/vc04_services/bcm2835-camera/controls.c
View file @ 3485507f
...@@ -177,7 +177,7 @@ static int ctrl_set_rational(struct bm2835_mmal_dev *dev, ...@@ -177,7 +177,7 @@ static int ctrl_set_rational(struct bm2835_mmal_dev *dev,
struct mmal_parameter_rational rational_value; struct mmal_parameter_rational rational_value;
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
rational_value.num = ctrl->val; rational_value.num = ctrl->val;
rational_value.den = 100; rational_value.den = 100;
...@@ -195,7 +195,7 @@ static int ctrl_set_value(struct bm2835_mmal_dev *dev, ...@@ -195,7 +195,7 @@ static int ctrl_set_value(struct bm2835_mmal_dev *dev,
u32 u32_value; u32 u32_value;
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
u32_value = ctrl->val; u32_value = ctrl->val;
...@@ -220,7 +220,7 @@ static int ctrl_set_iso(struct bm2835_mmal_dev *dev, ...@@ -220,7 +220,7 @@ static int ctrl_set_iso(struct bm2835_mmal_dev *dev,
dev->manual_iso_enabled = dev->manual_iso_enabled =
(ctrl->val == V4L2_ISO_SENSITIVITY_MANUAL); (ctrl->val == V4L2_ISO_SENSITIVITY_MANUAL);
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
if (dev->manual_iso_enabled) if (dev->manual_iso_enabled)
u32_value = dev->iso; u32_value = dev->iso;
...@@ -239,7 +239,7 @@ static int ctrl_set_value_ev(struct bm2835_mmal_dev *dev, ...@@ -239,7 +239,7 @@ static int ctrl_set_value_ev(struct bm2835_mmal_dev *dev,
s32 s32_value; s32 s32_value;
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
s32_value = (ctrl->val - 12) * 2; /* Convert from index to 1/6ths */ s32_value = (ctrl->val - 12) * 2; /* Convert from index to 1/6ths */
...@@ -256,7 +256,7 @@ static int ctrl_set_rotate(struct bm2835_mmal_dev *dev, ...@@ -256,7 +256,7 @@ static int ctrl_set_rotate(struct bm2835_mmal_dev *dev,
u32 u32_value; u32 u32_value;
struct vchiq_mmal_component *camera; struct vchiq_mmal_component *camera;
camera = dev->component[MMAL_COMPONENT_CAMERA]; camera = dev->component[COMP_CAMERA];
u32_value = ((ctrl->val % 360) / 90) * 90; u32_value = ((ctrl->val % 360) / 90) * 90;
...@@ -290,7 +290,7 @@ static int ctrl_set_flip(struct bm2835_mmal_dev *dev, ...@@ -290,7 +290,7 @@ static int ctrl_set_flip(struct bm2835_mmal_dev *dev,
else else
dev->vflip = ctrl->val; dev->vflip = ctrl->val;
camera = dev->component[MMAL_COMPONENT_CAMERA]; camera = dev->component[COMP_CAMERA];
if (dev->hflip && dev->vflip) if (dev->hflip && dev->vflip)
u32_value = MMAL_PARAM_MIRROR_BOTH; u32_value = MMAL_PARAM_MIRROR_BOTH;
...@@ -327,7 +327,7 @@ static int ctrl_set_exposure(struct bm2835_mmal_dev *dev, ...@@ -327,7 +327,7 @@ static int ctrl_set_exposure(struct bm2835_mmal_dev *dev,
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
int ret = 0; int ret = 0;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
if (mmal_ctrl->mmal_id == MMAL_PARAMETER_SHUTTER_SPEED) { if (mmal_ctrl->mmal_id == MMAL_PARAMETER_SHUTTER_SPEED) {
/* V4L2 is in 100usec increments. /* V4L2 is in 100usec increments.
...@@ -402,7 +402,7 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev, ...@@ -402,7 +402,7 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev,
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
u32 u32_value = dev->metering_mode; u32 u32_value = dev->metering_mode;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
return vchiq_mmal_port_parameter_set(dev->instance, control, return vchiq_mmal_port_parameter_set(dev->instance, control,
mmal_ctrl->mmal_id, mmal_ctrl->mmal_id,
...@@ -418,7 +418,7 @@ static int ctrl_set_flicker_avoidance(struct bm2835_mmal_dev *dev, ...@@ -418,7 +418,7 @@ static int ctrl_set_flicker_avoidance(struct bm2835_mmal_dev *dev,
u32 u32_value; u32 u32_value;
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
switch (ctrl->val) { switch (ctrl->val) {
case V4L2_CID_POWER_LINE_FREQUENCY_DISABLED: case V4L2_CID_POWER_LINE_FREQUENCY_DISABLED:
...@@ -447,7 +447,7 @@ static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev, ...@@ -447,7 +447,7 @@ static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev,
u32 u32_value; u32 u32_value;
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
switch (ctrl->val) { switch (ctrl->val) {
case V4L2_WHITE_BALANCE_MANUAL: case V4L2_WHITE_BALANCE_MANUAL:
...@@ -503,7 +503,7 @@ static int ctrl_set_awb_gains(struct bm2835_mmal_dev *dev, ...@@ -503,7 +503,7 @@ static int ctrl_set_awb_gains(struct bm2835_mmal_dev *dev,
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
struct mmal_parameter_awbgains gains; struct mmal_parameter_awbgains gains;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
if (ctrl->id == V4L2_CID_RED_BALANCE) if (ctrl->id == V4L2_CID_RED_BALANCE)
dev->red_gain = ctrl->val; dev->red_gain = ctrl->val;
...@@ -551,7 +551,7 @@ static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev, ...@@ -551,7 +551,7 @@ static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev,
v4l2_to_mmal_effects_values[i].v; v4l2_to_mmal_effects_values[i].v;
} }
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
ret = vchiq_mmal_port_parameter_set( ret = vchiq_mmal_port_parameter_set(
dev->instance, control, dev->instance, control,
...@@ -584,7 +584,7 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev, ...@@ -584,7 +584,7 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
int ret; int ret;
struct vchiq_mmal_port *control; struct vchiq_mmal_port *control;
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
dev->colourfx.enable = (ctrl->val & 0xff00) >> 8; dev->colourfx.enable = (ctrl->val & 0xff00) >> 8;
dev->colourfx.enable = ctrl->val & 0xff; dev->colourfx.enable = ctrl->val & 0xff;
...@@ -610,7 +610,7 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev, ...@@ -610,7 +610,7 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
dev->capture.encode_bitrate = ctrl->val; dev->capture.encode_bitrate = ctrl->val;
encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0]; encoder_out = &dev->component[COMP_VIDEO_ENCODE]->output[0];
ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out, ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
mmal_ctrl->mmal_id, &ctrl->val, mmal_ctrl->mmal_id, &ctrl->val,
...@@ -636,7 +636,7 @@ static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev, ...@@ -636,7 +636,7 @@ static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
u32 bitrate_mode; u32 bitrate_mode;
struct vchiq_mmal_port *encoder_out; struct vchiq_mmal_port *encoder_out;
encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0]; encoder_out = &dev->component[COMP_VIDEO_ENCODE]->output[0];
dev->capture.encode_bitrate_mode = ctrl->val; dev->capture.encode_bitrate_mode = ctrl->val;
switch (ctrl->val) { switch (ctrl->val) {
...@@ -663,7 +663,7 @@ static int ctrl_set_image_encode_output(struct bm2835_mmal_dev *dev, ...@@ -663,7 +663,7 @@ static int ctrl_set_image_encode_output(struct bm2835_mmal_dev *dev,
u32 u32_value; u32 u32_value;
struct vchiq_mmal_port *jpeg_out; struct vchiq_mmal_port *jpeg_out;
jpeg_out = &dev->component[MMAL_COMPONENT_IMAGE_ENCODE]->output[0]; jpeg_out = &dev->component[COMP_IMAGE_ENCODE]->output[0];
u32_value = ctrl->val; u32_value = ctrl->val;
...@@ -679,7 +679,7 @@ static int ctrl_set_video_encode_param_output(struct bm2835_mmal_dev *dev, ...@@ -679,7 +679,7 @@ static int ctrl_set_video_encode_param_output(struct bm2835_mmal_dev *dev,
u32 u32_value; u32 u32_value;
struct vchiq_mmal_port *vid_enc_ctl; struct vchiq_mmal_port *vid_enc_ctl;
vid_enc_ctl = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0]; vid_enc_ctl = &dev->component[COMP_VIDEO_ENCODE]->output[0];
u32_value = ctrl->val; u32_value = ctrl->val;
...@@ -792,7 +792,7 @@ static int ctrl_set_video_encode_profile_level(struct bm2835_mmal_dev *dev, ...@@ -792,7 +792,7 @@ static int ctrl_set_video_encode_profile_level(struct bm2835_mmal_dev *dev,
} }
ret = vchiq_mmal_port_parameter_set(dev->instance, ret = vchiq_mmal_port_parameter_set(dev->instance,
&dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0], &dev->component[COMP_VIDEO_ENCODE]->output[0],
mmal_ctrl->mmal_id, mmal_ctrl->mmal_id,
&param, sizeof(param)); &param, sizeof(param));
} }
...@@ -810,7 +810,7 @@ static int ctrl_set_scene_mode(struct bm2835_mmal_dev *dev, ...@@ -810,7 +810,7 @@ static int ctrl_set_scene_mode(struct bm2835_mmal_dev *dev,
v4l2_dbg(0, bcm2835_v4l2_debug, &dev->v4l2_dev, v4l2_dbg(0, bcm2835_v4l2_debug, &dev->v4l2_dev,
"scene mode selected %d, was %d\n", ctrl->val, "scene mode selected %d, was %d\n", ctrl->val,
dev->scene_mode); dev->scene_mode);
control = &dev->component[MMAL_COMPONENT_CAMERA]->control; control = &dev->component[COMP_CAMERA]->control;
if (ctrl->val == dev->scene_mode) if (ctrl->val == dev->scene_mode)
return 0; return 0;
...@@ -1228,18 +1228,15 @@ int set_framerate_params(struct bm2835_mmal_dev *dev) ...@@ -1228,18 +1228,15 @@ int set_framerate_params(struct bm2835_mmal_dev *dev)
fps_range.fps_high.den); fps_range.fps_high.den);
ret = vchiq_mmal_port_parameter_set(dev->instance, ret = vchiq_mmal_port_parameter_set(dev->instance,
&dev->component[MMAL_COMPONENT_CAMERA]-> &dev->component[COMP_CAMERA]->output[CAM_PORT_PREVIEW],
output[MMAL_CAMERA_PORT_PREVIEW],
MMAL_PARAMETER_FPS_RANGE, MMAL_PARAMETER_FPS_RANGE,
&fps_range, sizeof(fps_range)); &fps_range, sizeof(fps_range));
ret += vchiq_mmal_port_parameter_set(dev->instance, ret += vchiq_mmal_port_parameter_set(dev->instance,
&dev->component[MMAL_COMPONENT_CAMERA]-> &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO],
output[MMAL_CAMERA_PORT_VIDEO],
MMAL_PARAMETER_FPS_RANGE, MMAL_PARAMETER_FPS_RANGE,
&fps_range, sizeof(fps_range)); &fps_range, sizeof(fps_range));
ret += vchiq_mmal_port_parameter_set(dev->instance, ret += vchiq_mmal_port_parameter_set(dev->instance,
&dev->component[MMAL_COMPONENT_CAMERA]-> &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE],
output[MMAL_CAMERA_PORT_CAPTURE],
MMAL_PARAMETER_FPS_RANGE, MMAL_PARAMETER_FPS_RANGE,
&fps_range, sizeof(fps_range)); &fps_range, sizeof(fps_range));
if (ret) if (ret)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7