mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
d647f0b70c
Let's not mix headers used by the core with those headers that
are needed by some driver-specific interface header.
The headers used on drivers were manually moved using:
mkdir include/media/drv-intf/
git mv include/media/cx2341x.h include/media/cx25840.h \
include/media/exynos-fimc.h include/media/msp3400.h \
include/media/s3c_camif.h include/media/saa7146.h \
include/media/saa7146_vv.h include/media/sh_mobile_ceu.h \
include/media/sh_mobile_csi2.h include/media/sh_vou.h \
include/media/si476x.h include/media/soc_mediabus.h \
include/media/tea575x.h include/media/drv-intf/
And the references for those headers were corrected using:
MAIN_DIR="media/"
PREV_DIR="media/"
DIRS="drv-intf/"
echo "Checking affected files" >&2
for i in $DIRS; do
for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do
n=`basename $j`
git grep -l $n
done
done|sort|uniq >files && (
echo "Handling files..." >&2;
echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\";
(
cd include/$MAIN_DIR;
for j in $DIRS; do
for i in $(ls $j); do
echo "perl -ne 's,(include [\\\"\\<])$PREV_DIR($i)([\\\"\\>]),\1$MAIN_DIR$j\2\3,; print \$_' |\\";
done;
done;
echo "cat > a && mv a \$i; done";
);
echo "Handling documentation..." >&2;
echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\";
(
cd include/$MAIN_DIR;
for j in $DIRS; do
for i in $(ls $j); do
echo " perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\";
done;
done;
echo "cat > a && mv a \$i; done"
);
) >script && . ./script
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
112 lines
3.5 KiB
C
112 lines
3.5 KiB
C
/*
|
|
* SoC-camera Media Bus API extensions
|
|
*
|
|
* 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 SOC_MEDIABUS_H
|
|
#define SOC_MEDIABUS_H
|
|
|
|
#include <linux/videodev2.h>
|
|
#include <linux/v4l2-mediabus.h>
|
|
|
|
/**
|
|
* enum soc_mbus_packing - data packing types on the media-bus
|
|
* @SOC_MBUS_PACKING_NONE: no packing, bit-for-bit transfer to RAM, one
|
|
* sample represents one pixel
|
|
* @SOC_MBUS_PACKING_2X8_PADHI: 16 bits transferred in 2 8-bit samples, in the
|
|
* possibly incomplete byte high bits are padding
|
|
* @SOC_MBUS_PACKING_2X8_PADLO: as above, but low bits are padding
|
|
* @SOC_MBUS_PACKING_EXTEND16: sample width (e.g., 10 bits) has to be extended
|
|
* to 16 bits
|
|
* @SOC_MBUS_PACKING_VARIABLE: compressed formats with variable packing
|
|
* @SOC_MBUS_PACKING_1_5X8: used for packed YUV 4:2:0 formats, where 4
|
|
* pixels occupy 6 bytes in RAM
|
|
* @SOC_MBUS_PACKING_EXTEND32: sample width (e.g., 24 bits) has to be extended
|
|
* to 32 bits
|
|
*/
|
|
enum soc_mbus_packing {
|
|
SOC_MBUS_PACKING_NONE,
|
|
SOC_MBUS_PACKING_2X8_PADHI,
|
|
SOC_MBUS_PACKING_2X8_PADLO,
|
|
SOC_MBUS_PACKING_EXTEND16,
|
|
SOC_MBUS_PACKING_VARIABLE,
|
|
SOC_MBUS_PACKING_1_5X8,
|
|
SOC_MBUS_PACKING_EXTEND32,
|
|
};
|
|
|
|
/**
|
|
* enum soc_mbus_order - sample order on the media bus
|
|
* @SOC_MBUS_ORDER_LE: least significant sample first
|
|
* @SOC_MBUS_ORDER_BE: most significant sample first
|
|
*/
|
|
enum soc_mbus_order {
|
|
SOC_MBUS_ORDER_LE,
|
|
SOC_MBUS_ORDER_BE,
|
|
};
|
|
|
|
/**
|
|
* enum soc_mbus_layout - planes layout in memory
|
|
* @SOC_MBUS_LAYOUT_PACKED: color components packed
|
|
* @SOC_MBUS_LAYOUT_PLANAR_2Y_U_V: YUV components stored in 3 planes (4:2:2)
|
|
* @SOC_MBUS_LAYOUT_PLANAR_2Y_C: YUV components stored in a luma and a
|
|
* chroma plane (C plane is half the size
|
|
* of Y plane)
|
|
* @SOC_MBUS_LAYOUT_PLANAR_Y_C: YUV components stored in a luma and a
|
|
* chroma plane (C plane is the same size
|
|
* as Y plane)
|
|
*/
|
|
enum soc_mbus_layout {
|
|
SOC_MBUS_LAYOUT_PACKED = 0,
|
|
SOC_MBUS_LAYOUT_PLANAR_2Y_U_V,
|
|
SOC_MBUS_LAYOUT_PLANAR_2Y_C,
|
|
SOC_MBUS_LAYOUT_PLANAR_Y_C,
|
|
};
|
|
|
|
/**
|
|
* struct soc_mbus_pixelfmt - Data format on the media bus
|
|
* @name: Name of the format
|
|
* @fourcc: Fourcc code, that will be obtained if the data is
|
|
* stored in memory in the following way:
|
|
* @packing: Type of sample-packing, that has to be used
|
|
* @order: Sample order when storing in memory
|
|
* @bits_per_sample: How many bits the bridge has to sample
|
|
*/
|
|
struct soc_mbus_pixelfmt {
|
|
const char *name;
|
|
u32 fourcc;
|
|
enum soc_mbus_packing packing;
|
|
enum soc_mbus_order order;
|
|
enum soc_mbus_layout layout;
|
|
u8 bits_per_sample;
|
|
};
|
|
|
|
/**
|
|
* struct soc_mbus_lookup - Lookup FOURCC IDs by mediabus codes for pass-through
|
|
* @code: mediabus pixel-code
|
|
* @fmt: pixel format description
|
|
*/
|
|
struct soc_mbus_lookup {
|
|
u32 code;
|
|
struct soc_mbus_pixelfmt fmt;
|
|
};
|
|
|
|
const struct soc_mbus_pixelfmt *soc_mbus_find_fmtdesc(
|
|
u32 code,
|
|
const struct soc_mbus_lookup *lookup,
|
|
int n);
|
|
const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
|
|
u32 code);
|
|
s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf);
|
|
s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf,
|
|
u32 bytes_per_line, u32 height);
|
|
int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf,
|
|
unsigned int *numerator, unsigned int *denominator);
|
|
unsigned int soc_mbus_config_compatible(const struct v4l2_mbus_config *cfg,
|
|
unsigned int flags);
|
|
|
|
#endif
|