Hi Sylwester,
Thanks for the comments!!
Sylwester Nawrocki wrote:
> Hi Sakari,
>
> On 06/10/2012 09:34 PM, Sakari Ailus wrote:
>> Signed-off-by: Sakari Ailus<sakari.ailus@xxxxxx>
>> ---
>> drivers/media/video/omap3isp/ispccdc.c | 6 ++--
>> drivers/media/video/omap3isp/isppreview.c | 6 ++--
>> drivers/media/video/omap3isp/ispresizer.c | 6 ++--
>> drivers/media/video/smiapp/smiapp-core.c | 30 +++++++++---------
>> drivers/media/video/v4l2-subdev.c | 4 +-
>> include/linux/v4l2-common.h | 49
>> +++++++++++++++++++++++++++++
>> include/linux/v4l2-subdev.h | 13 +------
>> include/linux/videodev2.h | 20 +----------
>> 8 files changed, 79 insertions(+), 55 deletions(-)
>> create mode 100644 include/linux/v4l2-common.h
> <snip>
>> diff --git a/include/linux/v4l2-common.h b/include/linux/v4l2-common.h
>> new file mode 100644
>> index 0000000..e0db6e3
>> --- /dev/null
>> +++ b/include/linux/v4l2-common.h
>> @@ -0,0 +1,49 @@
>> +/*
>> + * include/linux/v4l2-common.h
>> + *
>> + * Common V4L2 and V4L2 subdev definitions.
>> + *
>> + * Users are adviced to #include this file either videodev2.h (V4L2)
>
> s/either videodev2.h/either from videodev2.h ?
>
>> + * or v4l2-subdev.h (V4L2 subdev) rather than to refer to this file
>
> s/or v4l2-subdev.h/or from v4l2-subdev.h ?
How about "through" for both?
>> + * directly.
>> + *
>> + * Copyright (C) 2012 Nokia Corporation
>> + * Contact: Sakari Ailus<sakari.ailus@xxxxxxxxxxxxxxxxxxxxxxxxxx>
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License
>> + * version 2 as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful, but
>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
>> + * 02110-1301 USA
>> + *
>> + */
>> +
>> +#ifndef __V4L2_COMMON__
>> +#define __V4L2_COMMON__
>> +
>> +/* Selection target definitions */
>> +
>> +/* Current cropping area */
>> +#define V4L2_SEL_TGT_CROP 0x0000
>> +/* Default cropping area */
>> +#define V4L2_SEL_TGT_CROP_DEFAULT 0x0001
>> +/* Cropping bounds */
>> +#define V4L2_SEL_TGT_CROP_BOUNDS 0x0002
>> +/* Current composing area */
>> +#define V4L2_SEL_TGT_COMPOSE 0x0100
>> +/* Default composing area */
>> +#define V4L2_SEL_TGT_COMPOSE_DEFAULT 0x0101
>> +/* Composing bounds */
>> +#define V4L2_SEL_TGT_COMPOSE_BOUNDS 0x0102
>> +/* Current composing area plus all padding pixels */
>> +#define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103
>> +
>> +#endif /* __V4L2_COMMON__ */
>> diff --git a/include/linux/v4l2-subdev.h b/include/linux/v4l2-subdev.h
>> index 01eee06..b75f535 100644
>> --- a/include/linux/v4l2-subdev.h
>> +++ b/include/linux/v4l2-subdev.h
>> @@ -127,22 +127,13 @@ struct v4l2_subdev_frame_interval_enum {
>> #define V4L2_SUBDEV_SEL_FLAG_SIZE_LE (1<< 1)
>> #define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG (1<< 2)
>>
>> -/* active cropping area */
>> -#define V4L2_SUBDEV_SEL_TGT_CROP 0x0000
>> -/* cropping bounds */
>> -#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS 0x0002
>> -/* current composing area */
>> -#define V4L2_SUBDEV_SEL_TGT_COMPOSE 0x0100
>> -/* composing bounds */
>> -#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS 0x0102
>> -
>> -
>
> Should this patch at the same time be adding:
>
> #include <linux/v4l2-common.h>
>
> to avoid build errors ?
Fixed.
>> /**
>> * struct v4l2_subdev_selection - selection info
>> *
>> * @which: either V4L2_SUBDEV_FORMAT_ACTIVE or V4L2_SUBDEV_FORMAT_TRY
>> * @pad: pad number, as reported by the media API
>> - * @target: selection target, used to choose one of possible rectangles
>> + * @target: Selection target, used to choose one of possible rectangles,
>> + * defined in v4l2-common.h; V4L2_SEL_TGT_* .
>> * @flags: constraint flags
>> * @r: coordinates of the selection window
>> * @reserved: for future use, set to zero for now
>> diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
>> index 2cff49c..10edd1d 100644
>> --- a/include/linux/videodev2.h
>> +++ b/include/linux/videodev2.h
>> @@ -765,27 +765,11 @@ struct v4l2_crop {
>> #define V4L2_SEL_FLAG_GE 0x00000001
>> #define V4L2_SEL_FLAG_LE 0x00000002
>
> And also in videdev2.h:
>
> #include <linux/v4l2-common.h>
>
> ?
Ditto.
>> -/* Selection targets */
>> -
>> -/* Current cropping area */
>> -#define V4L2_SEL_TGT_CROP 0x0000
>> -/* Default cropping area */
>> -#define V4L2_SEL_TGT_CROP_DEFAULT 0x0001
>> -/* Cropping bounds */
>> -#define V4L2_SEL_TGT_CROP_BOUNDS 0x0002
>> -/* Current composing area */
>> -#define V4L2_SEL_TGT_COMPOSE 0x0100
>> -/* Default composing area */
>> -#define V4L2_SEL_TGT_COMPOSE_DEFAULT 0x0101
>> -/* Composing bounds */
>> -#define V4L2_SEL_TGT_COMPOSE_BOUNDS 0x0102
>> -/* Current composing area plus all padding pixels */
>> -#define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103
>> -
>> /**
>> * struct v4l2_selection - selection info
>> * @type: buffer type (do not use *_MPLANE types)
>> - * @target: selection target, used to choose one of possible
>> rectangles
>> + * @target: Selection target, used to choose one of possible
>> rectangles;
>> + * defined in v4l2-common.h.
>> * @flags: constraints flags
>> * @r: coordinates of selection window
>> * @reserved: for future use, rounds structure size to 64 bytes,
>> set to zero
>
> There are now some missing renames, due to some patches that were merged
> recently. Please feel free to squash the attached patch with this one.
I merged it to the patch and put your SoB line there. :-)
Cheers,
--
Sakari Ailus
sakari.ailus@xxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
