git.openwrt.org Git - openwrt/staging/yousong.git/blob

   1 From 7df25059f84e7dab7fc8d733b83f016b62a33372 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Thu, 10 May 2018 12:42:13 -0700
   4 Subject: [PATCH 373/454] staging: bcm2835-camera: Move struct vchiq_mmal_rect
   5
   6 commit 84adcb14133ed2412d54355539a8ab4d6a3fcabc upstream.
   7
   8 struct vchiq_mmal_rect is only referenced from mmal-parameters.h, yet
   9 was defined in mmal-vchiq.h.
  10
  11 Move it to avoid having to include multiple headers for no reason.
  12
  13 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  14 Signed-off-by: Eric Anholt <eric@anholt.net>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16 ---
  17  .../vc04_services/bcm2835-camera/mmal-parameters.h        | 8 ++++++++
  18  drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h | 8 --------
  19  2 files changed, 8 insertions(+), 8 deletions(-)
  20
  21 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
  22 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
  23 @@ -567,6 +567,14 @@ enum mmal_parameter_displayset {
  24         MMAL_DISPLAY_SET_ALPHA = 0x400,
  25  };
  26
  27 +/* rectangle, used lots so it gets its own struct */
  28 +struct vchiq_mmal_rect {
  29 +       s32 x;
  30 +       s32 y;
  31 +       s32 width;
  32 +       s32 height;
  33 +};
  34 +
  35  struct mmal_parameter_displayregion {
  36         /** Bitfield that indicates which fields are set and should be
  37          * used. All other fields will maintain their current value.
  38 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
  39 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
  40 @@ -35,14 +35,6 @@ enum vchiq_mmal_es_type {
  41         MMAL_ES_TYPE_SUBPICTURE   /**< Sub-picture elementary stream */
  42  };
  43
  44 -/* rectangle, used lots so it gets its own struct */
  45 -struct vchiq_mmal_rect {
  46 -       s32 x;
  47 -       s32 y;
  48 -       s32 width;
  49 -       s32 height;
  50 -};
  51 -
  52  struct vchiq_mmal_port_buffer {
  53         unsigned int num; /* number of buffers */
  54         u32 size; /* size of buffers */