mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-21 03:17:18 +00:00
Denys Dmytriyenko
88867c1d96
Move non-essential, outdated, best-effort pieces, as well, as those requiring extra non-standard dependencies besides oe-core. Signed-off-by: Denys Dmytriyenko <denys@ti.com>
206 lines
6.7 KiB
Diff
206 lines
6.7 KiB
Diff
From 0d2a2247733eca8f357f5a93fcc357edbb941ec1 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Date: Mon, 15 Mar 2010 23:33:31 +0100
|
|
Subject: [PATCH 20/43] v4l: Move the media/v4l2-mediabus.h header to include/linux
|
|
|
|
The header defines the v4l2_mbus_framefmt structure which will be used
|
|
by the V4L2 subdevs userspace API.
|
|
|
|
Change the type of the v4l2_mbus_framefmt::code field to __u32, as enum
|
|
sizes can differ between different ABIs on the same architectures.
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
---
|
|
include/linux/Kbuild | 1 +
|
|
include/linux/v4l2-mediabus.h | 78 +++++++++++++++++++++++++++++++++++++++++
|
|
include/media/soc_mediabus.h | 3 +-
|
|
include/media/v4l2-mediabus.h | 61 +-------------------------------
|
|
4 files changed, 81 insertions(+), 62 deletions(-)
|
|
create mode 100644 include/linux/v4l2-mediabus.h
|
|
|
|
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
|
|
index 26e0a7f..796e1d8 100644
|
|
--- a/include/linux/Kbuild
|
|
+++ b/include/linux/Kbuild
|
|
@@ -366,6 +366,7 @@ header-y += unistd.h
|
|
header-y += usbdevice_fs.h
|
|
header-y += utime.h
|
|
header-y += utsname.h
|
|
+header-y += v4l2-mediabus.h
|
|
header-y += veth.h
|
|
header-y += vhost.h
|
|
header-y += videodev.h
|
|
diff --git a/include/linux/v4l2-mediabus.h b/include/linux/v4l2-mediabus.h
|
|
new file mode 100644
|
|
index 0000000..a62cd64
|
|
--- /dev/null
|
|
+++ b/include/linux/v4l2-mediabus.h
|
|
@@ -0,0 +1,78 @@
|
|
+/*
|
|
+ * Media Bus API header
|
|
+ *
|
|
+ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
|
|
+ *
|
|
+ * 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.
|
|
+ */
|
|
+
|
|
+#ifndef __LINUX_V4L2_MEDIABUS_H
|
|
+#define __LINUX_V4L2_MEDIABUS_H
|
|
+
|
|
+#include <linux/types.h>
|
|
+#include <linux/videodev2.h>
|
|
+
|
|
+/*
|
|
+ * These pixel codes uniquely identify data formats on the media bus. Mostly
|
|
+ * they correspond to similarly named V4L2_PIX_FMT_* formats, format 0 is
|
|
+ * reserved, V4L2_MBUS_FMT_FIXED shall be used by host-client pairs, where the
|
|
+ * data format is fixed. Additionally, "2X8" means that one pixel is transferred
|
|
+ * in two 8-bit samples, "BE" or "LE" specify in which order those samples are
|
|
+ * transferred over the bus: "LE" means that the least significant bits are
|
|
+ * transferred first, "BE" means that the most significant bits are transferred
|
|
+ * first, and "PADHI" and "PADLO" define which bits - low or high, in the
|
|
+ * incomplete high byte, are filled with padding bits.
|
|
+ */
|
|
+enum v4l2_mbus_pixelcode {
|
|
+ V4L2_MBUS_FMT_FIXED = 1,
|
|
+ V4L2_MBUS_FMT_YUYV8_2X8,
|
|
+ V4L2_MBUS_FMT_YVYU8_2X8,
|
|
+ V4L2_MBUS_FMT_UYVY8_2X8,
|
|
+ V4L2_MBUS_FMT_VYUY8_2X8,
|
|
+ V4L2_MBUS_FMT_YVYU10_2X10,
|
|
+ V4L2_MBUS_FMT_YUYV10_2X10,
|
|
+ V4L2_MBUS_FMT_YVYU10_1X20,
|
|
+ V4L2_MBUS_FMT_YUYV10_1X20,
|
|
+ V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
|
|
+ V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE,
|
|
+ V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
|
|
+ V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
|
|
+ V4L2_MBUS_FMT_RGB565_2X8_LE,
|
|
+ V4L2_MBUS_FMT_RGB565_2X8_BE,
|
|
+ V4L2_MBUS_FMT_BGR565_2X8_LE,
|
|
+ V4L2_MBUS_FMT_BGR565_2X8_BE,
|
|
+ V4L2_MBUS_FMT_SBGGR8_1X8,
|
|
+ V4L2_MBUS_FMT_SBGGR10_1X10,
|
|
+ V4L2_MBUS_FMT_GREY8_1X8,
|
|
+ V4L2_MBUS_FMT_Y10_1X10,
|
|
+ V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE,
|
|
+ V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE,
|
|
+ V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE,
|
|
+ V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE,
|
|
+ V4L2_MBUS_FMT_SGRBG8_1X8,
|
|
+ V4L2_MBUS_FMT_SBGGR12_1X12,
|
|
+ V4L2_MBUS_FMT_YUYV8_1_5X8,
|
|
+ V4L2_MBUS_FMT_YVYU8_1_5X8,
|
|
+ V4L2_MBUS_FMT_UYVY8_1_5X8,
|
|
+ V4L2_MBUS_FMT_VYUY8_1_5X8,
|
|
+};
|
|
+
|
|
+/**
|
|
+ * struct v4l2_mbus_framefmt - frame format on the media bus
|
|
+ * @width: frame width
|
|
+ * @height: frame height
|
|
+ * @code: data format code
|
|
+ * @field: used interlacing type
|
|
+ * @colorspace: colorspace of the data
|
|
+ */
|
|
+struct v4l2_mbus_framefmt {
|
|
+ __u32 width;
|
|
+ __u32 height;
|
|
+ __u32 code;
|
|
+ enum v4l2_field field;
|
|
+ enum v4l2_colorspace colorspace;
|
|
+};
|
|
+
|
|
+#endif
|
|
diff --git a/include/media/soc_mediabus.h b/include/media/soc_mediabus.h
|
|
index 037cd7b..6243147 100644
|
|
--- a/include/media/soc_mediabus.h
|
|
+++ b/include/media/soc_mediabus.h
|
|
@@ -12,8 +12,7 @@
|
|
#define SOC_MEDIABUS_H
|
|
|
|
#include <linux/videodev2.h>
|
|
-
|
|
-#include <media/v4l2-mediabus.h>
|
|
+#include <linux/v4l2-mediabus.h>
|
|
|
|
/**
|
|
* enum soc_mbus_packing - data packing types on the media-bus
|
|
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
|
|
index 8e65598..971c7fa 100644
|
|
--- a/include/media/v4l2-mediabus.h
|
|
+++ b/include/media/v4l2-mediabus.h
|
|
@@ -11,66 +11,7 @@
|
|
#ifndef V4L2_MEDIABUS_H
|
|
#define V4L2_MEDIABUS_H
|
|
|
|
-/*
|
|
- * These pixel codes uniquely identify data formats on the media bus. Mostly
|
|
- * they correspond to similarly named V4L2_PIX_FMT_* formats, format 0 is
|
|
- * reserved, V4L2_MBUS_FMT_FIXED shall be used by host-client pairs, where the
|
|
- * data format is fixed. Additionally, "2X8" means that one pixel is transferred
|
|
- * in two 8-bit samples, "BE" or "LE" specify in which order those samples are
|
|
- * transferred over the bus: "LE" means that the least significant bits are
|
|
- * transferred first, "BE" means that the most significant bits are transferred
|
|
- * first, and "PADHI" and "PADLO" define which bits - low or high, in the
|
|
- * incomplete high byte, are filled with padding bits.
|
|
- */
|
|
-enum v4l2_mbus_pixelcode {
|
|
- V4L2_MBUS_FMT_FIXED = 1,
|
|
- V4L2_MBUS_FMT_YUYV8_2X8,
|
|
- V4L2_MBUS_FMT_YVYU8_2X8,
|
|
- V4L2_MBUS_FMT_UYVY8_2X8,
|
|
- V4L2_MBUS_FMT_VYUY8_2X8,
|
|
- V4L2_MBUS_FMT_YVYU10_2X10,
|
|
- V4L2_MBUS_FMT_YUYV10_2X10,
|
|
- V4L2_MBUS_FMT_YVYU10_1X20,
|
|
- V4L2_MBUS_FMT_YUYV10_1X20,
|
|
- V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
|
|
- V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE,
|
|
- V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
|
|
- V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
|
|
- V4L2_MBUS_FMT_RGB565_2X8_LE,
|
|
- V4L2_MBUS_FMT_RGB565_2X8_BE,
|
|
- V4L2_MBUS_FMT_BGR565_2X8_LE,
|
|
- V4L2_MBUS_FMT_BGR565_2X8_BE,
|
|
- V4L2_MBUS_FMT_SBGGR8_1X8,
|
|
- V4L2_MBUS_FMT_SBGGR10_1X10,
|
|
- V4L2_MBUS_FMT_GREY8_1X8,
|
|
- V4L2_MBUS_FMT_Y10_1X10,
|
|
- V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE,
|
|
- V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE,
|
|
- V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE,
|
|
- V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE,
|
|
- V4L2_MBUS_FMT_SGRBG8_1X8,
|
|
- V4L2_MBUS_FMT_SBGGR12_1X12,
|
|
- V4L2_MBUS_FMT_YUYV8_1_5X8,
|
|
- V4L2_MBUS_FMT_YVYU8_1_5X8,
|
|
- V4L2_MBUS_FMT_UYVY8_1_5X8,
|
|
- V4L2_MBUS_FMT_VYUY8_1_5X8,
|
|
-};
|
|
-
|
|
-/**
|
|
- * struct v4l2_mbus_framefmt - frame format on the media bus
|
|
- * @width: frame width
|
|
- * @height: frame height
|
|
- * @code: data format code
|
|
- * @field: used interlacing type
|
|
- * @colorspace: colorspace of the data
|
|
- */
|
|
-struct v4l2_mbus_framefmt {
|
|
- __u32 width;
|
|
- __u32 height;
|
|
- enum v4l2_mbus_pixelcode code;
|
|
- enum v4l2_field field;
|
|
- enum v4l2_colorspace colorspace;
|
|
-};
|
|
+#include <linux/v4l2-mediabus.h>
|
|
|
|
static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt,
|
|
const struct v4l2_mbus_framefmt *mbus_fmt)
|
|
--
|
|
1.6.6.1
|
|
|