am 0d9f87a3: Add auto-exposure/auto-white balance lock support to soc2030 image sensor.

* commit '0d9f87a3b71057cf804b2d7aa8589e3bf94eab28':
  Add auto-exposure/auto-white balance lock support to soc2030 image sensor.
This commit is contained in:
Eino-Ville Talvala 2011-11-15 16:45:26 -08:00 committed by Android Git Automerger
commit 87426ed37a

View File

@ -22,10 +22,11 @@
#define SOC2030_IOCTL_SET_EFFECT _IOWR('o', 6, 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_WHITEBALANCE _IOWR('o', 7, unsigned int)
#define SOC2030_IOCTL_SET_EXP_COMP _IOWR('o', 8, int) #define SOC2030_IOCTL_SET_EXP_COMP _IOWR('o', 8, int)
#define SOC2030_IOCTL_SET_LOCK _IOWR('o', 9, struct soc2030_lock)
#define SOC2030_POLL_WAITMS 50 #define SOC2030_POLL_WAITMS 50
#define SOC2030_MAX_RETRIES 3 #define SOC2030_MAX_RETRIES 3
#define SOC2030_POLL_RETRIES 5 #define SOC2030_POLL_RETRIES 7
#define SOC2030_MAX_PRIVATE_SIZE 1024 #define SOC2030_MAX_PRIVATE_SIZE 1024
#define SOC2030_MAX_NUM_MODES 6 #define SOC2030_MAX_NUM_MODES 6
@ -45,8 +46,21 @@ enum {
WRITE_VAR_DATA, WRITE_VAR_DATA,
POLL_VAR_DATA, POLL_VAR_DATA,
DELAY_MS, DELAY_MS,
WRITE_REG_VAR1,
WRITE_REG_VAR2,
WRITE_REG_VAR3,
WRITE_REG_VAR4,
READ_REG_VAR1,
READ_REG_VAR2,
READ_REG_VAR3,
READ_REG_VAR4,
}; };
#define REG_VAR1 (READ_REG_VAR1 - READ_REG_VAR1)
#define REG_VAR2 (READ_REG_VAR2 - READ_REG_VAR1)
#define REG_VAR3 (READ_REG_VAR3 - READ_REG_VAR1)
#define REG_VAR4 (READ_REG_VAR4 - READ_REG_VAR1)
enum { enum {
EFFECT_NONE, EFFECT_NONE,
EFFECT_BW, EFFECT_BW,
@ -74,6 +88,14 @@ struct soc2030_regs {
__u16 val; __u16 val;
}; };
struct soc2030_lock {
__u8 aelock;
__u8 aerelock;
__u8 awblock;
__u8 awbrelock;
__u8 previewactive;
};
struct soc2030_mode { struct soc2030_mode {
int xres; int xres;
int yres; int yres;
@ -82,5 +104,3 @@ struct soc2030_mode {
}; };
#endif #endif