b5dcee225c
Currently, include/media is messy, as it contains both the V4L2 core
headers and some driver-specific headers on the same place. That makes
harder to identify what core headers should be documented and what
headers belong to I2C drivers that are included only by bridge/main
drivers that would require the functions provided by them.
Let's move those i2c specific files to its own subdirectory.
The files to move were produced via the following script:
mkdir include/media/i2c
(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/*/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
for i in include/media/*.h; do n=`basename $i`; (for j in $(git grep -l $n); do dirname $j; done)|sort|uniq|grep -ve '^.$' > list; num=$(wc -l list|cut -d' ' -f1); if [ $num == 1 ]; then if [ "`grep i2c list`" != "" ]; then git mv $i include/media/i2c; fi; fi; done
And the references corrected via this script:
MAIN_DIR="media/"
PREV_DIR="media/"
DIRS="i2c/"
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
Merged Sakari Ailus patch that moves smiapp.h to include/media/i2c.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
60 lines
1.4 KiB
C
60 lines
1.4 KiB
C
/*
|
|
* ov772x Camera
|
|
*
|
|
* Copyright (C) 2008 Renesas Solutions Corp.
|
|
* Kuninori Morimoto <morimoto.kuninori@renesas.com>
|
|
*
|
|
* 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 __OV772X_H__
|
|
#define __OV772X_H__
|
|
|
|
/* for flags */
|
|
#define OV772X_FLAG_VFLIP (1 << 0) /* Vertical flip image */
|
|
#define OV772X_FLAG_HFLIP (1 << 1) /* Horizontal flip image */
|
|
|
|
/*
|
|
* for Edge ctrl
|
|
*
|
|
* strength also control Auto or Manual Edge Control Mode
|
|
* see also OV772X_MANUAL_EDGE_CTRL
|
|
*/
|
|
struct ov772x_edge_ctrl {
|
|
unsigned char strength;
|
|
unsigned char threshold;
|
|
unsigned char upper;
|
|
unsigned char lower;
|
|
};
|
|
|
|
#define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */
|
|
#define OV772X_EDGE_STRENGTH_MASK 0x1F
|
|
#define OV772X_EDGE_THRESHOLD_MASK 0x0F
|
|
#define OV772X_EDGE_UPPER_MASK 0xFF
|
|
#define OV772X_EDGE_LOWER_MASK 0xFF
|
|
|
|
#define OV772X_AUTO_EDGECTRL(u, l) \
|
|
{ \
|
|
.upper = (u & OV772X_EDGE_UPPER_MASK), \
|
|
.lower = (l & OV772X_EDGE_LOWER_MASK), \
|
|
}
|
|
|
|
#define OV772X_MANUAL_EDGECTRL(s, t) \
|
|
{ \
|
|
.strength = (s & OV772X_EDGE_STRENGTH_MASK) | \
|
|
OV772X_MANUAL_EDGE_CTRL, \
|
|
.threshold = (t & OV772X_EDGE_THRESHOLD_MASK), \
|
|
}
|
|
|
|
/*
|
|
* ov772x camera info
|
|
*/
|
|
struct ov772x_camera_info {
|
|
unsigned long flags;
|
|
struct ov772x_edge_ctrl edgectrl;
|
|
};
|
|
|
|
#endif /* __OV772X_H__ */
|