Commit ecf4edfa authored by Dave Stevenson's avatar Dave Stevenson Committed by Phil Elwell
Browse files

staging: bcm2835-camera: Fix spacing around operators 



Fix checkpatch warnings over spaces around operators.
Many were around operations that can be replaced with the
BIT(x) macro, so replace with that where appropriate.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent 10fd2839

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

+16 −16
Original line number Diff line number Diff line
@@ -1126,10 +1126,10 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { 
	{

		V4L2_CID_MPEG_VIDEO_H264_PROFILE,

		MMAL_CONTROL_TYPE_STD_MENU,

		~((1<<V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |

			(1<<V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |

			(1<<V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |

			(1<<V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),

		~(BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |

		  BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |

		  BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |

		  BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),

		V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,

		V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, 1, NULL,

		MMAL_PARAMETER_PROFILE,
@@ -1138,18 +1138,18 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { 
	},

	{

		V4L2_CID_MPEG_VIDEO_H264_LEVEL, MMAL_CONTROL_TYPE_STD_MENU,

		~((1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_1B) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),

		~(BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),

		V4L2_MPEG_VIDEO_H264_LEVEL_4_0,

		V4L2_MPEG_VIDEO_H264_LEVEL_4_0, 1, NULL,

		MMAL_PARAMETER_PROFILE,

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

+13 −12
Original line number Diff line number Diff line
@@ -219,39 +219,40 @@ struct mmal_msg_port_action_reply { 
#define MMAL_VC_SHORT_DATA 128



/* Signals that the current payload is the end of the stream of data */

#define MMAL_BUFFER_HEADER_FLAG_EOS                    (1<<0)

#define MMAL_BUFFER_HEADER_FLAG_EOS                    BIT(0)

/* Signals that the start of the current payload starts a frame */

#define MMAL_BUFFER_HEADER_FLAG_FRAME_START            (1<<1)

#define MMAL_BUFFER_HEADER_FLAG_FRAME_START            BIT(1)

/* Signals that the end of the current payload ends a frame */

#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              (1<<2)

#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              BIT(2)

/* Signals that the current payload contains only complete frames (>1) */

#define MMAL_BUFFER_HEADER_FLAG_FRAME                  \

	(MMAL_BUFFER_HEADER_FLAG_FRAME_START|MMAL_BUFFER_HEADER_FLAG_FRAME_END)

	(MMAL_BUFFER_HEADER_FLAG_FRAME_START | \

	 MMAL_BUFFER_HEADER_FLAG_FRAME_END)

/* 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               BIT(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

 */

#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY          (1<<4)

#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY          BIT(4)

/*

 * Signals a buffer containing some kind of config data for the component

 * (e.g. codec config data)

 */

#define MMAL_BUFFER_HEADER_FLAG_CONFIG                 (1<<5)

#define MMAL_BUFFER_HEADER_FLAG_CONFIG                 BIT(5)

/* Signals an encrypted payload */

#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED              (1<<6)

#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED              BIT(6)

/* Signals a buffer containing side information */

#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO          (1<<7)

#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO          BIT(7)

/*

 * Signals a buffer which is the snapshot/postview image from a stills

 * capture

 */

#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT              (1<<8)

#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT              BIT(8)

/* Signals a buffer which contains data known to be corrupted */

#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED              (1<<9)

#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED              BIT(9)

/* Signals that a buffer failed to be transmitted */

#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    (1<<10)

#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    BIT(10)



struct mmal_driver_buffer {

	u32 magic;

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

+6 −6

File changed.

Contains only whitespace changes.