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
|
$NetBSD: patch-ab,v 1.3 2002/06/23 15:22:57 kent Exp $
--- vid.c.orig Mon May 8 13:59:03 2000
+++ vid.c
@@ -48,6 +48,8 @@
struct usb_ctl_request ur;
unsigned char data[1024];
+#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2)
+
ur.request.bmRequestType = UT_READ_VENDOR_INTERFACE;
ur.request.bRequest = 2;
@@ -57,6 +59,17 @@
ur.data = data;
ur.flags = 0;
ur.actlen = 0;
+#else
+ ur.ucr_request.bmRequestType = UT_READ_VENDOR_INTERFACE;
+ ur.ucr_request.bRequest = 2;
+
+ USETW(ur.ucr_request.wValue, 0); /* unused */
+ USETW(ur.ucr_request.wIndex, reg); /* index */
+ USETW(ur.ucr_request.wLength, 1); /* payload len in bytes */
+ ur.ucr_data = data;
+ ur.ucr_flags = 0;
+ ur.ucr_actlen = 0;
+#endif
if(ioctl(fd, USB_DO_REQUEST, &ur) < 0) {
return -1;
@@ -72,6 +85,8 @@
data[0] = val;
+#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2)
+
ur.request.bmRequestType = UT_WRITE_VENDOR_INTERFACE;
ur.request.bRequest = 2;
@@ -81,7 +96,17 @@
ur.data = data;
ur.flags = 0;
ur.actlen = 0;
+#else
+ ur.ucr_request.bmRequestType = UT_WRITE_VENDOR_INTERFACE;
+ ur.ucr_request.bRequest = 2;
+ USETW(ur.ucr_request.wValue, 0); /* unused */
+ USETW(ur.ucr_request.wIndex, reg); /* index */
+ USETW(ur.ucr_request.wLength, 1); /* payload len in bytes */
+ ur.ucr_data = data;
+ ur.ucr_flags = 0;
+ ur.ucr_actlen = 0;
+#endif
if(ioctl(fd, USB_DO_REQUEST, &ur) < 0) {
return -1;
}
@@ -217,12 +242,15 @@
struct vidstate vs; /* current read state */
int small = 0; /* use 320x240 */
int frmnm = 0; /* cyclic frame number key */
+ int isplus; /* bridge is OV511+ if true, else OV511 */
+ int is20; /* sensor is OV7620 if true, else OV7610 */
+ int bufsize; /* size of packet buffer */
/* pnm_init(&argc, argv); */ /* required for PNM programs? */
while(++argv, --argc) {
if(strcmp(*argv, "--version") == 0) {
- fprintf(stderr, "OV511 capture program version " VERSION
+ fprintf(stderr, "OV511/OV511+ capture program version " VERSION
"\nCopyright 2000 Peter S. Housel"
"\nThis program is free software; "
"you may redistribute it under the terms of"
@@ -235,14 +263,14 @@
exit(0);
} else if(strcmp(*argv, "--help") == 0) {
fprintf(stderr, "usage: vid [options]\n"
- "Capture an image frame from an OV511-based USB video camera\n"
+ "Capture an image frame from an OV511/OV511+-based USB video camera\n"
"and write image data to standard output in PNM format\n\n"
"--version print program version information\n"
"--usage summarize command line options\n"
"--help print this description\n"
"--small capture as 320x240 image (default is 640x480)\n"
"-d device, --device-name=device\n"
- " specify OV511 ugen device\n");
+ " specify OV511/OV511+ ugen device\n");
exit(0);
} else if(strcmp(*argv, "--small") == 0) {
small = 1;
@@ -287,18 +315,33 @@
exit(1);
}
- if(udi.vendorNo != 0x05A9 || udi.productNo != 0x0511) {
- fprintf(stderr, "device %s is not an OmniVision OV511\n", devname);
+#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2)
+
+ if(udi.vendorNo != 0x05A9 || udi.productNo != 0x0511 && udi.productNo != 0xa511) {
+#else
+ if(udi.udi_vendorNo != 0x05A9 || udi.udi_productNo != 0x0511 && udi.udi_productNo != 0xa511) {
+#endif
+
+ fprintf(stderr, "device %s is not an OmniVision OV511/OV511+\n", devname);
exit(1);
}
} else {
int i = 0;
for(i = 0; i < 15; ++i) {
+#ifdef __NetBSD__
+ sprintf(dev, "/dev/ugen%d.00", i);
+#else
sprintf(dev, "/dev/ugen%d", i);
+#endif
if((fd = open(dev, O_RDWR)) < 0)
continue;
+#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2)
if(ioctl(fd, USB_GET_DEVICEINFO, &udi) < 0
- || udi.vendorNo != 0x05A9 || udi.productNo != 0x0511) {
+ || udi.vendorNo != 0x05A9 || udi.productNo != 0x0511 && udi.productNo != 0xa511) {
+#else
+ if(ioctl(fd, USB_GET_DEVICEINFO, &udi) < 0
+ || udi.udi_vendorNo != 0x05A9 || udi.udi_productNo != 0x0511 && udi.udi_productNo != 0xa511) {
+#endif
close(fd);
fd = -1;
continue;
@@ -308,12 +351,18 @@
}
if(fd < 0) {
- fprintf(stderr, "vid: couldn't locate an OV511 device\n");
+ fprintf(stderr, "vid: couldn't locate an OV511/OV511+ device\n");
exit(1);
}
devname = dev;
}
+#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2)
+ isplus = udi.productNo == 0xa511;
+#else
+ isplus = udi.udi_productNo == 0xa511;
+#endif
+ bufsize = (isplus ? 961 : 993);
/* reset the OV511 */
if(ov511_reg_write(fd, OV511_REG_RST, 0x7f) < 0)
@@ -398,23 +447,56 @@
if(ov511_reg_write(fd, OV511_REG_CE_EN, 0x0) < 0)
exit(1);
- ov511_i2c_write(fd, OV7610_REG_RWB, 0x5);
- ov511_i2c_write(fd, OV7610_REG_EC, 0xFF);
- ov511_i2c_write(fd, OV7610_REG_COMB, 0x01);
- ov511_i2c_write(fd, OV7610_REG_FD, 0x06);
- ov511_i2c_write(fd, OV7610_REG_COME, 0x1c);
- ov511_i2c_write(fd, OV7610_REG_COMF, 0x90);
- ov511_i2c_write(fd, OV7610_REG_ECW, 0x2e);
- ov511_i2c_write(fd, OV7610_REG_ECB, 0x7C);
- ov511_i2c_write(fd, OV7610_REG_COMH, 0x24);
- ov511_i2c_write(fd, OV7610_REG_EHSH, 0x04);
- ov511_i2c_write(fd, OV7610_REG_EHSL, 0xAC);
- ov511_i2c_write(fd, OV7610_REG_EXBK, 0xFE);
- ov511_i2c_write(fd, OV7610_REG_COMJ, 0x93);
- ov511_i2c_write(fd, OV7610_REG_BADJ, 0x48);
- ov511_i2c_write(fd, OV7610_REG_COMK, 0x81);
+ /* This returns 0 if we have an OV7620 sensor */
+ if((is20 = ov511_i2c_read(fd, OV7610_REG_COMI)) < 0)
+ exit(1);
+ is20 = !is20;
+
+ /* set up the OV7610/OV7620 */
+ if(is20) {
+ ov511_i2c_write(fd, OV7610_REG_EC, 0xff);
+ ov511_i2c_write(fd, OV7610_REG_FD, 0x06);
+ ov511_i2c_write(fd, OV7610_REG_COMH, 0x24);
+ ov511_i2c_write(fd, OV7610_REG_EHSL, 0xac);
+ ov511_i2c_write(fd, OV7610_REG_COMA, 0x00);
+ ov511_i2c_write(fd, OV7610_REG_COMH, 0x24);
+ ov511_i2c_write(fd, OV7610_REG_RWB, 0x85);
+ ov511_i2c_write(fd, OV7610_REG_COMD, 0x01);
+ ov511_i2c_write(fd, 0x23, 0x00);
+ ov511_i2c_write(fd, OV7610_REG_ECW, 0x10);
+ ov511_i2c_write(fd, OV7610_REG_ECB, 0x8a);
+ ov511_i2c_write(fd, OV7610_REG_COMG, 0xe2);
+ ov511_i2c_write(fd, OV7610_REG_EHSH, 0x00);
+ ov511_i2c_write(fd, OV7610_REG_EXBK, 0xfe);
+ ov511_i2c_write(fd, 0x30, 0x71);
+ ov511_i2c_write(fd, 0x31, 0x60);
+ ov511_i2c_write(fd, 0x32, 0x26);
+ ov511_i2c_write(fd, OV7610_REG_YGAM, 0x20);
+ ov511_i2c_write(fd, OV7610_REG_BADJ, 0x48);
+ ov511_i2c_write(fd, OV7610_REG_COMA, 0x24);
+ ov511_i2c_write(fd, OV7610_REG_SYN_CLK, 0x01);
+ ov511_i2c_write(fd, OV7610_REG_BBS, 0x24);
+ ov511_i2c_write(fd, OV7610_REG_RBS, 0x24);
+ } else {
+ ov511_i2c_write(fd, OV7610_REG_GC, 0x00);
+ ov511_i2c_write(fd, OV7610_REG_RWB, 0x05);
+ ov511_i2c_write(fd, OV7610_REG_EC, 0xFF);
+ ov511_i2c_write(fd, OV7610_REG_COMB, 0x01);
+ ov511_i2c_write(fd, OV7610_REG_FD, 0x06);
+ ov511_i2c_write(fd, OV7610_REG_COME, 0x1c);
+ ov511_i2c_write(fd, OV7610_REG_COMF, 0x90);
+ ov511_i2c_write(fd, OV7610_REG_ECW, 0x2e);
+ ov511_i2c_write(fd, OV7610_REG_ECB, 0x7C);
+ ov511_i2c_write(fd, OV7610_REG_COMH, 0x24);
+ ov511_i2c_write(fd, OV7610_REG_EHSH, 0x04);
+ ov511_i2c_write(fd, OV7610_REG_EHSL, 0xAC);
+ ov511_i2c_write(fd, OV7610_REG_EXBK, 0xFE);
+ ov511_i2c_write(fd, OV7610_REG_COMJ, 0x93);
+ ov511_i2c_write(fd, OV7610_REG_BADJ, 0x48);
+ ov511_i2c_write(fd, OV7610_REG_COMK, 0x81);
- ov511_i2c_write(fd, OV7610_REG_GAM, 0x04);
+ ov511_i2c_write(fd, OV7610_REG_GAM, 0x04);
+ }
if(small) {
vs.width = 320;
@@ -442,14 +524,19 @@
ov511_reg_write(fd, OV511_REG_LNDV, 0x00);
/* set FIFO format (993-byte packets) */
- if(ov511_reg_write(fd, OV511_REG_PKSZ, 0x1F) < 0)
+ if(ov511_reg_write(fd, OV511_REG_PKSZ, bufsize/32) < 0)
exit(1);
if(ov511_reg_write(fd, OV511_REG_PKFMT, 0x03) < 0)
exit(1);
/* select the 993-byte alternative */
+#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2)
alt.interface_index = 0;
- alt.alt_no = 1;
+ alt.alt_no = (isplus ? 7 : 1);
+#else
+ alt.uai_interface_index = 0;
+ alt.uai_alt_no = (isplus ? 7 : 1);
+#endif
if(ioctl(fd, USB_SET_ALTINTERFACE, &alt) < 0) {
perror("USB_SET_ALTINTERFACE");
exit(1);
@@ -468,42 +555,49 @@
vs.xels = pnm_allocarray(vs.width, vs.height);
/* open the isochronous endpoint (endpoint 1) */
- sprintf(isocdev, "%s.1", devname);
+#ifdef __NetBSD__
+ sprintf(isocdev, "%s.01", strtok(devname,"."));
+#else
+ sprintf(isocdev, "%s.01", devname);
+#endif
if((isoc = open(isocdev, O_RDONLY)) < 0) {
perror(isocdev);
exit(1);
}
/* read, looking for start and end frames */
- while(vs.state != DONE && (len = read(isoc, &buf, 993)) >= 0) {
+ while(vs.state != DONE && (len = read(isoc, &buf, bufsize)) >= 0) {
if(buf[0] == 0 && buf[1] == 0 && buf[2] == 0 && buf[3] == 0
&& buf[4] == 0 && buf[5] == 0 && buf[6] == 0 && buf[7] == 0
- && (buf[8] & 0x80) == 0 && buf[992] == 0 && vs.state == SKIPPING) {
- vs.state = READING;
- vs.iY = vs.jY = vs.iUV = vs.jUV = 0;
- vs.residue = 0;
- procdata(&vs, buf + 9, 993 - 10);
+ && (buf[8] & 0x80) == 0 && buf[bufsize-1] == 0 && vs.state == SKIPPING) {
+ vs.state = READING;
+ vs.iY = vs.jY = vs.iUV = vs.jUV = 0;
+ vs.residue = 0;
+ procdata(&vs, buf + 9, bufsize - 10);
} else if(buf[0] == 0 && buf[1] == 0 && buf[2] == 0 && buf[3] == 0
- && buf[4] == 0 && buf[5] == 0 && buf[6] == 0 && buf[7] == 0
- && (buf[8] & 0x80) == 0x80 && buf[992] == 0
+ && buf[4] == 0 && buf[5] == 0 && buf[6] == 0 && buf[7] == 0
+ && (buf[8] & 0x80) == 0x80 && buf[bufsize-1] == 0
&& vs.state == READING) {
vs.state = DONE;
} else if(vs.state == READING) {
- procdata(&vs, buf, 993 - 1);
+ procdata(&vs, buf, bufsize - 1);
/* abort the capture and start over if packets come in out-of-order */
- if(buf[992] != frmnm && buf[992] != 1) {
+ if(buf[bufsize-1] != frmnm && buf[bufsize-1] != 1) {
vs.state = SKIPPING;
}
- frmnm = buf[992] + 1;
+ frmnm = buf[bufsize-1] + 1;
if(frmnm == 256)
frmnm = 1;
- } else if(buf[992] != 0) {
- frmnm = buf[992] + 1;
+ } else if(buf[bufsize-1] != 0) {
+ frmnm = buf[bufsize-1] + 1;
if(frmnm == 256)
frmnm = 1;
}
}
+
+ /* reset and close the OV511 */
+ ov511_reg_write(fd, OV511_REG_RST, 0x7f);
close(isoc);
close(fd);
|
