diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /include/media/ov772x.h | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'include/media/ov772x.h')
-rw-r--r-- | include/media/ov772x.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/include/media/ov772x.h b/include/media/ov772x.h index 00dbb7c4fea..548bf1155c8 100644 --- a/include/media/ov772x.h +++ b/include/media/ov772x.h | |||
@@ -12,9 +12,12 @@ | |||
12 | #ifndef __OV772X_H__ | 12 | #ifndef __OV772X_H__ |
13 | #define __OV772X_H__ | 13 | #define __OV772X_H__ |
14 | 14 | ||
15 | #include <media/soc_camera.h> | ||
16 | |||
15 | /* for flags */ | 17 | /* for flags */ |
16 | #define OV772X_FLAG_VFLIP (1 << 0) /* Vertical flip image */ | 18 | #define OV772X_FLAG_VFLIP (1 << 0) /* Vertical flip image */ |
17 | #define OV772X_FLAG_HFLIP (1 << 1) /* Horizontal flip image */ | 19 | #define OV772X_FLAG_HFLIP (1 << 1) /* Horizontal flip image */ |
20 | #define OV772X_FLAG_8BIT (1 << 2) /* default 10 bit */ | ||
18 | 21 | ||
19 | /* | 22 | /* |
20 | * for Edge ctrl | 23 | * for Edge ctrl |
@@ -29,23 +32,22 @@ struct ov772x_edge_ctrl { | |||
29 | unsigned char lower; | 32 | unsigned char lower; |
30 | }; | 33 | }; |
31 | 34 | ||
32 | #define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */ | 35 | #define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */ |
33 | #define OV772X_EDGE_STRENGTH_MASK 0x1F | 36 | #define EDGE_STRENGTH_MASK 0x1F |
34 | #define OV772X_EDGE_THRESHOLD_MASK 0x0F | 37 | #define EDGE_THRESHOLD_MASK 0x0F |
35 | #define OV772X_EDGE_UPPER_MASK 0xFF | 38 | #define EDGE_UPPER_MASK 0xFF |
36 | #define OV772X_EDGE_LOWER_MASK 0xFF | 39 | #define EDGE_LOWER_MASK 0xFF |
37 | 40 | ||
38 | #define OV772X_AUTO_EDGECTRL(u, l) \ | 41 | #define OV772X_AUTO_EDGECTRL(u, l) \ |
39 | { \ | 42 | { \ |
40 | .upper = (u & OV772X_EDGE_UPPER_MASK), \ | 43 | .upper = (u & EDGE_UPPER_MASK), \ |
41 | .lower = (l & OV772X_EDGE_LOWER_MASK), \ | 44 | .lower = (l & EDGE_LOWER_MASK), \ |
42 | } | 45 | } |
43 | 46 | ||
44 | #define OV772X_MANUAL_EDGECTRL(s, t) \ | 47 | #define OV772X_MANUAL_EDGECTRL(s, t) \ |
45 | { \ | 48 | { \ |
46 | .strength = (s & OV772X_EDGE_STRENGTH_MASK) | \ | 49 | .strength = (s & EDGE_STRENGTH_MASK) | OV772X_MANUAL_EDGE_CTRL,\ |
47 | OV772X_MANUAL_EDGE_CTRL, \ | 50 | .threshold = (t & EDGE_THRESHOLD_MASK), \ |
48 | .threshold = (t & OV772X_EDGE_THRESHOLD_MASK), \ | ||
49 | } | 51 | } |
50 | 52 | ||
51 | /* | 53 | /* |