diff options
author | Antonio Ospite <ospite@studenti.unina.it> | 2010-03-01 06:54:33 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:46:59 -0400 |
commit | 7f9e9e8dc2d5b226819e486e13c9532f40a0fbda (patch) | |
tree | 023e2a1a2d64009ae502dc7161a636712e513ff2 /drivers/media/video/gspca/ov534.c | |
parent | eb171073b6f941e83f01b6444ab347e893785faf (diff) |
V4L/DVB: gspca - ov534: Cosmetics: fix indentation and hex digits
* Indent with tabs, not with spaces, nor with mixed style.
* Less indentation for controls index comments.
* Use lowercase hex digits.
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/ov534.c')
-rw-r--r-- | drivers/media/video/gspca/ov534.c | 244 |
1 files changed, 122 insertions, 122 deletions
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c index 8f01201956c1..878384442482 100644 --- a/drivers/media/video/gspca/ov534.c +++ b/drivers/media/video/gspca/ov534.c | |||
@@ -92,147 +92,147 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val); | |||
92 | static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val); | 92 | static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val); |
93 | 93 | ||
94 | static const struct ctrl sd_ctrls[] = { | 94 | static const struct ctrl sd_ctrls[] = { |
95 | { /* 0 */ | 95 | { /* 0 */ |
96 | { | 96 | { |
97 | .id = V4L2_CID_BRIGHTNESS, | 97 | .id = V4L2_CID_BRIGHTNESS, |
98 | .type = V4L2_CTRL_TYPE_INTEGER, | 98 | .type = V4L2_CTRL_TYPE_INTEGER, |
99 | .name = "Brightness", | 99 | .name = "Brightness", |
100 | .minimum = 0, | 100 | .minimum = 0, |
101 | .maximum = 255, | 101 | .maximum = 255, |
102 | .step = 1, | 102 | .step = 1, |
103 | #define BRIGHTNESS_DEF 0 | 103 | #define BRIGHTNESS_DEF 0 |
104 | .default_value = BRIGHTNESS_DEF, | 104 | .default_value = BRIGHTNESS_DEF, |
105 | }, | ||
106 | .set = sd_setbrightness, | ||
107 | .get = sd_getbrightness, | ||
105 | }, | 108 | }, |
106 | .set = sd_setbrightness, | 109 | { /* 1 */ |
107 | .get = sd_getbrightness, | 110 | { |
108 | }, | 111 | .id = V4L2_CID_CONTRAST, |
109 | { /* 1 */ | 112 | .type = V4L2_CTRL_TYPE_INTEGER, |
110 | { | 113 | .name = "Contrast", |
111 | .id = V4L2_CID_CONTRAST, | 114 | .minimum = 0, |
112 | .type = V4L2_CTRL_TYPE_INTEGER, | 115 | .maximum = 255, |
113 | .name = "Contrast", | 116 | .step = 1, |
114 | .minimum = 0, | ||
115 | .maximum = 255, | ||
116 | .step = 1, | ||
117 | #define CONTRAST_DEF 32 | 117 | #define CONTRAST_DEF 32 |
118 | .default_value = CONTRAST_DEF, | 118 | .default_value = CONTRAST_DEF, |
119 | }, | ||
120 | .set = sd_setcontrast, | ||
121 | .get = sd_getcontrast, | ||
119 | }, | 122 | }, |
120 | .set = sd_setcontrast, | 123 | { /* 2 */ |
121 | .get = sd_getcontrast, | 124 | { |
122 | }, | 125 | .id = V4L2_CID_GAIN, |
123 | { /* 2 */ | 126 | .type = V4L2_CTRL_TYPE_INTEGER, |
124 | { | 127 | .name = "Main Gain", |
125 | .id = V4L2_CID_GAIN, | 128 | .minimum = 0, |
126 | .type = V4L2_CTRL_TYPE_INTEGER, | 129 | .maximum = 63, |
127 | .name = "Main Gain", | 130 | .step = 1, |
128 | .minimum = 0, | ||
129 | .maximum = 63, | ||
130 | .step = 1, | ||
131 | #define GAIN_DEF 20 | 131 | #define GAIN_DEF 20 |
132 | .default_value = GAIN_DEF, | 132 | .default_value = GAIN_DEF, |
133 | }, | ||
134 | .set = sd_setgain, | ||
135 | .get = sd_getgain, | ||
133 | }, | 136 | }, |
134 | .set = sd_setgain, | 137 | { /* 3 */ |
135 | .get = sd_getgain, | 138 | { |
136 | }, | 139 | .id = V4L2_CID_EXPOSURE, |
137 | { /* 3 */ | 140 | .type = V4L2_CTRL_TYPE_INTEGER, |
138 | { | 141 | .name = "Exposure", |
139 | .id = V4L2_CID_EXPOSURE, | 142 | .minimum = 0, |
140 | .type = V4L2_CTRL_TYPE_INTEGER, | 143 | .maximum = 255, |
141 | .name = "Exposure", | 144 | .step = 1, |
142 | .minimum = 0, | ||
143 | .maximum = 255, | ||
144 | .step = 1, | ||
145 | #define EXPO_DEF 120 | 145 | #define EXPO_DEF 120 |
146 | .default_value = EXPO_DEF, | 146 | .default_value = EXPO_DEF, |
147 | }, | ||
148 | .set = sd_setexposure, | ||
149 | .get = sd_getexposure, | ||
147 | }, | 150 | }, |
148 | .set = sd_setexposure, | 151 | { /* 4 */ |
149 | .get = sd_getexposure, | 152 | { |
150 | }, | 153 | .id = V4L2_CID_AUTOGAIN, |
151 | { /* 4 */ | 154 | .type = V4L2_CTRL_TYPE_BOOLEAN, |
152 | { | 155 | .name = "Auto Gain", |
153 | .id = V4L2_CID_AUTOGAIN, | 156 | .minimum = 0, |
154 | .type = V4L2_CTRL_TYPE_BOOLEAN, | 157 | .maximum = 1, |
155 | .name = "Auto Gain", | 158 | .step = 1, |
156 | .minimum = 0, | ||
157 | .maximum = 1, | ||
158 | .step = 1, | ||
159 | #define AGC_DEF 1 | 159 | #define AGC_DEF 1 |
160 | .default_value = AGC_DEF, | 160 | .default_value = AGC_DEF, |
161 | }, | ||
162 | .set = sd_setagc, | ||
163 | .get = sd_getagc, | ||
161 | }, | 164 | }, |
162 | .set = sd_setagc, | ||
163 | .get = sd_getagc, | ||
164 | }, | ||
165 | #define AWB_IDX 5 | 165 | #define AWB_IDX 5 |
166 | { /* 5 */ | 166 | { /* 5 */ |
167 | { | 167 | { |
168 | .id = V4L2_CID_AUTO_WHITE_BALANCE, | 168 | .id = V4L2_CID_AUTO_WHITE_BALANCE, |
169 | .type = V4L2_CTRL_TYPE_BOOLEAN, | 169 | .type = V4L2_CTRL_TYPE_BOOLEAN, |
170 | .name = "Auto White Balance", | 170 | .name = "Auto White Balance", |
171 | .minimum = 0, | 171 | .minimum = 0, |
172 | .maximum = 1, | 172 | .maximum = 1, |
173 | .step = 1, | 173 | .step = 1, |
174 | #define AWB_DEF 1 | 174 | #define AWB_DEF 1 |
175 | .default_value = AWB_DEF, | 175 | .default_value = AWB_DEF, |
176 | }, | ||
177 | .set = sd_setawb, | ||
178 | .get = sd_getawb, | ||
176 | }, | 179 | }, |
177 | .set = sd_setawb, | 180 | { /* 6 */ |
178 | .get = sd_getawb, | 181 | { |
179 | }, | 182 | .id = V4L2_CID_EXPOSURE_AUTO, |
180 | { /* 6 */ | 183 | .type = V4L2_CTRL_TYPE_BOOLEAN, |
181 | { | 184 | .name = "Auto Exposure", |
182 | .id = V4L2_CID_EXPOSURE_AUTO, | 185 | .minimum = 0, |
183 | .type = V4L2_CTRL_TYPE_BOOLEAN, | 186 | .maximum = 1, |
184 | .name = "Auto Exposure", | 187 | .step = 1, |
185 | .minimum = 0, | ||
186 | .maximum = 1, | ||
187 | .step = 1, | ||
188 | #define AEC_DEF 1 | 188 | #define AEC_DEF 1 |
189 | .default_value = AEC_DEF, | 189 | .default_value = AEC_DEF, |
190 | }, | ||
191 | .set = sd_setaec, | ||
192 | .get = sd_getaec, | ||
190 | }, | 193 | }, |
191 | .set = sd_setaec, | 194 | { /* 7 */ |
192 | .get = sd_getaec, | 195 | { |
193 | }, | 196 | .id = V4L2_CID_SHARPNESS, |
194 | { /* 7 */ | 197 | .type = V4L2_CTRL_TYPE_INTEGER, |
195 | { | 198 | .name = "Sharpness", |
196 | .id = V4L2_CID_SHARPNESS, | 199 | .minimum = 0, |
197 | .type = V4L2_CTRL_TYPE_INTEGER, | 200 | .maximum = 63, |
198 | .name = "Sharpness", | 201 | .step = 1, |
199 | .minimum = 0, | ||
200 | .maximum = 63, | ||
201 | .step = 1, | ||
202 | #define SHARPNESS_DEF 0 | 202 | #define SHARPNESS_DEF 0 |
203 | .default_value = SHARPNESS_DEF, | 203 | .default_value = SHARPNESS_DEF, |
204 | }, | ||
205 | .set = sd_setsharpness, | ||
206 | .get = sd_getsharpness, | ||
204 | }, | 207 | }, |
205 | .set = sd_setsharpness, | 208 | { /* 8 */ |
206 | .get = sd_getsharpness, | 209 | { |
207 | }, | 210 | .id = V4L2_CID_HFLIP, |
208 | { /* 8 */ | 211 | .type = V4L2_CTRL_TYPE_BOOLEAN, |
209 | { | 212 | .name = "HFlip", |
210 | .id = V4L2_CID_HFLIP, | 213 | .minimum = 0, |
211 | .type = V4L2_CTRL_TYPE_BOOLEAN, | 214 | .maximum = 1, |
212 | .name = "HFlip", | 215 | .step = 1, |
213 | .minimum = 0, | ||
214 | .maximum = 1, | ||
215 | .step = 1, | ||
216 | #define HFLIP_DEF 0 | 216 | #define HFLIP_DEF 0 |
217 | .default_value = HFLIP_DEF, | 217 | .default_value = HFLIP_DEF, |
218 | }, | ||
219 | .set = sd_sethflip, | ||
220 | .get = sd_gethflip, | ||
218 | }, | 221 | }, |
219 | .set = sd_sethflip, | 222 | { /* 9 */ |
220 | .get = sd_gethflip, | 223 | { |
221 | }, | 224 | .id = V4L2_CID_VFLIP, |
222 | { /* 9 */ | 225 | .type = V4L2_CTRL_TYPE_BOOLEAN, |
223 | { | 226 | .name = "VFlip", |
224 | .id = V4L2_CID_VFLIP, | 227 | .minimum = 0, |
225 | .type = V4L2_CTRL_TYPE_BOOLEAN, | 228 | .maximum = 1, |
226 | .name = "VFlip", | 229 | .step = 1, |
227 | .minimum = 0, | ||
228 | .maximum = 1, | ||
229 | .step = 1, | ||
230 | #define VFLIP_DEF 0 | 230 | #define VFLIP_DEF 0 |
231 | .default_value = VFLIP_DEF, | 231 | .default_value = VFLIP_DEF, |
232 | }, | ||
233 | .set = sd_setvflip, | ||
234 | .get = sd_getvflip, | ||
232 | }, | 235 | }, |
233 | .set = sd_setvflip, | ||
234 | .get = sd_getvflip, | ||
235 | }, | ||
236 | }; | 236 | }; |
237 | 237 | ||
238 | static const struct v4l2_pix_format ov772x_mode[] = { | 238 | static const struct v4l2_pix_format ov772x_mode[] = { |
@@ -641,14 +641,14 @@ static void setbrightness(struct gspca_dev *gspca_dev) | |||
641 | { | 641 | { |
642 | struct sd *sd = (struct sd *) gspca_dev; | 642 | struct sd *sd = (struct sd *) gspca_dev; |
643 | 643 | ||
644 | sccb_reg_write(gspca_dev, 0x9B, sd->brightness); | 644 | sccb_reg_write(gspca_dev, 0x9b, sd->brightness); |
645 | } | 645 | } |
646 | 646 | ||
647 | static void setcontrast(struct gspca_dev *gspca_dev) | 647 | static void setcontrast(struct gspca_dev *gspca_dev) |
648 | { | 648 | { |
649 | struct sd *sd = (struct sd *) gspca_dev; | 649 | struct sd *sd = (struct sd *) gspca_dev; |
650 | 650 | ||
651 | sccb_reg_write(gspca_dev, 0x9C, sd->contrast); | 651 | sccb_reg_write(gspca_dev, 0x9c, sd->contrast); |
652 | } | 652 | } |
653 | 653 | ||
654 | static void setgain(struct gspca_dev *gspca_dev) | 654 | static void setgain(struct gspca_dev *gspca_dev) |