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

Commit 87185c95 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: rename v4l2_format_sdr to v4l2_sdr_format 



Rename v4l2_format_sdr to v4l2_sdr_format in order to keep it in
line with other formats.

Reported-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent c350912c

Documentation/DocBook/media/v4l/dev-sdr.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ of the data format. 
    </para>

    </para>





    <table pgwide="1" frame="none" id="v4l2-format-sdr">

    <table pgwide="1" frame="none" id="v4l2-format-sdr">

      <title>struct <structname>v4l2_format_sdr</structname></title>

      <title>struct <structname>v4l2_sdr_format</structname></title>

      <tgroup cols="3">

      <tgroup cols="3">

        &cs-str;

        &cs-str;

        <tbody valign="top">

        <tbody valign="top">

drivers/media/v4l2-core/v4l2-ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -246,7 +246,7 @@ static void v4l_print_format(const void *arg, bool write_only) 
	const struct v4l2_vbi_format *vbi;

	const struct v4l2_vbi_format *vbi;

	const struct v4l2_sliced_vbi_format *sliced;

	const struct v4l2_sliced_vbi_format *sliced;

	const struct v4l2_window *win;

	const struct v4l2_window *win;

	const struct v4l2_format_sdr *sdr;

	const struct v4l2_sdr_format *sdr;

	unsigned i;

	unsigned i;





	pr_cont("type=%s", prt_names(p->type, v4l2_type_names));

	pr_cont("type=%s", prt_names(p->type, v4l2_type_names));

include/uapi/linux/videodev2.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -1714,10 +1714,10 @@ struct v4l2_pix_format_mplane { 
} __attribute__ ((packed));

} __attribute__ ((packed));





/**

/**

 * struct v4l2_format_sdr - SDR format definition

 * struct v4l2_sdr_format - SDR format definition

 * @pixelformat:	little endian four character code (fourcc)

 * @pixelformat:	little endian four character code (fourcc)

 */

 */

struct v4l2_format_sdr {

struct v4l2_sdr_format {

	__u32				pixelformat;

	__u32				pixelformat;

	__u8				reserved[28];

	__u8				reserved[28];

} __attribute__ ((packed));

} __attribute__ ((packed));
@@ -1740,7 +1740,7 @@ struct v4l2_format { 
		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */

		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */

		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */

		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */

		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */

		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */

		struct v4l2_format_sdr		sdr;     /* V4L2_BUF_TYPE_SDR_CAPTURE */

		struct v4l2_sdr_format		sdr;     /* V4L2_BUF_TYPE_SDR_CAPTURE */

		__u8	raw_data[200];                   /* user-defined */

		__u8	raw_data[200];                   /* user-defined */

	} fmt;

	} fmt;

};

};