Staging: bcm2835: Fixed style of block comments (d0dee553) · Commits · 戴 / test

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

+15 −9

Original line number	Diff line number	Diff line
		@@ -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,
		unsigned int nbuffers, unsigned int nplanes,
		@@ -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,
		struct vchiq_mmal_port *port)
		@@ -828,7 +830,8 @@ static int vidioc_g_fbuf(struct file file, void fh,
		struct v4l2_framebuffer *a)
		{
		/* 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 vchiq_mmal_port *preview_port =
		&dev->component[MMAL_COMPONENT_CAMERA]->
		@@ -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
		* a supported one and not return an error. */
		* a supported one and not return an error.
		*/
		mfmt = get_format(f);
		if (!mfmt) {
		v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
		@@ -1479,7 +1483,8 @@ static const struct v4l2_ioctl_ops camera0_ioctl_ops_gstreamer = {
		.vidioc_qbuf = vb2_ioctl_qbuf,
		.vidioc_dqbuf = vb2_ioctl_dqbuf,
		/* 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_g_parm = vidioc_g_parm,
		.vidioc_s_parm = vidioc_s_parm,
		@@ -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 = {
		.owner = THIS_MODULE,

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

+12 −10

Original line number	Diff line number	Diff line
		@@ -90,7 +90,8 @@ struct bm2835_mmal_v4l2_ctrl {
		u32 id; /* v4l2 control identifier */
		enum bm2835_mmal_ctrl_type type;
		/* control minimum value or
		* mask for MMAL_CONTROL_TYPE_STD_MENU */
		* mask for MMAL_CONTROL_TYPE_STD_MENU
		*/
		s32 min;
		s32 max; /* maximum value of control */
		s32 def; /* default value of control */
		@@ -396,9 +397,9 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev,
		break;

		/* todo matrix weighting not added to Linux API till 3.9
		case V4L2_EXPOSURE_METERING_MATRIX:
		dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX;
		break;
		* case V4L2_EXPOSURE_METERING_MATRIX:
		* dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX;
		* break;
		*/
		}

		@@ -978,8 +979,9 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
		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,
		~0x03, 3, V4L2_EXPOSURE_AUTO, 0, NULL,
		@@ -988,9 +990,9 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
		false
		},
		/* 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,

drivers/staging/vc04_services/bcm2835-camera/mmal-msg-port.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -26,12 +26,14 @@ enum mmal_port_type {
		#define MMAL_PORT_CAPABILITY_PASSTHROUGH 0x01
		/** The port wants to allocate the buffer payloads.
		* 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
		/** The port supports format change events.
		* This applies to input ports and is used to let the client know
		* 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

		/* mmal port structure (MMAL_PORT_T)

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

+10 −8

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ struct mmal_msg_component_create {

		/* reply from VC to component creation request */
		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?
		*/
		u32 component_handle; /* VideoCore handle for component */
		@@ -228,10 +228,12 @@ struct mmal_msg_port_action_reply {
		/** Signals that the current payload is a keyframe (i.e. self decodable) */
		#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME (1<<3)
		/** 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)
		/** 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)
		/** Signals an encrypted payload */
		#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED (1<<6)
		@@ -314,7 +316,7 @@ struct mmal_msg_port_parameter_set {
		};

		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?
		*/
		};

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1559,7 +1559,8 @@ done:

		/* ------------------------------------------------------------------
		* Exported API
		------------------------------------------------------------------/
		*------------------------------------------------------------------
		*/

		int vchiq_mmal_port_set_format(struct vchiq_mmal_instance *instance,
		struct vchiq_mmal_port *port)

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

+2 −2

File changed.

Contains only whitespace changes.

Admin message