git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
m5mols
/
m5mols.h
diff --git
a/drivers/media/video/m5mols/m5mols.h
b/drivers/media/video/m5mols/m5mols.h
index
10b55c8
..
89d09a8
100644
(file)
--- a/
drivers/media/video/m5mols/m5mols.h
+++ b/
drivers/media/video/m5mols/m5mols.h
@@
-2,10
+2,10
@@
* Header for M-5MOLS 8M Pixel camera sensor with ISP
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* Header for M-5MOLS 8M Pixel camera sensor with ISP
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
- * Author: HeungJun Kim
, riverful.kim@samsung.com
+ * Author: HeungJun Kim
<riverful.kim@samsung.com>
*
* Copyright (C) 2009 Samsung Electronics Co., Ltd.
*
* Copyright (C) 2009 Samsung Electronics Co., Ltd.
- * Author: Dongsoo Nathaniel Kim
, dongsoo45.kim@samsung.com
+ * Author: Dongsoo Nathaniel Kim
<dongsoo45.kim@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-106,23
+106,23
@@
struct m5mols_capture {
* The each value according to each scenemode is recommended in the documents.
*/
struct m5mols_scenemode {
* The each value according to each scenemode is recommended in the documents.
*/
struct m5mols_scenemode {
- u
32
metering;
- u
32
ev_bias;
- u
32
wb_mode;
- u
32
wb_preset;
- u
32
chroma_en;
- u
32
chroma_lvl;
- u
32
edge_en;
- u
32
edge_lvl;
- u
32
af_range;
- u
32
fd_mode;
- u
32
mcc;
- u
32
light;
- u
32
flash;
- u
32
tone;
- u
32
iso;
- u
32
capt_mode;
- u
32
wdr;
+ u
8
metering;
+ u
8
ev_bias;
+ u
8
wb_mode;
+ u
8
wb_preset;
+ u
8
chroma_en;
+ u
8
chroma_lvl;
+ u
8
edge_en;
+ u
8
edge_lvl;
+ u
8
af_range;
+ u
8
fd_mode;
+ u
8
mcc;
+ u
8
light;
+ u
8
flash;
+ u
8
tone;
+ u
8
iso;
+ u
8
capt_mode;
+ u
8
wdr;
};
/**
};
/**
@@
-154,7
+154,6
@@
struct m5mols_version {
u8 str[VERSION_STRING_SIZE];
u8 af;
};
u8 str[VERSION_STRING_SIZE];
u8 af;
};
-#define VERSION_SIZE sizeof(struct m5mols_version)
/**
* struct m5mols_info - M-5MOLS driver data structure
/**
* struct m5mols_info - M-5MOLS driver data structure
@@
-216,9
+215,9
@@
struct m5mols_info {
bool lock_ae;
bool lock_awb;
u8 resolution;
bool lock_ae;
bool lock_awb;
u8 resolution;
- u
32
interrupt;
- u
32
mode;
- u
32
mode_save;
+ u
8
interrupt;
+ u
8
mode;
+ u
8
mode_save;
int (*set_power)(struct device *dev, int on);
};
int (*set_power)(struct device *dev, int on);
};
@@
-256,9
+255,11
@@
struct m5mols_info {
* +-------+---+----------+-----+------+------+------+------+
* - d[0..3]: according to size1
*/
* +-------+---+----------+-----+------+------+------+------+
* - d[0..3]: according to size1
*/
-int m5mols_read(struct v4l2_subdev *sd, u32 reg_comb, u32 *val);
+int m5mols_read_u8(struct v4l2_subdev *sd, u32 reg_comb, u8 *val);
+int m5mols_read_u16(struct v4l2_subdev *sd, u32 reg_comb, u16 *val);
+int m5mols_read_u32(struct v4l2_subdev *sd, u32 reg_comb, u32 *val);
int m5mols_write(struct v4l2_subdev *sd, u32 reg_comb, u32 val);
int m5mols_write(struct v4l2_subdev *sd, u32 reg_comb, u32 val);
-int m5mols_busy(struct v4l2_subdev *sd, u8 category, u8 cmd, u
32
value);
+int m5mols_busy(struct v4l2_subdev *sd, u8 category, u8 cmd, u
8
value);
/*
* Mode operation of the M-5MOLS
/*
* Mode operation of the M-5MOLS
@@
-280,12
+281,12
@@
int m5mols_busy(struct v4l2_subdev *sd, u8 category, u8 cmd, u32 value);
* The available executing order between each modes are as follows:
* PARAMETER <---> MONITOR <---> CAPTURE
*/
* The available executing order between each modes are as follows:
* PARAMETER <---> MONITOR <---> CAPTURE
*/
-int m5mols_mode(struct m5mols_info *info, u
32
mode);
+int m5mols_mode(struct m5mols_info *info, u
8
mode);
-int m5mols_enable_interrupt(struct v4l2_subdev *sd, u
32
reg);
+int m5mols_enable_interrupt(struct v4l2_subdev *sd, u
8
reg);
int m5mols_sync_controls(struct m5mols_info *info);
int m5mols_start_capture(struct m5mols_info *info);
int m5mols_sync_controls(struct m5mols_info *info);
int m5mols_start_capture(struct m5mols_info *info);
-int m5mols_do_scenemode(struct m5mols_info *info, u
32
mode);
+int m5mols_do_scenemode(struct m5mols_info *info, u
8
mode);
int m5mols_lock_3a(struct m5mols_info *info, bool lock);
int m5mols_set_ctrl(struct v4l2_ctrl *ctrl);
int m5mols_lock_3a(struct m5mols_info *info, bool lock);
int m5mols_set_ctrl(struct v4l2_ctrl *ctrl);