Diff markup
1 #include <media/saa7146_vv.h> 1 #include <media/saa7146_vv.h>
2 2
3 #define BOARD_CAN_DO_VBI(dev) (dev->revision 3 #define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && dev->vv_data->vbi_minor != -1)
4 4
5 /********************************************* 5 /****************************************************************************/
6 /* resource management functions, shamelessly 6 /* resource management functions, shamelessly stolen from saa7134 driver */
7 7
8 int saa7146_res_get(struct saa7146_fh *fh, uns 8 int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit)
9 { 9 {
10 struct saa7146_dev *dev = fh->dev; 10 struct saa7146_dev *dev = fh->dev;
11 struct saa7146_vv *vv = dev->vv_data; 11 struct saa7146_vv *vv = dev->vv_data;
12 12
13 if (fh->resources & bit) { 13 if (fh->resources & bit) {
14 DEB_D(("already allocated! wan 14 DEB_D(("already allocated! want: 0x%02x, cur:0x%02x\n",bit,vv->resources));
15 /* have it already allocated * 15 /* have it already allocated */
16 return 1; 16 return 1;
17 } 17 }
18 18
19 /* is it free? */ 19 /* is it free? */
20 mutex_lock(&dev->lock); 20 mutex_lock(&dev->lock);
21 if (vv->resources & bit) { 21 if (vv->resources & bit) {
22 DEB_D(("locked! vv->resources: 22 DEB_D(("locked! vv->resources:0x%02x, we want:0x%02x\n",vv->resources,bit));
23 /* no, someone else uses it */ 23 /* no, someone else uses it */
24 mutex_unlock(&dev->lock); 24 mutex_unlock(&dev->lock);
25 return 0; 25 return 0;
26 } 26 }
27 /* it's free, grab it */ 27 /* it's free, grab it */
28 fh->resources |= bit; 28 fh->resources |= bit;
29 vv->resources |= bit; 29 vv->resources |= bit;
30 DEB_D(("res: get 0x%02x, cur:0x%02x\n" 30 DEB_D(("res: get 0x%02x, cur:0x%02x\n",bit,vv->resources));
31 mutex_unlock(&dev->lock); 31 mutex_unlock(&dev->lock);
32 return 1; 32 return 1;
33 } 33 }
34 34
35 void saa7146_res_free(struct saa7146_fh *fh, u 35 void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits)
36 { 36 {
37 struct saa7146_dev *dev = fh->dev; 37 struct saa7146_dev *dev = fh->dev;
38 struct saa7146_vv *vv = dev->vv_data; 38 struct saa7146_vv *vv = dev->vv_data;
39 39
40 BUG_ON((fh->resources & bits) != bits) 40 BUG_ON((fh->resources & bits) != bits);
41 41
42 mutex_lock(&dev->lock); 42 mutex_lock(&dev->lock);
43 fh->resources &= ~bits; 43 fh->resources &= ~bits;
44 vv->resources &= ~bits; 44 vv->resources &= ~bits;
45 DEB_D(("res: put 0x%02x, cur:0x%02x\n" 45 DEB_D(("res: put 0x%02x, cur:0x%02x\n",bits,vv->resources));
46 mutex_unlock(&dev->lock); 46 mutex_unlock(&dev->lock);
47 } 47 }
48 48
49 49
50 /********************************************* 50 /********************************************************************************/
51 /* common dma functions */ 51 /* common dma functions */
52 52
53 void saa7146_dma_free(struct saa7146_dev *dev, 53 void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q,
54 54 struct saa7146_buf *buf)
55 { 55 {
56 struct videobuf_dmabuf *dma=videobuf_t 56 struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
57 DEB_EE(("dev:%p, buf:%p\n",dev,buf)); 57 DEB_EE(("dev:%p, buf:%p\n",dev,buf));
58 58
59 BUG_ON(in_interrupt()); 59 BUG_ON(in_interrupt());
60 60
61 videobuf_waiton(&buf->vb,0,0); 61 videobuf_waiton(&buf->vb,0,0);
62 videobuf_dma_unmap(q, dma); 62 videobuf_dma_unmap(q, dma);
63 videobuf_dma_free(dma); 63 videobuf_dma_free(dma);
64 buf->vb.state = VIDEOBUF_NEEDS_INIT; 64 buf->vb.state = VIDEOBUF_NEEDS_INIT;
65 } 65 }
66 66
67 67
68 /********************************************* 68 /********************************************************************************/
69 /* common buffer functions */ 69 /* common buffer functions */
70 70
71 int saa7146_buffer_queue(struct saa7146_dev *d 71 int saa7146_buffer_queue(struct saa7146_dev *dev,
72 struct saa7146_dmaque 72 struct saa7146_dmaqueue *q,
73 struct saa7146_buf *b 73 struct saa7146_buf *buf)
74 { 74 {
75 assert_spin_locked(&dev->slock); 75 assert_spin_locked(&dev->slock);
76 DEB_EE(("dev:%p, dmaq:%p, buf:%p\n", d 76 DEB_EE(("dev:%p, dmaq:%p, buf:%p\n", dev, q, buf));
77 77
78 BUG_ON(!q); 78 BUG_ON(!q);
79 79
80 if (NULL == q->curr) { 80 if (NULL == q->curr) {
81 q->curr = buf; 81 q->curr = buf;
82 DEB_D(("immediately activating 82 DEB_D(("immediately activating buffer %p\n", buf));
83 buf->activate(dev,buf,NULL); 83 buf->activate(dev,buf,NULL);
84 } else { 84 } else {
85 list_add_tail(&buf->vb.queue,& 85 list_add_tail(&buf->vb.queue,&q->queue);
86 buf->vb.state = VIDEOBUF_QUEUE 86 buf->vb.state = VIDEOBUF_QUEUED;
87 DEB_D(("adding buffer %p to qu 87 DEB_D(("adding buffer %p to queue. (active buffer present)\n", buf));
88 } 88 }
89 return 0; 89 return 0;
90 } 90 }
91 91
92 void saa7146_buffer_finish(struct saa7146_dev 92 void saa7146_buffer_finish(struct saa7146_dev *dev,
93 struct saa7146_dmaq 93 struct saa7146_dmaqueue *q,
94 int state) 94 int state)
95 { 95 {
96 assert_spin_locked(&dev->slock); 96 assert_spin_locked(&dev->slock);
97 DEB_EE(("dev:%p, dmaq:%p, state:%d\n", 97 DEB_EE(("dev:%p, dmaq:%p, state:%d\n", dev, q, state));
98 DEB_EE(("q->curr:%p\n",q->curr)); 98 DEB_EE(("q->curr:%p\n",q->curr));
99 99
100 BUG_ON(!q->curr); 100 BUG_ON(!q->curr);
101 101
102 /* finish current buffer */ 102 /* finish current buffer */
103 if (NULL == q->curr) { 103 if (NULL == q->curr) {
104 DEB_D(("aiii. no current buffe 104 DEB_D(("aiii. no current buffer\n"));
105 return; 105 return;
106 } 106 }
107 107
108 q->curr->vb.state = state; 108 q->curr->vb.state = state;
109 do_gettimeofday(&q->curr->vb.ts); 109 do_gettimeofday(&q->curr->vb.ts);
110 wake_up(&q->curr->vb.done); 110 wake_up(&q->curr->vb.done);
111 111
112 q->curr = NULL; 112 q->curr = NULL;
113 } 113 }
114 114
115 void saa7146_buffer_next(struct saa7146_dev *d 115 void saa7146_buffer_next(struct saa7146_dev *dev,
116 struct saa7146_dmaque 116 struct saa7146_dmaqueue *q, int vbi)
117 { 117 {
118 struct saa7146_buf *buf,*next = NULL; 118 struct saa7146_buf *buf,*next = NULL;
119 119
120 BUG_ON(!q); 120 BUG_ON(!q);
121 121
122 DEB_INT(("dev:%p, dmaq:%p, vbi:%d\n", 122 DEB_INT(("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi));
123 123
124 assert_spin_locked(&dev->slock); 124 assert_spin_locked(&dev->slock);
125 if (!list_empty(&q->queue)) { 125 if (!list_empty(&q->queue)) {
126 /* activate next one from queu 126 /* activate next one from queue */
127 buf = list_entry(q->queue.next 127 buf = list_entry(q->queue.next,struct saa7146_buf,vb.queue);
128 list_del(&buf->vb.queue); 128 list_del(&buf->vb.queue);
129 if (!list_empty(&q->queue)) 129 if (!list_empty(&q->queue))
130 next = list_entry(q->q 130 next = list_entry(q->queue.next,struct saa7146_buf, vb.queue);
131 q->curr = buf; 131 q->curr = buf;
132 DEB_INT(("next buffer: buf:%p, 132 DEB_INT(("next buffer: buf:%p, prev:%p, next:%p\n", buf, q->queue.prev,q->queue.next));
133 buf->activate(dev,buf,next); 133 buf->activate(dev,buf,next);
134 } else { 134 } else {
135 DEB_INT(("no next buffer. stop 135 DEB_INT(("no next buffer. stopping.\n"));
136 if( 0 != vbi ) { 136 if( 0 != vbi ) {
137 /* turn off video-dma3 137 /* turn off video-dma3 */
138 saa7146_write(dev,MC1, 138 saa7146_write(dev,MC1, MASK_20);
139 } else { 139 } else {
140 /* nothing to do -- ju 140 /* nothing to do -- just prevent next video-dma1 transfer
141 by lowering the pro 141 by lowering the protection address */
142 142
143 // fixme: fix this for 143 // fixme: fix this for vflip != 0
144 144
145 saa7146_write(dev, PRO 145 saa7146_write(dev, PROT_ADDR1, 0);
146 saa7146_write(dev, MC2 146 saa7146_write(dev, MC2, (MASK_02|MASK_18));
147 147
148 /* write the address o 148 /* write the address of the rps-program */
149 saa7146_write(dev, RPS 149 saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle);
150 /* turn on rps */ 150 /* turn on rps */
151 saa7146_write(dev, MC1 151 saa7146_write(dev, MC1, (MASK_12 | MASK_28));
152 152
153 /* 153 /*
154 printk("vdma%d.base_ev 154 printk("vdma%d.base_even: 0x%08x\n", 1,saa7146_read(dev,BASE_EVEN1));
155 printk("vdma%d.base_od 155 printk("vdma%d.base_odd: 0x%08x\n", 1,saa7146_read(dev,BASE_ODD1));
156 printk("vdma%d.prot_ad 156 printk("vdma%d.prot_addr: 0x%08x\n", 1,saa7146_read(dev,PROT_ADDR1));
157 printk("vdma%d.base_pa 157 printk("vdma%d.base_page: 0x%08x\n", 1,saa7146_read(dev,BASE_PAGE1));
158 printk("vdma%d.pitch: 158 printk("vdma%d.pitch: 0x%08x\n", 1,saa7146_read(dev,PITCH1));
159 printk("vdma%d.num_lin 159 printk("vdma%d.num_line_byte: 0x%08x\n", 1,saa7146_read(dev,NUM_LINE_BYTE1));
160 */ 160 */
161 } 161 }
162 del_timer(&q->timeout); 162 del_timer(&q->timeout);
163 } 163 }
164 } 164 }
165 165
166 void saa7146_buffer_timeout(unsigned long data 166 void saa7146_buffer_timeout(unsigned long data)
167 { 167 {
168 struct saa7146_dmaqueue *q = (struct s 168 struct saa7146_dmaqueue *q = (struct saa7146_dmaqueue*)data;
169 struct saa7146_dev *dev = q->dev; 169 struct saa7146_dev *dev = q->dev;
170 unsigned long flags; 170 unsigned long flags;
171 171
172 DEB_EE(("dev:%p, dmaq:%p\n", dev, q)); 172 DEB_EE(("dev:%p, dmaq:%p\n", dev, q));
173 173
174 spin_lock_irqsave(&dev->slock,flags); 174 spin_lock_irqsave(&dev->slock,flags);
175 if (q->curr) { 175 if (q->curr) {
176 DEB_D(("timeout on %p\n", q->c 176 DEB_D(("timeout on %p\n", q->curr));
177 saa7146_buffer_finish(dev,q,VI 177 saa7146_buffer_finish(dev,q,VIDEOBUF_ERROR);
178 } 178 }
179 179
180 /* we don't restart the transfer here 180 /* we don't restart the transfer here like other drivers do. when
181 a streaming capture is disabled, th 181 a streaming capture is disabled, the timeout function will be
182 called for the current buffer. if w 182 called for the current buffer. if we activate the next buffer now,
183 we mess up our capture logic. if a 183 we mess up our capture logic. if a timeout occurs on another buffer,
184 then something is seriously broken 184 then something is seriously broken before, so no need to buffer the
185 next capture IMHO... */ 185 next capture IMHO... */
186 /* 186 /*
187 saa7146_buffer_next(dev,q); 187 saa7146_buffer_next(dev,q);
188 */ 188 */
189 spin_unlock_irqrestore(&dev->slock,fla 189 spin_unlock_irqrestore(&dev->slock,flags);
190 } 190 }
191 191
192 /********************************************* 192 /********************************************************************************/
193 /* file operations */ 193 /* file operations */
194 194
195 static int fops_open(struct inode *inode, stru !! 195 static int fops_open(struct file *file)
196 { 196 {
197 unsigned int minor = iminor(inode); !! 197 unsigned int minor = video_devdata(file)->minor;
198 struct saa7146_dev *h = NULL, *dev = N 198 struct saa7146_dev *h = NULL, *dev = NULL;
199 struct list_head *list; 199 struct list_head *list;
200 struct saa7146_fh *fh = NULL; 200 struct saa7146_fh *fh = NULL;
201 int result = 0; 201 int result = 0;
202 202
203 enum v4l2_buf_type type = V4L2_BUF_TYP 203 enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
204 204
205 DEB_EE(("inode:%p, file:%p, minor:%d\n !! 205 DEB_EE(("file:%p, minor:%d\n", file, minor));
206 206
207 if (mutex_lock_interruptible(&saa7146_ 207 if (mutex_lock_interruptible(&saa7146_devices_lock))
208 return -ERESTARTSYS; 208 return -ERESTARTSYS;
209 209
210 list_for_each(list,&saa7146_devices) { 210 list_for_each(list,&saa7146_devices) {
211 h = list_entry(list, struct sa 211 h = list_entry(list, struct saa7146_dev, item);
212 if( NULL == h->vv_data ) { 212 if( NULL == h->vv_data ) {
213 DEB_D(("device %p has 213 DEB_D(("device %p has not registered video devices.\n",h));
214 continue; 214 continue;
215 } 215 }
216 DEB_D(("trying: %p @ major %d, 216 DEB_D(("trying: %p @ major %d,%d\n",h,h->vv_data->video_minor,h->vv_data->vbi_minor));
217 217
218 if (h->vv_data->video_minor == 218 if (h->vv_data->video_minor == minor) {
219 dev = h; 219 dev = h;
220 } 220 }
221 if (h->vv_data->vbi_minor == m 221 if (h->vv_data->vbi_minor == minor) {
222 type = V4L2_BUF_TYPE_V 222 type = V4L2_BUF_TYPE_VBI_CAPTURE;
223 dev = h; 223 dev = h;
224 } 224 }
225 } 225 }
226 if (NULL == dev) { 226 if (NULL == dev) {
227 DEB_S(("no such video device.\ 227 DEB_S(("no such video device.\n"));
228 result = -ENODEV; 228 result = -ENODEV;
229 goto out; 229 goto out;
230 } 230 }
231 231
232 DEB_D(("using: %p\n",dev)); 232 DEB_D(("using: %p\n",dev));
233 233
234 /* check if an extension is registered 234 /* check if an extension is registered */
235 if( NULL == dev->ext ) { 235 if( NULL == dev->ext ) {
236 DEB_S(("no extension registere 236 DEB_S(("no extension registered for this device.\n"));
237 result = -ENODEV; 237 result = -ENODEV;
238 goto out; 238 goto out;
239 } 239 }
240 240
241 /* allocate per open data */ 241 /* allocate per open data */
242 fh = kzalloc(sizeof(*fh),GFP_KERNEL); 242 fh = kzalloc(sizeof(*fh),GFP_KERNEL);
243 if (NULL == fh) { 243 if (NULL == fh) {
244 DEB_S(("cannot allocate memory 244 DEB_S(("cannot allocate memory for per open data.\n"));
245 result = -ENOMEM; 245 result = -ENOMEM;
246 goto out; 246 goto out;
247 } 247 }
248 248
249 file->private_data = fh; 249 file->private_data = fh;
250 fh->dev = dev; 250 fh->dev = dev;
251 fh->type = type; 251 fh->type = type;
252 252
253 if( fh->type == V4L2_BUF_TYPE_VBI_CAPT 253 if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
254 DEB_S(("initializing vbi...\n" 254 DEB_S(("initializing vbi...\n"));
255 if (dev->ext_vv_data->capabili 255 if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
256 result = saa7146_vbi_u 256 result = saa7146_vbi_uops.open(dev,file);
257 if (dev->ext_vv_data->vbi_fops 257 if (dev->ext_vv_data->vbi_fops.open)
258 dev->ext_vv_data->vbi_ !! 258 dev->ext_vv_data->vbi_fops.open(file);
259 } else { 259 } else {
260 DEB_S(("initializing video...\ 260 DEB_S(("initializing video...\n"));
261 result = saa7146_video_uops.op 261 result = saa7146_video_uops.open(dev,file);
262 } 262 }
263 263
264 if (0 != result) { 264 if (0 != result) {
265 goto out; 265 goto out;
266 } 266 }
267 267
268 if( 0 == try_module_get(dev->ext->modu 268 if( 0 == try_module_get(dev->ext->module)) {
269 result = -EINVAL; 269 result = -EINVAL;
270 goto out; 270 goto out;
271 } 271 }
272 272
273 result = 0; 273 result = 0;
274 out: 274 out:
275 if (fh && result != 0) { 275 if (fh && result != 0) {
276 kfree(fh); 276 kfree(fh);
277 file->private_data = NULL; 277 file->private_data = NULL;
278 } 278 }
279 mutex_unlock(&saa7146_devices_lock); 279 mutex_unlock(&saa7146_devices_lock);
280 return result; 280 return result;
281 } 281 }
282 282
283 static int fops_release(struct inode *inode, s !! 283 static int fops_release(struct file *file)
284 { 284 {
285 struct saa7146_fh *fh = file->privat 285 struct saa7146_fh *fh = file->private_data;
286 struct saa7146_dev *dev = fh->dev; 286 struct saa7146_dev *dev = fh->dev;
287 287
288 DEB_EE(("inode:%p, file:%p\n",inode,fi !! 288 DEB_EE(("file:%p\n", file));
289 289
290 if (mutex_lock_interruptible(&saa7146_ 290 if (mutex_lock_interruptible(&saa7146_devices_lock))
291 return -ERESTARTSYS; 291 return -ERESTARTSYS;
292 292
293 if( fh->type == V4L2_BUF_TYPE_VBI_CAPT 293 if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
294 if (dev->ext_vv_data->capabili 294 if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
295 saa7146_vbi_uops.relea 295 saa7146_vbi_uops.release(dev,file);
296 if (dev->ext_vv_data->vbi_fops 296 if (dev->ext_vv_data->vbi_fops.release)
297 dev->ext_vv_data->vbi_ !! 297 dev->ext_vv_data->vbi_fops.release(file);
298 } else { 298 } else {
299 saa7146_video_uops.release(dev 299 saa7146_video_uops.release(dev,file);
300 } 300 }
301 301
302 module_put(dev->ext->module); 302 module_put(dev->ext->module);
303 file->private_data = NULL; 303 file->private_data = NULL;
304 kfree(fh); 304 kfree(fh);
305 305
306 mutex_unlock(&saa7146_devices_lock); 306 mutex_unlock(&saa7146_devices_lock);
307 307
308 return 0; 308 return 0;
309 } 309 }
310 310
311 static int fops_ioctl(struct inode *inode, str <<
312 { <<
313 /* <<
314 DEB_EE(("inode:%p, file:%p, cmd:%d, ar <<
315 */ <<
316 return video_usercopy(inode, file, cmd <<
317 } <<
318 <<
319 static int fops_mmap(struct file *file, struct 311 static int fops_mmap(struct file *file, struct vm_area_struct * vma)
320 { 312 {
321 struct saa7146_fh *fh = file->private_ 313 struct saa7146_fh *fh = file->private_data;
322 struct videobuf_queue *q; 314 struct videobuf_queue *q;
323 315
324 switch (fh->type) { 316 switch (fh->type) {
325 case V4L2_BUF_TYPE_VIDEO_CAPTURE: { 317 case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
326 DEB_EE(("V4L2_BUF_TYPE_VIDEO_C 318 DEB_EE(("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, vma:%p\n",file, vma));
327 q = &fh->video_q; 319 q = &fh->video_q;
328 break; 320 break;
329 } 321 }
330 case V4L2_BUF_TYPE_VBI_CAPTURE: { 322 case V4L2_BUF_TYPE_VBI_CAPTURE: {
331 DEB_EE(("V4L2_BUF_TYPE_VBI_CAP 323 DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, vma:%p\n",file, vma));
332 q = &fh->vbi_q; 324 q = &fh->vbi_q;
333 break; 325 break;
334 } 326 }
335 default: 327 default:
336 BUG(); 328 BUG();
337 return 0; 329 return 0;
338 } 330 }
339 331
340 return videobuf_mmap_mapper(q,vma); 332 return videobuf_mmap_mapper(q,vma);
341 } 333 }
342 334
343 static unsigned int fops_poll(struct file *fil 335 static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait)
344 { 336 {
345 struct saa7146_fh *fh = file->private_ 337 struct saa7146_fh *fh = file->private_data;
346 struct videobuf_buffer *buf = NULL; 338 struct videobuf_buffer *buf = NULL;
347 struct videobuf_queue *q; 339 struct videobuf_queue *q;
348 340
349 DEB_EE(("file:%p, poll:%p\n",file, wai 341 DEB_EE(("file:%p, poll:%p\n",file, wait));
350 342
351 if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->t 343 if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) {
352 if( 0 == fh->vbi_q.streaming ) 344 if( 0 == fh->vbi_q.streaming )
353 return videobuf_poll_s 345 return videobuf_poll_stream(file, &fh->vbi_q, wait);
354 q = &fh->vbi_q; 346 q = &fh->vbi_q;
355 } else { 347 } else {
356 DEB_D(("using video queue.\n") 348 DEB_D(("using video queue.\n"));
357 q = &fh->video_q; 349 q = &fh->video_q;
358 } 350 }
359 351
360 if (!list_empty(&q->stream)) 352 if (!list_empty(&q->stream))
361 buf = list_entry(q->stream.nex 353 buf = list_entry(q->stream.next, struct videobuf_buffer, stream);
362 354
363 if (!buf) { 355 if (!buf) {
364 DEB_D(("buf == NULL!\n")); 356 DEB_D(("buf == NULL!\n"));
365 return POLLERR; 357 return POLLERR;
366 } 358 }
367 359
368 poll_wait(file, &buf->done, wait); 360 poll_wait(file, &buf->done, wait);
369 if (buf->state == VIDEOBUF_DONE || buf 361 if (buf->state == VIDEOBUF_DONE || buf->state == VIDEOBUF_ERROR) {
370 DEB_D(("poll succeeded!\n")); 362 DEB_D(("poll succeeded!\n"));
371 return POLLIN|POLLRDNORM; 363 return POLLIN|POLLRDNORM;
372 } 364 }
373 365
374 DEB_D(("nothing to poll for, buf->stat 366 DEB_D(("nothing to poll for, buf->state:%d\n",buf->state));
375 return 0; 367 return 0;
376 } 368 }
377 369
378 static ssize_t fops_read(struct file *file, ch 370 static ssize_t fops_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
379 { 371 {
380 struct saa7146_fh *fh = file->private_ 372 struct saa7146_fh *fh = file->private_data;
381 373
382 switch (fh->type) { 374 switch (fh->type) {
383 case V4L2_BUF_TYPE_VIDEO_CAPTURE: { 375 case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
384 // DEB_EE(("V4L2_BUF_TYPE_VIDEO_C 376 // DEB_EE(("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, data:%p, count:%lun", file, data, (unsigned long)count));
385 return saa7146_video_uops.read 377 return saa7146_video_uops.read(file,data,count,ppos);
386 } 378 }
387 case V4L2_BUF_TYPE_VBI_CAPTURE: { 379 case V4L2_BUF_TYPE_VBI_CAPTURE: {
388 // DEB_EE(("V4L2_BUF_TYPE_VBI_CAP 380 // DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n", file, data, (unsigned long)count));
389 if (fh->dev->ext_vv_data->capa 381 if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
390 return saa7146_vbi_uop 382 return saa7146_vbi_uops.read(file,data,count,ppos);
391 else 383 else
392 return -EINVAL; 384 return -EINVAL;
393 } 385 }
394 break; 386 break;
395 default: 387 default:
396 BUG(); 388 BUG();
397 return 0; 389 return 0;
398 } 390 }
399 } 391 }
400 392
401 static ssize_t fops_write(struct file *file, c 393 static ssize_t fops_write(struct file *file, const char __user *data, size_t count, loff_t *ppos)
402 { 394 {
403 struct saa7146_fh *fh = file->private_ 395 struct saa7146_fh *fh = file->private_data;
404 396
405 switch (fh->type) { 397 switch (fh->type) {
406 case V4L2_BUF_TYPE_VIDEO_CAPTURE: 398 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
407 return -EINVAL; 399 return -EINVAL;
408 case V4L2_BUF_TYPE_VBI_CAPTURE: 400 case V4L2_BUF_TYPE_VBI_CAPTURE:
409 if (fh->dev->ext_vv_data->vbi_ 401 if (fh->dev->ext_vv_data->vbi_fops.write)
410 return fh->dev->ext_vv 402 return fh->dev->ext_vv_data->vbi_fops.write(file, data, count, ppos);
411 else 403 else
412 return -EINVAL; 404 return -EINVAL;
413 default: 405 default:
414 BUG(); 406 BUG();
415 return -EINVAL; 407 return -EINVAL;
416 } 408 }
417 } 409 }
418 410
419 static const struct file_operations video_fops !! 411 static const struct v4l2_file_operations video_fops =
420 { 412 {
421 .owner = THIS_MODULE, 413 .owner = THIS_MODULE,
422 .open = fops_open, 414 .open = fops_open,
423 .release = fops_release, 415 .release = fops_release,
424 .read = fops_read, 416 .read = fops_read,
425 .write = fops_write, 417 .write = fops_write,
426 .poll = fops_poll, 418 .poll = fops_poll,
427 .mmap = fops_mmap, 419 .mmap = fops_mmap,
428 .ioctl = fops_ioctl, !! 420 .ioctl = video_ioctl2,
429 .llseek = no_llseek, <<
430 }; 421 };
431 422
432 static void vv_callback(struct saa7146_dev *de 423 static void vv_callback(struct saa7146_dev *dev, unsigned long status)
433 { 424 {
434 u32 isr = status; 425 u32 isr = status;
435 426
436 DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u 427 DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status));
437 428
438 if (0 != (isr & (MASK_27))) { 429 if (0 != (isr & (MASK_27))) {
439 DEB_INT(("irq: RPS0 (0x%08x).\ 430 DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
440 saa7146_video_uops.irq_done(de 431 saa7146_video_uops.irq_done(dev,isr);
441 } 432 }
442 433
443 if (0 != (isr & (MASK_28))) { 434 if (0 != (isr & (MASK_28))) {
444 u32 mc2 = saa7146_read(dev, MC 435 u32 mc2 = saa7146_read(dev, MC2);
445 if( 0 != (mc2 & MASK_15)) { 436 if( 0 != (mc2 & MASK_15)) {
446 DEB_INT(("irq: RPS1 vb 437 DEB_INT(("irq: RPS1 vbi workaround (0x%08x).\n",isr));
447 wake_up(&dev->vv_data- 438 wake_up(&dev->vv_data->vbi_wq);
448 saa7146_write(dev,MC2, 439 saa7146_write(dev,MC2, MASK_31);
449 return; 440 return;
450 } 441 }
451 DEB_INT(("irq: RPS1 (0x%08x).\ 442 DEB_INT(("irq: RPS1 (0x%08x).\n",isr));
452 saa7146_vbi_uops.irq_done(dev, 443 saa7146_vbi_uops.irq_done(dev,isr);
453 } 444 }
454 } 445 }
455 446
456 static struct video_device device_template = <<
457 { <<
458 .fops = &video_fops, <<
459 .minor = -1, <<
460 }; <<
461 <<
462 int saa7146_vv_init(struct saa7146_dev* dev, s 447 int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
463 { 448 {
464 struct saa7146_vv *vv = kzalloc (sizeo !! 449 struct saa7146_vv *vv;
465 if( NULL == vv ) { !! 450 int err;
>> 451
>> 452 err = v4l2_device_register(&dev->pci->dev, &dev->v4l2_dev);
>> 453 if (err)
>> 454 return err;
>> 455
>> 456 vv = kzalloc(sizeof(struct saa7146_vv), GFP_KERNEL);
>> 457 if (vv == NULL) {
466 ERR(("out of memory. aborting. 458 ERR(("out of memory. aborting.\n"));
467 return -1; !! 459 return -ENOMEM;
468 } 460 }
>> 461 ext_vv->ops = saa7146_video_ioctl_ops;
>> 462 ext_vv->core_ops = &saa7146_video_ioctl_ops;
469 463
470 DEB_EE(("dev:%p\n",dev)); 464 DEB_EE(("dev:%p\n",dev));
471 465
472 /* set default values for video parts 466 /* set default values for video parts of the saa7146 */
473 saa7146_write(dev, BCS_CTRL, 0x8040004 467 saa7146_write(dev, BCS_CTRL, 0x80400040);
474 468
475 /* enable video-port pins */ 469 /* enable video-port pins */
476 saa7146_write(dev, MC1, (MASK_10 | MAS 470 saa7146_write(dev, MC1, (MASK_10 | MASK_26));
477 471
478 /* save per-device extension data (one 472 /* save per-device extension data (one extension can
479 handle different devices that might 473 handle different devices that might need different
480 configuration data) */ 474 configuration data) */
481 dev->ext_vv_data = ext_vv; 475 dev->ext_vv_data = ext_vv;
482 476
483 vv->video_minor = -1; 477 vv->video_minor = -1;
484 vv->vbi_minor = -1; 478 vv->vbi_minor = -1;
485 479
486 vv->d_clipping.cpu_addr = pci_alloc_co 480 vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
487 if( NULL == vv->d_clipping.cpu_addr ) 481 if( NULL == vv->d_clipping.cpu_addr ) {
488 ERR(("out of memory. aborting. 482 ERR(("out of memory. aborting.\n"));
489 kfree(vv); 483 kfree(vv);
490 return -1; 484 return -1;
491 } 485 }
492 memset(vv->d_clipping.cpu_addr, 0x0, S 486 memset(vv->d_clipping.cpu_addr, 0x0, SAA7146_CLIPPING_MEM);
493 487
494 saa7146_video_uops.init(dev,vv); 488 saa7146_video_uops.init(dev,vv);
495 if (dev->ext_vv_data->capabilities & V 489 if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
496 saa7146_vbi_uops.init(dev,vv); 490 saa7146_vbi_uops.init(dev,vv);
497 491
498 dev->vv_data = vv; 492 dev->vv_data = vv;
499 dev->vv_callback = &vv_callback; 493 dev->vv_callback = &vv_callback;
500 494
501 return 0; 495 return 0;
502 } 496 }
503 EXPORT_SYMBOL_GPL(saa7146_vv_init); 497 EXPORT_SYMBOL_GPL(saa7146_vv_init);
504 498
505 int saa7146_vv_release(struct saa7146_dev* dev 499 int saa7146_vv_release(struct saa7146_dev* dev)
506 { 500 {
507 struct saa7146_vv *vv = dev->vv_data; 501 struct saa7146_vv *vv = dev->vv_data;
508 502
509 DEB_EE(("dev:%p\n",dev)); 503 DEB_EE(("dev:%p\n",dev));
510 504
>> 505 v4l2_device_unregister(&dev->v4l2_dev);
511 pci_free_consistent(dev->pci, SAA7146_ 506 pci_free_consistent(dev->pci, SAA7146_CLIPPING_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle);
512 kfree(vv); 507 kfree(vv);
513 dev->vv_data = NULL; 508 dev->vv_data = NULL;
514 dev->vv_callback = NULL; 509 dev->vv_callback = NULL;
515 510
516 return 0; 511 return 0;
517 } 512 }
518 EXPORT_SYMBOL_GPL(saa7146_vv_release); 513 EXPORT_SYMBOL_GPL(saa7146_vv_release);
519 514
520 int saa7146_register_device(struct video_devic 515 int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
521 char *name, int ty 516 char *name, int type)
522 { 517 {
523 struct saa7146_vv *vv = dev->vv_data; 518 struct saa7146_vv *vv = dev->vv_data;
524 struct video_device *vfd; 519 struct video_device *vfd;
>> 520 int err;
>> 521 int i;
525 522
526 DEB_EE(("dev:%p, name:'%s', type:%d\n" 523 DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type));
527 524
528 // released by vfd->release 525 // released by vfd->release
529 vfd = video_device_alloc(); 526 vfd = video_device_alloc();
530 if (vfd == NULL) 527 if (vfd == NULL)
531 return -ENOMEM; 528 return -ENOMEM;
532 529
533 memcpy(vfd, &device_template, sizeof(s !! 530 vfd->fops = &video_fops;
534 strlcpy(vfd->name, name, sizeof(vfd->n !! 531 vfd->ioctl_ops = &dev->ext_vv_data->ops;
535 vfd->release = video_device_release; 532 vfd->release = video_device_release;
536 vfd->priv = dev; !! 533 vfd->tvnorms = 0;
>> 534 for (i = 0; i < dev->ext_vv_data->num_stds; i++)
>> 535 vfd->tvnorms |= dev->ext_vv_data->stds[i].id;
>> 536 strlcpy(vfd->name, name, sizeof(vfd->name));
>> 537 video_set_drvdata(vfd, dev);
537 538
538 // fixme: -1 should be an insmod param !! 539 err = video_register_device(vfd, type, -1);
539 if (video_register_device(vfd, type, - !! 540 if (err < 0) {
540 ERR(("cannot register v4l2 dev 541 ERR(("cannot register v4l2 device. skipping.\n"));
541 video_device_release(vfd); 542 video_device_release(vfd);
542 return -1; !! 543 return err;
543 } 544 }
544 545
545 if( VFL_TYPE_GRABBER == type ) { 546 if( VFL_TYPE_GRABBER == type ) {
546 vv->video_minor = vfd->minor; 547 vv->video_minor = vfd->minor;
547 INFO(("%s: registered device v 548 INFO(("%s: registered device video%d [v4l2]\n",
548 dev->name, vfd->minor !! 549 dev->name, vfd->num));
549 } else { 550 } else {
550 vv->vbi_minor = vfd->minor; 551 vv->vbi_minor = vfd->minor;
551 INFO(("%s: registered device v 552 INFO(("%s: registered device vbi%d [v4l2]\n",
552 dev->name, vfd->minor !! 553 dev->name, vfd->num));
553 } 554 }
554 555
555 *vid = vfd; 556 *vid = vfd;
556 return 0; 557 return 0;
557 } 558 }
558 EXPORT_SYMBOL_GPL(saa7146_register_device); 559 EXPORT_SYMBOL_GPL(saa7146_register_device);
559 560
560 int saa7146_unregister_device(struct video_dev 561 int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev)
561 { 562 {
562 struct saa7146_vv *vv = dev->vv_data; 563 struct saa7146_vv *vv = dev->vv_data;
563 564
564 DEB_EE(("dev:%p\n",dev)); 565 DEB_EE(("dev:%p\n",dev));
565 566
566 if( VFL_TYPE_GRABBER == (*vid)->type ) !! 567 if ((*vid)->vfl_type == VFL_TYPE_GRABBER) {
567 vv->video_minor = -1; 568 vv->video_minor = -1;
568 } else { 569 } else {
569 vv->vbi_minor = -1; 570 vv->vbi_minor = -1;
570 } 571 }
571 572
572 video_unregister_device(*vid); 573 video_unregister_device(*vid);
573 *vid = NULL; 574 *vid = NULL;
574 575
575 return 0; 576 return 0;
576 } 577 }
577 EXPORT_SYMBOL_GPL(saa7146_unregister_device); 578 EXPORT_SYMBOL_GPL(saa7146_unregister_device);
578 579
579 static int __init saa7146_vv_init_module(void) 580 static int __init saa7146_vv_init_module(void)
580 { 581 {
581 return 0; 582 return 0;
582 } 583 }
583 584
584 585
585 static void __exit saa7146_vv_cleanup_module(v 586 static void __exit saa7146_vv_cleanup_module(void)
586 { 587 {
587 } 588 }
588 589
589 module_init(saa7146_vv_init_module); 590 module_init(saa7146_vv_init_module);
590 module_exit(saa7146_vv_cleanup_module); 591 module_exit(saa7146_vv_cleanup_module);
591 592
592 MODULE_AUTHOR("Michael Hunold <michael@mihu.de 593 MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
593 MODULE_DESCRIPTION("video4linux driver for saa 594 MODULE_DESCRIPTION("video4linux driver for saa7146-based hardware");
594 MODULE_LICENSE("GPL"); 595 MODULE_LICENSE("GPL");
595 596
|
This page was automatically generated by the
LXR engine.
|