Merge "Update libc/kernel/common/media/soc2030.h"

This commit is contained in:
Rebecca Schultz Zavin 2010-10-26 11:18:45 -07:00 committed by Android (Google) Code Review
commit 369197cb75

View File

@ -19,6 +19,9 @@
#define SOC2030_IOCTL_SET_PRIVATE _IOWR('o', 3, struct soc2030_regs)
#define SOC2030_IOCTL_GET_MODES _IO('o', 4)
#define SOC2030_IOCTL_GET_NUM_MODES _IOR('o', 5, unsigned int)
#define SOC2030_IOCTL_SET_EFFECT _IOWR('o', 6, unsigned int)
#define SOC2030_IOCTL_SET_WHITEBALANCE _IOWR('o', 7, unsigned int)
#define SOC2030_IOCTL_SET_EXP_COMP _IOWR('o', 8, int)
#define SOC2030_POLL_WAITMS 50
#define SOC2030_MAX_RETRIES 3
@ -27,6 +30,10 @@
#define SOC2030_MAX_PRIVATE_SIZE 1024
#define SOC2030_MAX_NUM_MODES 6
#define SOC_EV_MAX 2
#define SOC_EV_MIN -2
#define EXP_TARGET 0x32
enum {
REG_TABLE_END,
WRITE_REG_DATA,
@ -35,10 +42,32 @@ enum {
POLL_REG_DATA,
POLL_REG_BIT_H,
POLL_REG_BIT_L,
WRITE_VAR_DATA,
POLL_VAR_DATA,
DELAY_MS,
};
enum {
EFFECT_NONE,
EFFECT_BW,
EFFECT_NEGATIVE,
EFFECT_POSTERIZE,
EFFECT_SEPIA,
EFFECT_SOLARIZE,
EFFECT_AQUA,
EFFECT_MAX,
};
enum {
WB_AUTO,
WB_INCANDESCENT,
WB_FLUORESCENT,
WB_DAYLIGHT,
WB_CLOUDYDAYLIGHT,
WB_NIGHT,
WB_MAX,
};
struct soc2030_regs {
__u8 op;
__u16 addr;