1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
|
From 5b1011bc9c2172027f3c84fa56b9f0e090e85193 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 11 Jun 2010 13:51:49 -0500
Subject: [PATCH 02/28] mt9t111: Fix all checkpatch errors
The code was plagued with checkpatch errors. Fix them!
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
drivers/media/video/mt9t111.c | 153 ++++++++++++++++++++-----------------
drivers/media/video/mt9t111_reg.h | 6 +-
include/media/mt9t111.h | 2 +-
3 files changed, 87 insertions(+), 74 deletions(-)
diff --git a/drivers/media/video/mt9t111.c b/drivers/media/video/mt9t111.c
index ecc5115..95e1508 100644
--- a/drivers/media/video/mt9t111.c
+++ b/drivers/media/video/mt9t111.c
@@ -17,20 +17,21 @@
#include <media/mt9t111.h>
#include "mt9t111_reg.h"
-#define USE_RAW // YCbCr mode does not work yet
-//#define COLOR_BAR // Create a Color bar test pattern, Blue, Green, Red, Grey
+/* YCbCr mode does not work yet */
+#define USE_RAW
+/* Create a Color bar test pattern, Blue, Green, Red, Grey */
+/* #define COLOR_BAR */
#define SENSOR_DETECTED 1
#define SENSOR_NOT_DETECTED 0
static void mt9t111_loaddefault(struct i2c_client *client);
-/*
-* as a place holder for further development
-*/
+/*
+ * as a place holder for further development
+ */
static void debug_dummy(char *in_msg)
{
-
}
/* list of image formats supported by mt9t111 sensor */
@@ -55,8 +56,8 @@ const static struct v4l2_fmtdesc mt9t111_formats[] = {
* smallest image size to largest.
*/
const static struct capture_size mt9t111_sizes[] = {
- { 640, 480 },
-// { 2048, 1536}
+ { 640, 480 },
+ /* { 2048, 1536} */
};
#define NUM_CAPTURE_SIZE ARRAY_SIZE(mt9t111_sizes)
@@ -120,17 +121,17 @@ mt9t111_read_reg(struct i2c_client *client, u16 reg, u16 *val)
msg->addr = client->addr;
msg->flags = 0;
msg->len = 2;
- msg->buf = data;
+ msg->buf = data;
data[0] = (reg & 0xff00) >> 8;
data[1] = (reg & 0x00ff);
err = i2c_transfer(client->adapter, msg, 1);
- if (err >= 0) {
- msg->flags = I2C_M_RD;
- msg->len = 2; /* 2 byte read */
- err = i2c_transfer(client->adapter, msg, 1);
- if (err >= 0) {
- *val = ((data[0] & 0x00ff) << 8)
- | (data[1] & 0x00ff);
+ if (err >= 0) {
+ msg->flags = I2C_M_RD;
+ msg->len = 2; /* 2 byte read */
+ err = i2c_transfer(client->adapter, msg, 1);
+ if (err >= 0) {
+ *val = ((data[0] & 0x00ff) << 8)
+ | (data[1] & 0x00ff);
return 0;
}
}
@@ -159,7 +160,7 @@ mt9t111_write_reg(struct i2c_client *client, u16 reg, u16 val)
msg->len = 4;
msg->buf = data;
data[0] = (u8)((reg & 0xff00) >> 8);
- data[1] = (u8)(reg & 0x00ff);
+ data[1] = (u8)(reg & 0x00ff);
data[2] = (u8)((val & 0xff00) >> 8);
data[3] = (u8)(val & 0x00ff);
err = i2c_transfer(client->adapter, msg, 1);
@@ -171,7 +172,7 @@ mt9t111_write_reg(struct i2c_client *client, u16 reg, u16 val)
* mt9t111_write_regs - Write registers to an mt9t111 sensor device
* @client: i2c driver client structure
* @reg_in: pointer to registers to write
- * @cnt: the number of registers
+ * @cnt: the number of registers
*
* Write registers .
* Returns zero if successful, or non-zero otherwise.
@@ -182,19 +183,21 @@ mt9t111_write_regs(struct i2c_client *client, mt9t111_regs *reg_in, int cnt)
int err = 0;
int i;
mt9t111_regs *reg = reg_in;
-
- for (i=0;i<cnt;i++) {
+
+ for (i = 0; i < cnt; i++) {
if (reg->delay_time == 0) {
err |= mt9t111_write_reg(client, reg->addr, reg->data);
} else if (reg->addr != 0 || reg->data != 0) {
err |= mt9t111_write_reg(client, reg->addr, reg->data);
mdelay(reg->delay_time);
- } else
+ } else {
mdelay(reg->delay_time);
-
+ }
+
if (err < 0) {
- dev_warn(&client->dev, "write reg error, addr = 0x%x, data = 0x%x \n", \
- reg->addr, reg->data);
+ dev_warn(&client->dev, "write reg error, addr = 0x%x,"
+ " data = 0x%x \n",
+ reg->addr, reg->data);
return err;
}
reg++;
@@ -219,10 +222,11 @@ mt9t111_detect(struct i2c_client *client)
if (mt9t111_read_reg(client, MT9T111_CHIP_ID, &val) < 0)
return -ENODEV;
dev_info(&client->dev, "model id detected 0x%x\n", val);
-
+
if (val != MT9T111_CHIP_ID_VALUE) {
- dev_warn(&client->dev, "model id mismatch received 0x%x expecting 0x%x\n",
- val, MT9T111_CHIP_ID_VALUE);
+ dev_warn(&client->dev, "model id mismatch received 0x%x"
+ " expecting 0x%x\n",
+ val, MT9T111_CHIP_ID_VALUE);
return -ENODEV;
}
@@ -285,14 +289,17 @@ static int ioctl_enum_frameintervals(struct v4l2_int_device *s,
{
int ifmt;
-printk(KERN_INFO "entering ioctl_enum_frameintervals\n");
-printk(KERN_INFO "index = %d, pixel_format = 0x%x, width = %d, height = %d\n",
- frmi->index, frmi->pixel_format, frmi->width, frmi->height);
-printk(KERN_INFO "mt9t111 format = 0x%x\n", mt9t111_formats[0].pixelformat);
+ printk(KERN_INFO "entering ioctl_enum_frameintervals\n");
+ printk(KERN_INFO "index = %d, pixel_format = 0x%x,"
+ " width = %d, height = %d\n",
+ frmi->index, frmi->pixel_format,
+ frmi->width, frmi->height);
+ printk(KERN_INFO "mt9t111 format = 0x%x\n",
+ mt9t111_formats[0].pixelformat);
if (frmi->index >= NUM_CAPTURE_FRAMEINTERVALS)
return -EINVAL;
-
+
for (ifmt = 0; ifmt < NUM_CAPTURE_FORMATS; ifmt++) {
if (frmi->pixel_format == mt9t111_formats[ifmt].pixelformat)
break;
@@ -368,7 +375,7 @@ static int ioctl_s_power(struct v4l2_int_device *s, enum v4l2_power on)
if (rval < 0) {
dev_err(&c->dev, "Unable to set the power state: " "mt9t111"
" sensor\n");
- //sensor->pdata->set_xclk(0);
+ /* sensor->pdata->set_xclk(0); */
return rval;
}
@@ -418,7 +425,7 @@ static int ioctl_g_priv(struct v4l2_int_device *s, void *p)
static int ioctl_s_parm(struct v4l2_int_device *s,
struct v4l2_streamparm *a)
{
- //TODO: set paramters
+ /* TODO: set paramters */
debug_dummy("debug_dummy -- VIDIOC_S_PARM ");
return 0;
}
@@ -483,13 +490,13 @@ static int ioctl_try_fmt_cap(struct v4l2_int_device *s,
pix->width = 640;
pix->height = 480;
-#ifdef USE_RAW
+#ifdef USE_RAW
pix->pixelformat = V4L2_PIX_FMT_SGRBG10;
- pix->bytesperline = pix->width;
+ pix->bytesperline = pix->width;
pix->colorspace = V4L2_COLORSPACE_SRGB;
#else
pix->pixelformat = V4L2_PIX_FMT_YUYV;
- pix->bytesperline = pix->width * 2;
+ pix->bytesperline = pix->width * 2;
pix->colorspace = V4L2_COLORSPACE_JPEG;
#endif
pix->field = V4L2_FIELD_NONE;
@@ -585,7 +592,7 @@ static int ioctl_s_ctrl(struct v4l2_int_device *s,
static int ioctl_g_ctrl(struct v4l2_int_device *s,
struct v4l2_control *vc)
{
- debug_dummy("debug_dummy -- g ctrl\n");
+ debug_dummy("debug_dummy -- g ctrl\n");
return 0;
}
@@ -601,8 +608,8 @@ static int ioctl_g_ctrl(struct v4l2_int_device *s,
static int ioctl_queryctrl(struct v4l2_int_device *s,
struct v4l2_queryctrl *qc)
{
- debug_dummy("debug_dummy -- query ctrl\n");
- return-EINVAL;
+ debug_dummy("debug_dummy -- query ctrl\n");
+ return -EINVAL;
}
/**
@@ -647,12 +654,11 @@ static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p)
return rval;
}
- p->u.ycbcr.clock_curr = 40*1000000; // temporal value
+ p->u.ycbcr.clock_curr = 40 * 1000000; /* temporal value */
return 0;
}
-
static struct v4l2_int_ioctl_desc mt9t111_ioctl_desc[] = {
{ .num = vidioc_int_enum_framesizes_num,
.func = (v4l2_int_ioctl_func *)ioctl_enum_framesizes },
@@ -666,8 +672,8 @@ static struct v4l2_int_ioctl_desc mt9t111_ioctl_desc[] = {
.func = (v4l2_int_ioctl_func *)ioctl_s_power },
{ .num = vidioc_int_g_priv_num,
.func = (v4l2_int_ioctl_func *)ioctl_g_priv },
- {vidioc_int_g_ifparm_num,
- .func = (v4l2_int_ioctl_func*) ioctl_g_ifparm},
+ { .num = vidioc_int_g_ifparm_num,
+ .func = (v4l2_int_ioctl_func *)ioctl_g_ifparm },
{ .num = vidioc_int_init_num,
.func = (v4l2_int_ioctl_func *)ioctl_init },
{ .num = vidioc_int_enum_fmt_cap_num,
@@ -688,29 +694,30 @@ static struct v4l2_int_ioctl_desc mt9t111_ioctl_desc[] = {
.func = (v4l2_int_ioctl_func *)ioctl_g_ctrl },
{ .num = vidioc_int_s_ctrl_num,
.func = (v4l2_int_ioctl_func *)ioctl_s_ctrl },
- {.num = vidioc_int_s_video_routing_num,
- .func = (v4l2_int_ioctl_func *) ioctl_s_routing},
+ { .num = vidioc_int_s_video_routing_num,
+ .func = (v4l2_int_ioctl_func *)ioctl_s_routing },
};
-static void mt9t111_refresh(struct i2c_client *client){
- int i;
- unsigned short value;
- // MCU_ADDRESS [SEQ_CMD] -- refresh
- mt9t111_write_reg(client, 0x098E, 0x8400);
- mt9t111_write_reg(client, 0x0990, 0x0006);
- for (i=0;i<100;i++){
- mt9t111_write_reg(client, 0x098E, 0x8400);
- mt9t111_read_reg(client,0x0990,&value);
- if ( value == 0)
- break;
- mdelay(5);
+static void mt9t111_refresh(struct i2c_client *client)
+{
+ int i;
+ unsigned short value;
+ /* MCU_ADDRESS [SEQ_CMD] -- refresh */
+ mt9t111_write_reg(client, 0x098E, 0x8400);
+ mt9t111_write_reg(client, 0x0990, 0x0006);
+ for (i = 0; i < 100; i++) {
+ mt9t111_write_reg(client, 0x098E, 0x8400);
+ mt9t111_read_reg(client, 0x0990, &value);
+ if (value == 0)
+ break;
+ mdelay(5);
}
}
#ifdef COLOR_BAR
static void mt9t111_color_bar(struct i2c_client *client)
{
- mt9t111_write_reg(client, 0x3210, 0x01B0); // disable lens correction
+ mt9t111_write_reg(client, 0x3210, 0x01B0); /* disable lens correction */
mt9t111_write_reg(client, 0x098E, 0x6003);
mt9t111_write_reg(client, 0x0990, 0x0100);
@@ -721,22 +728,25 @@ static void mt9t111_color_bar(struct i2c_client *client)
static void mt9t111_bayer_format(struct i2c_client *client)
{
- mt9t111_write_regs(client, bayer_pattern_regs, sizeof(bayer_pattern_regs)/sizeof(mt9t111_regs));
+ mt9t111_write_regs(client, bayer_pattern_regs,
+ sizeof(bayer_pattern_regs) / sizeof(mt9t111_regs));
}
static void mt9t111_enable_pll(struct i2c_client *client)
{
int i;
- unsigned short value;
+ unsigned short value;
- mt9t111_write_regs(client, pll_regs1, sizeof(pll_regs1)/sizeof(mt9t111_regs));
- for (i=0;i<100;i++){
- mt9t111_read_reg(client,0x0014,&value);
- if (( value & 0x8000) != 0)
+ mt9t111_write_regs(client, pll_regs1,
+ sizeof(pll_regs1) / sizeof(mt9t111_regs));
+ for (i = 0; i < 100; i++) {
+ mt9t111_read_reg(client, 0x0014, &value);
+ if ((value & 0x8000) != 0)
break;
mdelay(2);
}
- mt9t111_write_regs(client, pll_regs2, sizeof(pll_regs2)/sizeof(mt9t111_regs));
+ mt9t111_write_regs(client, pll_regs2,
+ sizeof(pll_regs2) / sizeof(mt9t111_regs));
}
@@ -746,9 +756,12 @@ static void mt9t111_loaddefault(struct i2c_client *client)
mt9t111_write_reg(client, 0x001A, 0x0218);
mt9t111_enable_pll(client);
- mt9t111_write_regs(client, def_regs1, sizeof(def_regs1)/sizeof(mt9t111_regs));
- mt9t111_write_regs(client, patch_rev6, sizeof(patch_rev6)/sizeof(mt9t111_regs));
- mt9t111_write_regs(client, def_regs2, sizeof(def_regs2)/sizeof(mt9t111_regs));
+ mt9t111_write_regs(client, def_regs1,
+ sizeof(def_regs1) / sizeof(mt9t111_regs));
+ mt9t111_write_regs(client, patch_rev6,
+ sizeof(patch_rev6) / sizeof(mt9t111_regs));
+ mt9t111_write_regs(client, def_regs2,
+ sizeof(def_regs2) / sizeof(mt9t111_regs));
#ifdef USE_RAW
mt9t111_bayer_format(client);
@@ -806,7 +819,7 @@ mt9t111_probe(struct i2c_client *client, const struct i2c_device_id *id)
sensor->pix.width = 640;
sensor->pix.height = 480;
-#ifdef USE_RAW
+#ifdef USE_RAW
sensor->pix.pixelformat = V4L2_PIX_FMT_SGRBG10;
#else
sensor->pix.pixelformat = V4L2_PIX_FMT_YUYV;
diff --git a/drivers/media/video/mt9t111_reg.h b/drivers/media/video/mt9t111_reg.h
index e012eeb..e226c37 100644
--- a/drivers/media/video/mt9t111_reg.h
+++ b/drivers/media/video/mt9t111_reg.h
@@ -25,7 +25,7 @@ typedef struct {
u16 data;
} mt9t111_regs;
-mt9t111_regs patch_rev6[] ={
+mt9t111_regs patch_rev6[] = {
{0, 0x0982, 0x0},
{0, 0x098A, 0xCE7},
{0, 0x0990, 0x3C3C},
@@ -658,7 +658,7 @@ mt9t111_regs patch_rev6[] ={
{100, 0x0990, 0x0004}
};
-mt9t111_regs def_regs1[] ={
+mt9t111_regs def_regs1[] = {
{0, 0x001A, 0x0218},
{0, 0x001E, 0x0777},
{0, 0x3084, 0x2409},
@@ -1343,7 +1343,7 @@ mt9t111_regs pll_regs2[] = {
{0, 0x0014, 0x3046},
{0, 0x0022, 0x01E0},
{0, 0x001E, 0x0707},
- {0, 0x3B84, 0x011D}
+ {0, 0x3B84, 0x011D}
};
mt9t111_regs bayer_pattern_regs[] = {
diff --git a/include/media/mt9t111.h b/include/media/mt9t111.h
index 7acbeed..0a5161a 100644
--- a/include/media/mt9t111.h
+++ b/include/media/mt9t111.h
@@ -40,7 +40,7 @@
#define MT9T111_I2C_UNREGISTERED (0)
/*i2c adress for MT9T111*/
-#define MT9T111_I2C_ADDR (0x78 >>1)
+#define MT9T111_I2C_ADDR (0x78 >> 1)
#define MT9T111_CLK_MAX (75000000) /* 75MHz */
#define MT9T111_CLK_MIN (6000000) /* 6Mhz */
--
1.6.6.1
|
