Commit d0dee553 authored by Derek Robson's avatar Derek Robson Committed by Greg Kroah-Hartman

Staging: bcm2835: Fixed style of block comments

Fixed style of block comments across whole driver
Found using checkpatch
Signed-off-by: default avatarDerek Robson <robsonde@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ba835dd
...@@ -236,8 +236,9 @@ static struct mmal_fmt *get_format(struct v4l2_format *f) ...@@ -236,8 +236,9 @@ static struct mmal_fmt *get_format(struct v4l2_format *f)
} }
/* ------------------------------------------------------------------ /* ------------------------------------------------------------------
Videobuf queue operations * Videobuf queue operations
------------------------------------------------------------------*/ * ------------------------------------------------------------------
*/
static int queue_setup(struct vb2_queue *vq, static int queue_setup(struct vb2_queue *vq,
unsigned int *nbuffers, unsigned int *nplanes, unsigned int *nbuffers, unsigned int *nplanes,
...@@ -665,8 +666,9 @@ static struct vb2_ops bm2835_mmal_video_qops = { ...@@ -665,8 +666,9 @@ static struct vb2_ops bm2835_mmal_video_qops = {
}; };
/* ------------------------------------------------------------------ /* ------------------------------------------------------------------
IOCTL operations * IOCTL operations
------------------------------------------------------------------*/ * ------------------------------------------------------------------
*/
static int set_overlay_params(struct bm2835_mmal_dev *dev, static int set_overlay_params(struct bm2835_mmal_dev *dev,
struct vchiq_mmal_port *port) struct vchiq_mmal_port *port)
...@@ -828,7 +830,8 @@ static int vidioc_g_fbuf(struct file *file, void *fh, ...@@ -828,7 +830,8 @@ static int vidioc_g_fbuf(struct file *file, void *fh,
struct v4l2_framebuffer *a) struct v4l2_framebuffer *a)
{ {
/* The video overlay must stay within the framebuffer and can't be /* The video overlay must stay within the framebuffer and can't be
positioned independently. */ * positioned independently.
*/
struct bm2835_mmal_dev *dev = video_drvdata(file); struct bm2835_mmal_dev *dev = video_drvdata(file);
struct vchiq_mmal_port *preview_port = struct vchiq_mmal_port *preview_port =
&dev->component[MMAL_COMPONENT_CAMERA]-> &dev->component[MMAL_COMPONENT_CAMERA]->
...@@ -1285,7 +1288,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, ...@@ -1285,7 +1288,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
} }
/* If the format is unsupported v4l2 says we should switch to /* If the format is unsupported v4l2 says we should switch to
* a supported one and not return an error. */ * a supported one and not return an error.
*/
mfmt = get_format(f); mfmt = get_format(f);
if (!mfmt) { if (!mfmt) {
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
...@@ -1479,7 +1483,8 @@ static const struct v4l2_ioctl_ops camera0_ioctl_ops_gstreamer = { ...@@ -1479,7 +1483,8 @@ static const struct v4l2_ioctl_ops camera0_ioctl_ops_gstreamer = {
.vidioc_qbuf = vb2_ioctl_qbuf, .vidioc_qbuf = vb2_ioctl_qbuf,
.vidioc_dqbuf = vb2_ioctl_dqbuf, .vidioc_dqbuf = vb2_ioctl_dqbuf,
/* Remove this function ptr to fix gstreamer bug /* Remove this function ptr to fix gstreamer bug
.vidioc_enum_framesizes = vidioc_enum_framesizes, */ * .vidioc_enum_framesizes = vidioc_enum_framesizes,
*/
.vidioc_enum_frameintervals = vidioc_enum_frameintervals, .vidioc_enum_frameintervals = vidioc_enum_frameintervals,
.vidioc_g_parm = vidioc_g_parm, .vidioc_g_parm = vidioc_g_parm,
.vidioc_s_parm = vidioc_s_parm, .vidioc_s_parm = vidioc_s_parm,
...@@ -1492,8 +1497,9 @@ static const struct v4l2_ioctl_ops camera0_ioctl_ops_gstreamer = { ...@@ -1492,8 +1497,9 @@ static const struct v4l2_ioctl_ops camera0_ioctl_ops_gstreamer = {
}; };
/* ------------------------------------------------------------------ /* ------------------------------------------------------------------
Driver init/finalise * Driver init/finalise
------------------------------------------------------------------*/ * ------------------------------------------------------------------
*/
static const struct v4l2_file_operations camera0_fops = { static const struct v4l2_file_operations camera0_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -90,7 +90,8 @@ struct bm2835_mmal_v4l2_ctrl { ...@@ -90,7 +90,8 @@ struct bm2835_mmal_v4l2_ctrl {
u32 id; /* v4l2 control identifier */ u32 id; /* v4l2 control identifier */
enum bm2835_mmal_ctrl_type type; enum bm2835_mmal_ctrl_type type;
/* control minimum value or /* control minimum value or
* mask for MMAL_CONTROL_TYPE_STD_MENU */ * mask for MMAL_CONTROL_TYPE_STD_MENU
*/
s32 min; s32 min;
s32 max; /* maximum value of control */ s32 max; /* maximum value of control */
s32 def; /* default value of control */ s32 def; /* default value of control */
...@@ -396,10 +397,10 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev, ...@@ -396,10 +397,10 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev,
break; break;
/* todo matrix weighting not added to Linux API till 3.9 /* todo matrix weighting not added to Linux API till 3.9
case V4L2_EXPOSURE_METERING_MATRIX: * case V4L2_EXPOSURE_METERING_MATRIX:
dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX; * dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX;
break; * break;
*/ */
} }
if (dev->scene_mode == V4L2_SCENE_MODE_NONE) { if (dev->scene_mode == V4L2_SCENE_MODE_NONE) {
...@@ -978,8 +979,9 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { ...@@ -978,8 +979,9 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
false false
}, },
/* { /* {
0, MMAL_CONTROL_TYPE_CLUSTER, 3, 1, 0, NULL, 0, NULL * 0, MMAL_CONTROL_TYPE_CLUSTER, 3, 1, 0, NULL, 0, NULL
}, */ * },
*/
{ {
V4L2_CID_EXPOSURE_AUTO, MMAL_CONTROL_TYPE_STD_MENU, V4L2_CID_EXPOSURE_AUTO, MMAL_CONTROL_TYPE_STD_MENU,
~0x03, 3, V4L2_EXPOSURE_AUTO, 0, NULL, ~0x03, 3, V4L2_EXPOSURE_AUTO, 0, NULL,
...@@ -988,9 +990,9 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { ...@@ -988,9 +990,9 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
false false
}, },
/* todo this needs mixing in with set exposure /* todo this needs mixing in with set exposure
{ * {
V4L2_CID_SCENE_MODE, MMAL_CONTROL_TYPE_STD_MENU, * V4L2_CID_SCENE_MODE, MMAL_CONTROL_TYPE_STD_MENU,
}, * },
*/ */
{ {
V4L2_CID_EXPOSURE_ABSOLUTE, MMAL_CONTROL_TYPE_STD, V4L2_CID_EXPOSURE_ABSOLUTE, MMAL_CONTROL_TYPE_STD,
......
...@@ -26,12 +26,14 @@ enum mmal_port_type { ...@@ -26,12 +26,14 @@ enum mmal_port_type {
#define MMAL_PORT_CAPABILITY_PASSTHROUGH 0x01 #define MMAL_PORT_CAPABILITY_PASSTHROUGH 0x01
/** The port wants to allocate the buffer payloads. /** The port wants to allocate the buffer payloads.
* This signals a preference that payload allocation should be done * This signals a preference that payload allocation should be done
* on this port for efficiency reasons. */ * on this port for efficiency reasons.
*/
#define MMAL_PORT_CAPABILITY_ALLOCATION 0x02 #define MMAL_PORT_CAPABILITY_ALLOCATION 0x02
/** The port supports format change events. /** The port supports format change events.
* This applies to input ports and is used to let the client know * This applies to input ports and is used to let the client know
* whether the port supports being reconfigured via a format * whether the port supports being reconfigured via a format
* change event (i.e. without having to disable the port). */ * change event (i.e. without having to disable the port).
*/
#define MMAL_PORT_CAPABILITY_SUPPORTS_EVENT_FORMAT_CHANGE 0x04 #define MMAL_PORT_CAPABILITY_SUPPORTS_EVENT_FORMAT_CHANGE 0x04
/* mmal port structure (MMAL_PORT_T) /* mmal port structure (MMAL_PORT_T)
......
...@@ -108,9 +108,9 @@ struct mmal_msg_component_create { ...@@ -108,9 +108,9 @@ struct mmal_msg_component_create {
/* reply from VC to component creation request */ /* reply from VC to component creation request */
struct mmal_msg_component_create_reply { struct mmal_msg_component_create_reply {
u32 status; /** enum mmal_msg_status - how does this differ to u32 status; /* enum mmal_msg_status - how does this differ to
* the one in the header? * the one in the header?
*/ */
u32 component_handle; /* VideoCore handle for component */ u32 component_handle; /* VideoCore handle for component */
u32 input_num; /* Number of input ports */ u32 input_num; /* Number of input ports */
u32 output_num; /* Number of output ports */ u32 output_num; /* Number of output ports */
...@@ -228,10 +228,12 @@ struct mmal_msg_port_action_reply { ...@@ -228,10 +228,12 @@ struct mmal_msg_port_action_reply {
/** Signals that the current payload is a keyframe (i.e. self decodable) */ /** Signals that the current payload is a keyframe (i.e. self decodable) */
#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME (1<<3) #define MMAL_BUFFER_HEADER_FLAG_KEYFRAME (1<<3)
/** Signals a discontinuity in the stream of data (e.g. after a seek). /** Signals a discontinuity in the stream of data (e.g. after a seek).
* Can be used for instance by a decoder to reset its state */ * Can be used for instance by a decoder to reset its state
*/
#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY (1<<4) #define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY (1<<4)
/** Signals a buffer containing some kind of config data for the component /** Signals a buffer containing some kind of config data for the component
* (e.g. codec config data) */ * (e.g. codec config data)
*/
#define MMAL_BUFFER_HEADER_FLAG_CONFIG (1<<5) #define MMAL_BUFFER_HEADER_FLAG_CONFIG (1<<5)
/** Signals an encrypted payload */ /** Signals an encrypted payload */
#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED (1<<6) #define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED (1<<6)
...@@ -314,9 +316,9 @@ struct mmal_msg_port_parameter_set { ...@@ -314,9 +316,9 @@ struct mmal_msg_port_parameter_set {
}; };
struct mmal_msg_port_parameter_set_reply { struct mmal_msg_port_parameter_set_reply {
u32 status; /** enum mmal_msg_status todo: how does this u32 status; /* enum mmal_msg_status todo: how does this
* differ to the one in the header? * differ to the one in the header?
*/ */
}; };
/* port parameter getting */ /* port parameter getting */
......
...@@ -1559,7 +1559,8 @@ static int port_enable(struct vchiq_mmal_instance *instance, ...@@ -1559,7 +1559,8 @@ static int port_enable(struct vchiq_mmal_instance *instance,
/* ------------------------------------------------------------------ /* ------------------------------------------------------------------
* Exported API * Exported API
*------------------------------------------------------------------*/ *------------------------------------------------------------------
*/
int vchiq_mmal_port_set_format(struct vchiq_mmal_instance *instance, int vchiq_mmal_port_set_format(struct vchiq_mmal_instance *instance,
struct vchiq_mmal_port *port) struct vchiq_mmal_port *port)
......
...@@ -108,8 +108,8 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance); ...@@ -108,8 +108,8 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance);
int vchiq_mmal_finalise(struct vchiq_mmal_instance *instance); int vchiq_mmal_finalise(struct vchiq_mmal_instance *instance);
/* Initialise a mmal component and its ports /* Initialise a mmal component and its ports
* *
*/ */
int vchiq_mmal_component_init( int vchiq_mmal_component_init(
struct vchiq_mmal_instance *instance, struct vchiq_mmal_instance *instance,
const char *name, const char *name,
......
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