Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84adcb14 authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: Move struct vchiq_mmal_rect 



struct vchiq_mmal_rect is only referenced from mmal-parameters.h, yet
was defined in mmal-vchiq.h.

Move it to avoid having to include multiple headers for no reason.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 514a6ab1

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

+8 −0
Original line number Diff line number Diff line
@@ -564,6 +564,14 @@ enum mmal_parameter_displayset { 
	MMAL_DISPLAY_SET_ALPHA = 0x400,

};



/* rectangle, used lots so it gets its own struct */

struct vchiq_mmal_rect {

	s32 x;

	s32 y;

	s32 width;

	s32 height;

};



struct mmal_parameter_displayregion {

	/** Bitfield that indicates which fields are set and should be

	 * used. All other fields will maintain their current value.

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

+0 −8
Original line number Diff line number Diff line
@@ -32,14 +32,6 @@ enum vchiq_mmal_es_type { 
	MMAL_ES_TYPE_SUBPICTURE   /**< Sub-picture elementary stream */

};



/* rectangle, used lots so it gets its own struct */

struct vchiq_mmal_rect {

	s32 x;

	s32 y;

	s32 width;

	s32 height;

};



struct vchiq_mmal_port_buffer {

	unsigned int num; /* number of buffers */

	u32 size; /* size of buffers */