summaryrefslogtreecommitdiff
path: root/include/media/tpg
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2017-10-09 13:10:28 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-12-18 20:29:05 +0300
commitb29fd5639c8a7d2f419f0aea5a36f9a58027b29d (patch)
treeb7c7327b3cb98447231c6077a31488ca3777d818 /include/media/tpg
parent1beb623bdab53fb148b0ae4161b816e40ed16ca1 (diff)
downloadlinux-b29fd5639c8a7d2f419f0aea5a36f9a58027b29d.tar.xz
media: v4l2-tpg.h: rename color structs
The color structs right now are just "color" and "color16". That may lead into conflicts, and don't define precisely what they meant. As those are used by two drivers (vivid and vimc), this is even on a somewhat public header! So rename them to: color -> tpg_rbg_color8 color16 -> tpg_rbg_color16 Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/media/tpg')
-rw-r--r--include/media/tpg/v4l2-tpg.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/media/tpg/v4l2-tpg.h b/include/media/tpg/v4l2-tpg.h
index 028d81182011..bc0b38440719 100644
--- a/include/media/tpg/v4l2-tpg.h
+++ b/include/media/tpg/v4l2-tpg.h
@@ -27,11 +27,11 @@
#include <linux/vmalloc.h>
#include <linux/videodev2.h>
-struct color {
+struct tpg_rbg_color8 {
unsigned char r, g, b;
};
-struct color16 {
+struct tpg_rbg_color16 {
int r, g, b;
};
@@ -65,10 +65,10 @@ enum tpg_color {
TPG_COLOR_MAX = TPG_COLOR_RAMP + 256
};
-extern const struct color tpg_colors[TPG_COLOR_MAX];
+extern const struct tpg_rbg_color8 tpg_colors[TPG_COLOR_MAX];
extern const unsigned short tpg_rec709_to_linear[255 * 16 + 1];
extern const unsigned short tpg_linear_to_rec709[255 * 16 + 1];
-extern const struct color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1]
+extern const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1]
[V4L2_XFER_FUNC_SMPTE2084 + 1]
[TPG_COLOR_CSC_BLACK + 1];
enum tpg_pattern {