mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-20 10:44:23 +08:00
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>
55 lines
1.3 KiB
C
55 lines
1.3 KiB
C
#ifndef _IR_I2C
|
|
#define _IR_I2C
|
|
|
|
#include <media/rc-core.h>
|
|
|
|
#define DEFAULT_POLLING_INTERVAL 100 /* ms */
|
|
|
|
struct IR_i2c;
|
|
|
|
struct IR_i2c {
|
|
char *ir_codes;
|
|
struct i2c_client *c;
|
|
struct rc_dev *rc;
|
|
|
|
/* Used to avoid fast repeating */
|
|
unsigned char old;
|
|
|
|
u32 polling_interval; /* in ms */
|
|
|
|
struct delayed_work work;
|
|
char name[32];
|
|
char phys[32];
|
|
int (*get_key)(struct IR_i2c *ir, enum rc_type *protocol,
|
|
u32 *scancode, u8 *toggle);
|
|
};
|
|
|
|
enum ir_kbd_get_key_fn {
|
|
IR_KBD_GET_KEY_CUSTOM = 0,
|
|
IR_KBD_GET_KEY_PIXELVIEW,
|
|
IR_KBD_GET_KEY_HAUP,
|
|
IR_KBD_GET_KEY_KNC1,
|
|
IR_KBD_GET_KEY_FUSIONHDTV,
|
|
IR_KBD_GET_KEY_HAUP_XVR,
|
|
IR_KBD_GET_KEY_AVERMEDIA_CARDBUS,
|
|
};
|
|
|
|
/* Can be passed when instantiating an ir_video i2c device */
|
|
struct IR_i2c_init_data {
|
|
char *ir_codes;
|
|
const char *name;
|
|
u64 type; /* RC_BIT_RC5, etc */
|
|
u32 polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */
|
|
|
|
/*
|
|
* Specify either a function pointer or a value indicating one of
|
|
* ir_kbd_i2c's internal get_key functions
|
|
*/
|
|
int (*get_key)(struct IR_i2c *ir, enum rc_type *protocol,
|
|
u32 *scancode, u8 *toggle);
|
|
enum ir_kbd_get_key_fn internal_get_key_func;
|
|
|
|
struct rc_dev *rc_dev;
|
|
};
|
|
#endif
|