--- /dev/null
+From 75aca02c1449e3a97ec32de9974ad410f5d34463 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Wed, 21 Feb 2018 15:23:35 +0000
+Subject: [PATCH] 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: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ .../bcm2835-camera/bcm2835-camera.c | 165 +++++++++---------
+ .../bcm2835-camera/bcm2835-camera.h | 20 +--
+ .../vc04_services/bcm2835-camera/controls.c | 47 +++--
+ 3 files changed, 114 insertions(+), 118 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+@@ -80,7 +80,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_I420,
+ .depth = 12,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 1,
+ .remove_padding = 1,
+ }, {
+@@ -89,7 +89,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_YUYV,
+ .depth = 16,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 2,
+ .remove_padding = 0,
+ }, {
+@@ -98,7 +98,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_RGB24,
+ .depth = 24,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 3,
+ .remove_padding = 0,
+ }, {
+@@ -107,7 +107,7 @@ static struct mmal_fmt formats[] = {
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
+ .mmal = MMAL_ENCODING_JPEG,
+ .depth = 8,
+- .mmal_component = MMAL_COMPONENT_IMAGE_ENCODE,
++ .mmal_component = COMP_IMAGE_ENCODE,
+ .ybbp = 0,
+ .remove_padding = 0,
+ }, {
+@@ -116,7 +116,7 @@ static struct mmal_fmt formats[] = {
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
+ .mmal = MMAL_ENCODING_H264,
+ .depth = 8,
+- .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
++ .mmal_component = COMP_VIDEO_ENCODE,
+ .ybbp = 0,
+ .remove_padding = 0,
+ }, {
+@@ -125,7 +125,7 @@ static struct mmal_fmt formats[] = {
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
+ .mmal = MMAL_ENCODING_MJPEG,
+ .depth = 8,
+- .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
++ .mmal_component = COMP_VIDEO_ENCODE,
+ .ybbp = 0,
+ .remove_padding = 0,
+ }, {
+@@ -134,7 +134,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_YVYU,
+ .depth = 16,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 2,
+ .remove_padding = 0,
+ }, {
+@@ -143,7 +143,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_VYUY,
+ .depth = 16,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 2,
+ .remove_padding = 0,
+ }, {
+@@ -152,7 +152,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_UYVY,
+ .depth = 16,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 2,
+ .remove_padding = 0,
+ }, {
+@@ -161,7 +161,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_NV12,
+ .depth = 12,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 1,
+ .remove_padding = 1,
+ }, {
+@@ -170,7 +170,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_BGR24,
+ .depth = 24,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 3,
+ .remove_padding = 0,
+ }, {
+@@ -179,7 +179,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_YV12,
+ .depth = 12,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 1,
+ .remove_padding = 1,
+ }, {
+@@ -188,7 +188,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_NV21,
+ .depth = 12,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 1,
+ .remove_padding = 1,
+ }, {
+@@ -197,7 +197,7 @@ static struct mmal_fmt formats[] = {
+ .flags = 0,
+ .mmal = MMAL_ENCODING_BGRA,
+ .depth = 32,
+- .mmal_component = MMAL_COMPONENT_CAMERA,
++ .mmal_component = COMP_CAMERA,
+ .ybbp = 4,
+ .remove_padding = 0,
+ },
+@@ -314,7 +314,7 @@ static inline bool is_capturing(struct b
+ {
+ return dev->capture.camera_port ==
+ &dev->
+- component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_CAPTURE];
++ component[COMP_CAMERA]->output[CAM_PORT_CAPTURE];
+ }
+
+ static void buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -439,7 +439,7 @@ static int enable_camera(struct bm2835_m
+ if (!dev->camera_use_count) {
+ ret = vchiq_mmal_port_parameter_set(
+ dev->instance,
+- &dev->component[MMAL_COMPONENT_CAMERA]->control,
++ &dev->component[COMP_CAMERA]->control,
+ MMAL_PARAMETER_CAMERA_NUM, &dev->camera_num,
+ sizeof(dev->camera_num));
+ if (ret < 0) {
+@@ -450,7 +450,7 @@ static int enable_camera(struct bm2835_m
+
+ ret = vchiq_mmal_component_enable(
+ dev->instance,
+- dev->component[MMAL_COMPONENT_CAMERA]);
++ dev->component[COMP_CAMERA]);
+ if (ret < 0) {
+ v4l2_err(&dev->v4l2_dev,
+ "Failed enabling camera, ret %d\n", ret);
+@@ -482,7 +482,7 @@ static int disable_camera(struct bm2835_
+ ret =
+ vchiq_mmal_component_disable(
+ dev->instance,
+- dev->component[MMAL_COMPONENT_CAMERA]);
++ dev->component[COMP_CAMERA]);
+ if (ret < 0) {
+ v4l2_err(&dev->v4l2_dev,
+ "Failed disabling camera, ret %d\n", ret);
+@@ -490,7 +490,7 @@ static int disable_camera(struct bm2835_
+ }
+ vchiq_mmal_port_parameter_set(
+ dev->instance,
+- &dev->component[MMAL_COMPONENT_CAMERA]->control,
++ &dev->component[COMP_CAMERA]->control,
+ MMAL_PARAMETER_CAMERA_NUM, &i,
+ sizeof(i));
+ }
+@@ -542,7 +542,7 @@ static int start_streaming(struct vb2_qu
+ /* if the preview is not already running, wait for a few frames for AGC
+ * to settle down.
+ */
+- if (!dev->component[MMAL_COMPONENT_PREVIEW]->enabled)
++ if (!dev->component[COMP_PREVIEW]->enabled)
+ msleep(300);
+
+ /* enable the connection from camera to encoder (if applicable) */
+@@ -775,9 +775,9 @@ static int vidioc_s_fmt_vid_overlay(stru
+ vidioc_try_fmt_vid_overlay(file, priv, f);
+
+ dev->overlay = f->fmt.win;
+- if (dev->component[MMAL_COMPONENT_PREVIEW]->enabled) {
++ if (dev->component[COMP_PREVIEW]->enabled) {
+ set_overlay_params(dev,
+- &dev->component[MMAL_COMPONENT_PREVIEW]->input[0]);
++ &dev->component[COMP_PREVIEW]->input[0]);
+ }
+
+ return 0;
+@@ -790,13 +790,13 @@ static int vidioc_overlay(struct file *f
+ struct vchiq_mmal_port *src;
+ struct vchiq_mmal_port *dst;
+
+- if ((on && dev->component[MMAL_COMPONENT_PREVIEW]->enabled) ||
+- (!on && !dev->component[MMAL_COMPONENT_PREVIEW]->enabled))
++ if ((on && dev->component[COMP_PREVIEW]->enabled) ||
++ (!on && !dev->component[COMP_PREVIEW]->enabled))
+ return 0; /* already in requested state */
+
+ src =
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_PREVIEW];
++ &dev->component[COMP_CAMERA]->
++ output[CAM_PORT_PREVIEW];
+
+ if (!on) {
+ /* disconnect preview ports and disable component */
+@@ -808,14 +808,14 @@ static int vidioc_overlay(struct file *f
+ if (ret >= 0)
+ ret = vchiq_mmal_component_disable(
+ dev->instance,
+- dev->component[MMAL_COMPONENT_PREVIEW]);
++ dev->component[COMP_PREVIEW]);
+
+ disable_camera(dev);
+ return ret;
+ }
+
+ /* set preview port format and connect it to output */
+- dst = &dev->component[MMAL_COMPONENT_PREVIEW]->input[0];
++ dst = &dev->component[COMP_PREVIEW]->input[0];
+
+ ret = vchiq_mmal_port_set_format(dev->instance, src);
+ if (ret < 0)
+@@ -832,7 +832,7 @@ static int vidioc_overlay(struct file *f
+
+ ret = vchiq_mmal_component_enable(
+ dev->instance,
+- dev->component[MMAL_COMPONENT_PREVIEW]);
++ dev->component[COMP_PREVIEW]);
+ if (ret < 0)
+ return ret;
+
+@@ -853,8 +853,8 @@ static int vidioc_g_fbuf(struct file *fi
+ */
+ struct bm2835_mmal_dev *dev = video_drvdata(file);
+ struct vchiq_mmal_port *preview_port =
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_PREVIEW];
++ &dev->component[COMP_CAMERA]->
++ output[CAM_PORT_PREVIEW];
+
+ a->capability = V4L2_FBUF_CAP_EXTERNOVERLAY |
+ V4L2_FBUF_CAP_GLOBAL_ALPHA;
+@@ -1057,31 +1057,31 @@ static int mmal_setup_components(struct
+ }
+ /* format dependent port setup */
+ switch (mfmt->mmal_component) {
+- case MMAL_COMPONENT_CAMERA:
++ case COMP_CAMERA:
+ /* Make a further decision on port based on resolution */
+ if (f->fmt.pix.width <= max_video_width
+ && f->fmt.pix.height <= max_video_height)
+ camera_port = port =
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_VIDEO];
++ &dev->component[COMP_CAMERA]->
++ output[CAM_PORT_VIDEO];
+ else
+ camera_port = port =
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_CAPTURE];
++ &dev->component[COMP_CAMERA]->
++ output[CAM_PORT_CAPTURE];
+ break;
+- case MMAL_COMPONENT_IMAGE_ENCODE:
+- encode_component = dev->component[MMAL_COMPONENT_IMAGE_ENCODE];
+- port = &dev->component[MMAL_COMPONENT_IMAGE_ENCODE]->output[0];
++ case COMP_IMAGE_ENCODE:
++ encode_component = dev->component[COMP_IMAGE_ENCODE];
++ port = &dev->component[COMP_IMAGE_ENCODE]->output[0];
+ camera_port =
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_CAPTURE];
++ &dev->component[COMP_CAMERA]->
++ output[CAM_PORT_CAPTURE];
+ break;
+- case MMAL_COMPONENT_VIDEO_ENCODE:
+- encode_component = dev->component[MMAL_COMPONENT_VIDEO_ENCODE];
+- port = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
++ case COMP_VIDEO_ENCODE:
++ encode_component = dev->component[COMP_VIDEO_ENCODE];
++ port = &dev->component[COMP_VIDEO_ENCODE]->output[0];
+ camera_port =
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_VIDEO];
++ &dev->component[COMP_CAMERA]->
++ output[CAM_PORT_VIDEO];
+ break;
+ default:
+ break;
+@@ -1123,13 +1123,12 @@ static int mmal_setup_components(struct
+
+ if (!ret
+ && camera_port ==
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_VIDEO]) {
++ &dev->component[COMP_CAMERA]->
++ output[CAM_PORT_VIDEO]) {
+ bool overlay_enabled =
+- !!dev->component[MMAL_COMPONENT_PREVIEW]->enabled;
++ !!dev->component[COMP_PREVIEW]->enabled;
+ struct vchiq_mmal_port *preview_port =
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_PREVIEW];
++ &dev->component[COMP_CAMERA]->output[CAM_PORT_PREVIEW];
+ /* Preview and encode ports need to match on resolution */
+ if (overlay_enabled) {
+ /* Need to disable the overlay before we can update
+@@ -1160,7 +1159,7 @@ static int mmal_setup_components(struct
+ ret = vchiq_mmal_port_connect_tunnel(
+ dev->instance,
+ preview_port,
+- &dev->component[MMAL_COMPONENT_PREVIEW]->input[0]);
++ &dev->component[COMP_PREVIEW]->input[0]);
+ if (!ret)
+ ret = vchiq_mmal_port_enable(dev->instance,
+ preview_port,
+@@ -1214,11 +1213,11 @@ static int mmal_setup_components(struct
+ port->format.encoding_variant = 0;
+ /* Set any encoding specific parameters */
+ switch (mfmt->mmal_component) {
+- case MMAL_COMPONENT_VIDEO_ENCODE:
++ case COMP_VIDEO_ENCODE:
+ port->format.bitrate =
+ dev->capture.encode_bitrate;
+ break;
+- case MMAL_COMPONENT_IMAGE_ENCODE:
++ case COMP_IMAGE_ENCODE:
+ /* Could set EXIF parameters here */
+ break;
+ default:
+@@ -1593,14 +1592,14 @@ static int mmal_init(struct bm2835_mmal_
+
+ /* get the camera component ready */
+ ret = vchiq_mmal_component_init(dev->instance, "ril.camera",
+- &dev->component[MMAL_COMPONENT_CAMERA]);
++ &dev->component[COMP_CAMERA]);
+ if (ret < 0)
+ goto unreg_mmal;
+
+- camera = dev->component[MMAL_COMPONENT_CAMERA];
+- if (camera->outputs < MMAL_CAMERA_PORT_COUNT) {
++ camera = dev->component[COMP_CAMERA];
++ if (camera->outputs < CAM_PORT_COUNT) {
+ v4l2_err(&dev->v4l2_dev, "%s: too few camera outputs %d needed %d\n",
+- __func__, camera->outputs, MMAL_CAMERA_PORT_COUNT);
++ __func__, camera->outputs, CAM_PORT_COUNT);
+ ret = -EINVAL;
+ goto unreg_camera;
+ }
+@@ -1622,7 +1621,7 @@ static int mmal_init(struct bm2835_mmal_
+ dev->rgb_bgr_swapped = true;
+ param_size = sizeof(supported_encodings);
+ ret = vchiq_mmal_port_parameter_get(dev->instance,
+- &camera->output[MMAL_CAMERA_PORT_CAPTURE],
++ &camera->output[CAM_PORT_CAPTURE],
+ MMAL_PARAMETER_SUPPORTED_ENCODINGS,
+ &supported_encodings,
+ ¶m_size);
+@@ -1643,7 +1642,7 @@ static int mmal_init(struct bm2835_mmal_
+ }
+ }
+ }
+- format = &camera->output[MMAL_CAMERA_PORT_PREVIEW].format;
++ format = &camera->output[CAM_PORT_PREVIEW].format;
+
+ format->encoding = MMAL_ENCODING_OPAQUE;
+ format->encoding_variant = MMAL_ENCODING_I420;
+@@ -1657,7 +1656,7 @@ static int mmal_init(struct bm2835_mmal_
+ format->es->video.frame_rate.num = 0; /* Rely on fps_range */
+ format->es->video.frame_rate.den = 1;
+
+- format = &camera->output[MMAL_CAMERA_PORT_VIDEO].format;
++ format = &camera->output[CAM_PORT_VIDEO].format;
+
+ format->encoding = MMAL_ENCODING_OPAQUE;
+ format->encoding_variant = MMAL_ENCODING_I420;
+@@ -1671,7 +1670,7 @@ static int mmal_init(struct bm2835_mmal_
+ format->es->video.frame_rate.num = 0; /* Rely on fps_range */
+ format->es->video.frame_rate.den = 1;
+
+- format = &camera->output[MMAL_CAMERA_PORT_CAPTURE].format;
++ format = &camera->output[CAM_PORT_CAPTURE].format;
+
+ format->encoding = MMAL_ENCODING_OPAQUE;
+
+@@ -1695,28 +1694,28 @@ static int mmal_init(struct bm2835_mmal_
+ /* get the preview component ready */
+ ret = vchiq_mmal_component_init(
+ dev->instance, "ril.video_render",
+- &dev->component[MMAL_COMPONENT_PREVIEW]);
++ &dev->component[COMP_PREVIEW]);
+ if (ret < 0)
+ goto unreg_camera;
+
+- if (dev->component[MMAL_COMPONENT_PREVIEW]->inputs < 1) {
++ if (dev->component[COMP_PREVIEW]->inputs < 1) {
+ ret = -EINVAL;
+ v4l2_err(&dev->v4l2_dev, "%s: too few input ports %d needed %d\n",
+- __func__, dev->component[MMAL_COMPONENT_PREVIEW]->inputs, 1);
++ __func__, dev->component[COMP_PREVIEW]->inputs, 1);
+ goto unreg_preview;
+ }
+
+ /* get the image encoder component ready */
+ ret = vchiq_mmal_component_init(
+ dev->instance, "ril.image_encode",
+- &dev->component[MMAL_COMPONENT_IMAGE_ENCODE]);
++ &dev->component[COMP_IMAGE_ENCODE]);
+ if (ret < 0)
+ goto unreg_preview;
+
+- if (dev->component[MMAL_COMPONENT_IMAGE_ENCODE]->inputs < 1) {
++ if (dev->component[COMP_IMAGE_ENCODE]->inputs < 1) {
+ ret = -EINVAL;
+ v4l2_err(&dev->v4l2_dev, "%s: too few input ports %d needed %d\n",
+- __func__, dev->component[MMAL_COMPONENT_IMAGE_ENCODE]->inputs,
++ __func__, dev->component[COMP_IMAGE_ENCODE]->inputs,
+ 1);
+ goto unreg_image_encoder;
+ }
+@@ -1724,21 +1723,21 @@ static int mmal_init(struct bm2835_mmal_
+ /* get the video encoder component ready */
+ ret = vchiq_mmal_component_init(dev->instance, "ril.video_encode",
+ &dev->
+- component[MMAL_COMPONENT_VIDEO_ENCODE]);
++ component[COMP_VIDEO_ENCODE]);
+ if (ret < 0)
+ goto unreg_image_encoder;
+
+- if (dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->inputs < 1) {
++ if (dev->component[COMP_VIDEO_ENCODE]->inputs < 1) {
+ ret = -EINVAL;
+ v4l2_err(&dev->v4l2_dev, "%s: too few input ports %d needed %d\n",
+- __func__, dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->inputs,
++ __func__, dev->component[COMP_VIDEO_ENCODE]->inputs,
+ 1);
+ goto unreg_vid_encoder;
+ }
+
+ {
+ struct vchiq_mmal_port *encoder_port =
+- &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
++ &dev->component[COMP_VIDEO_ENCODE]->output[0];
+ encoder_port->format.encoding = MMAL_ENCODING_H264;
+ ret = vchiq_mmal_port_set_format(dev->instance,
+ encoder_port);
+@@ -1749,12 +1748,12 @@ static int mmal_init(struct bm2835_mmal_
+
+ vchiq_mmal_port_parameter_set(
+ dev->instance,
+- &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->control,
++ &dev->component[COMP_VIDEO_ENCODE]->control,
+ MMAL_PARAMETER_VIDEO_IMMUTABLE_INPUT,
+ &enable, sizeof(enable));
+
+ vchiq_mmal_port_parameter_set(dev->instance,
+- &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->control,
++ &dev->component[COMP_VIDEO_ENCODE]->control,
+ MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
+ &enable,
+ sizeof(enable));
+@@ -1772,23 +1771,23 @@ unreg_vid_encoder:
+ pr_err("Cleanup: Destroy video encoder\n");
+ vchiq_mmal_component_finalise(
+ dev->instance,
+- dev->component[MMAL_COMPONENT_VIDEO_ENCODE]);
++ dev->component[COMP_VIDEO_ENCODE]);
+
+ unreg_image_encoder:
+ pr_err("Cleanup: Destroy image encoder\n");
+ vchiq_mmal_component_finalise(
+ dev->instance,
+- dev->component[MMAL_COMPONENT_IMAGE_ENCODE]);
++ dev->component[COMP_IMAGE_ENCODE]);
+
+ unreg_preview:
+ pr_err("Cleanup: Destroy video render\n");
+ vchiq_mmal_component_finalise(dev->instance,
+- dev->component[MMAL_COMPONENT_PREVIEW]);
++ dev->component[COMP_PREVIEW]);
+
+ unreg_camera:
+ pr_err("Cleanup: Destroy camera\n");
+ vchiq_mmal_component_finalise(dev->instance,
+- dev->component[MMAL_COMPONENT_CAMERA]);
++ dev->component[COMP_CAMERA]);
+
+ unreg_mmal:
+ vchiq_mmal_finalise(dev->instance);
+@@ -1844,21 +1843,21 @@ static void bcm2835_cleanup_instance(str
+ dev->capture.encode_component);
+ }
+ vchiq_mmal_component_disable(dev->instance,
+- dev->component[MMAL_COMPONENT_CAMERA]);
++ dev->component[COMP_CAMERA]);
+
+ vchiq_mmal_component_finalise(dev->instance,
+ dev->
+- component[MMAL_COMPONENT_VIDEO_ENCODE]);
++ component[COMP_VIDEO_ENCODE]);
+
+ vchiq_mmal_component_finalise(dev->instance,
+ dev->
+- component[MMAL_COMPONENT_IMAGE_ENCODE]);
++ component[COMP_IMAGE_ENCODE]);
+
+ vchiq_mmal_component_finalise(dev->instance,
+- dev->component[MMAL_COMPONENT_PREVIEW]);
++ dev->component[COMP_PREVIEW]);
+
+ vchiq_mmal_component_finalise(dev->instance,
+- dev->component[MMAL_COMPONENT_CAMERA]);
++ dev->component[COMP_CAMERA]);
+
+ v4l2_ctrl_handler_free(&dev->ctrl_handler);
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
+@@ -16,18 +16,18 @@
+ #define V4L2_CTRL_COUNT 29 /* number of v4l controls */
+
+ enum {
+- MMAL_COMPONENT_CAMERA = 0,
+- MMAL_COMPONENT_PREVIEW,
+- MMAL_COMPONENT_IMAGE_ENCODE,
+- MMAL_COMPONENT_VIDEO_ENCODE,
+- MMAL_COMPONENT_COUNT
++ COMP_CAMERA = 0,
++ COMP_PREVIEW,
++ COMP_IMAGE_ENCODE,
++ COMP_VIDEO_ENCODE,
++ COMP_COUNT
+ };
+
+ enum {
+- MMAL_CAMERA_PORT_PREVIEW = 0,
+- MMAL_CAMERA_PORT_VIDEO,
+- MMAL_CAMERA_PORT_CAPTURE,
+- MMAL_CAMERA_PORT_COUNT
++ CAM_PORT_PREVIEW = 0,
++ CAM_PORT_VIDEO,
++ CAM_PORT_CAPTURE,
++ CAM_PORT_COUNT
+ };
+
+ #define PREVIEW_LAYER 2
+@@ -61,7 +61,7 @@ struct bm2835_mmal_dev {
+
+ /* allocated mmal instance and components */
+ struct vchiq_mmal_instance *instance;
+- struct vchiq_mmal_component *component[MMAL_COMPONENT_COUNT];
++ struct vchiq_mmal_component *component[COMP_COUNT];
+ int camera_use_count;
+
+ struct v4l2_window overlay;
+--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
+@@ -176,7 +176,7 @@ static int ctrl_set_rational(struct bm28
+ struct mmal_parameter_rational rational_value;
+ 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.den = 100;
+@@ -194,7 +194,7 @@ static int ctrl_set_value(struct bm2835_
+ u32 u32_value;
+ struct vchiq_mmal_port *control;
+
+- control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
++ control = &dev->component[COMP_CAMERA]->control;
+
+ u32_value = ctrl->val;
+
+@@ -219,7 +219,7 @@ static int ctrl_set_iso(struct bm2835_mm
+ dev->manual_iso_enabled =
+ (ctrl->val == V4L2_ISO_SENSITIVITY_MANUAL);
+
+- control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
++ control = &dev->component[COMP_CAMERA]->control;
+
+ if (dev->manual_iso_enabled)
+ u32_value = dev->iso;
+@@ -238,7 +238,7 @@ static int ctrl_set_value_ev(struct bm28
+ s32 s32_value;
+ 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 */
+
+@@ -255,7 +255,7 @@ static int ctrl_set_rotate(struct bm2835
+ u32 u32_value;
+ struct vchiq_mmal_component *camera;
+
+- camera = dev->component[MMAL_COMPONENT_CAMERA];
++ camera = dev->component[COMP_CAMERA];
+
+ u32_value = ((ctrl->val % 360) / 90) * 90;
+
+@@ -291,7 +291,7 @@ static int ctrl_set_flip(struct bm2835_m
+ else
+ dev->vflip = ctrl->val;
+
+- camera = dev->component[MMAL_COMPONENT_CAMERA];
++ camera = dev->component[COMP_CAMERA];
+
+ if (dev->hflip && dev->vflip)
+ u32_value = MMAL_PARAM_MIRROR_BOTH;
+@@ -330,7 +330,7 @@ static int ctrl_set_exposure(struct bm28
+ struct vchiq_mmal_port *control;
+ 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) {
+ /* V4L2 is in 100usec increments.
+@@ -405,7 +405,7 @@ static int ctrl_set_metering_mode(struct
+ struct vchiq_mmal_port *control;
+ 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,
+ mmal_ctrl->mmal_id,
+@@ -421,7 +421,7 @@ static int ctrl_set_flicker_avoidance(st
+ u32 u32_value;
+ struct vchiq_mmal_port *control;
+
+- control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
++ control = &dev->component[COMP_CAMERA]->control;
+
+ switch (ctrl->val) {
+ case V4L2_CID_POWER_LINE_FREQUENCY_DISABLED:
+@@ -450,7 +450,7 @@ static int ctrl_set_awb_mode(struct bm28
+ u32 u32_value;
+ struct vchiq_mmal_port *control;
+
+- control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
++ control = &dev->component[COMP_CAMERA]->control;
+
+ switch (ctrl->val) {
+ case V4L2_WHITE_BALANCE_MANUAL:
+@@ -506,7 +506,7 @@ static int ctrl_set_awb_gains(struct bm2
+ struct vchiq_mmal_port *control;
+ 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)
+ dev->red_gain = ctrl->val;
+@@ -554,7 +554,7 @@ static int ctrl_set_image_effect(struct
+ 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(
+ dev->instance, control,
+@@ -587,7 +587,7 @@ static int ctrl_set_colfx(struct bm2835_
+ int ret = -EINVAL;
+ 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 & 0xff;
+@@ -613,7 +613,7 @@ static int ctrl_set_bitrate(struct bm283
+
+ 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,
+ mmal_ctrl->mmal_id,
+@@ -629,7 +629,7 @@ static int ctrl_set_bitrate_mode(struct
+ u32 bitrate_mode;
+ 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;
+ switch (ctrl->val) {
+@@ -656,7 +656,7 @@ static int ctrl_set_image_encode_output(
+ u32 u32_value;
+ 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;
+
+@@ -672,7 +672,7 @@ static int ctrl_set_video_encode_param_o
+ u32 u32_value;
+ 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;
+
+@@ -785,7 +785,7 @@ static int ctrl_set_video_encode_profile
+ }
+
+ 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,
+ ¶m, sizeof(param));
+ }
+@@ -803,7 +803,7 @@ static int ctrl_set_scene_mode(struct bm
+ v4l2_dbg(0, bcm2835_v4l2_debug, &dev->v4l2_dev,
+ "scene mode selected %d, was %d\n", ctrl->val,
+ dev->scene_mode);
+- control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
++ control = &dev->component[COMP_CAMERA]->control;
+
+ if (ctrl->val == dev->scene_mode)
+ return 0;
+@@ -1221,18 +1221,15 @@ int set_framerate_params(struct bm2835_m
+ fps_range.fps_high.den);
+
+ ret = vchiq_mmal_port_parameter_set(dev->instance,
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_PREVIEW],
++ &dev->component[COMP_CAMERA]->output[CAM_PORT_PREVIEW],
+ MMAL_PARAMETER_FPS_RANGE,
+ &fps_range, sizeof(fps_range));
+ ret += vchiq_mmal_port_parameter_set(dev->instance,
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_VIDEO],
++ &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO],
+ MMAL_PARAMETER_FPS_RANGE,
+ &fps_range, sizeof(fps_range));
+ ret += vchiq_mmal_port_parameter_set(dev->instance,
+- &dev->component[MMAL_COMPONENT_CAMERA]->
+- output[MMAL_CAMERA_PORT_CAPTURE],
++ &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE],
+ MMAL_PARAMETER_FPS_RANGE,
+ &fps_range, sizeof(fps_range));
+ if (ret)
projects / openwrt / openwrt.git / blobdiff