diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index bc5e038bc0fe..307beae04f2a 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: cx88.h,v 1.67 2005/07/01 12:10:07 mkrufky Exp $ | 2 | * $Id: cx88.h,v 1.68 2005/07/07 14:17:47 mchehab Exp $ |
3 | * | 3 | * |
4 | * v4l2 device driver for cx2388x based TV cards | 4 | * v4l2 device driver for cx2388x based TV cards |
5 | * | 5 | * |
@@ -82,9 +82,9 @@ struct cx88_tvnorm { | |||
82 | static unsigned int inline norm_maxw(struct cx88_tvnorm *norm) | 82 | static unsigned int inline norm_maxw(struct cx88_tvnorm *norm) |
83 | { | 83 | { |
84 | return (norm->id & V4L2_STD_625_50) ? 768 : 640; | 84 | return (norm->id & V4L2_STD_625_50) ? 768 : 640; |
85 | // return (norm->id & V4L2_STD_625_50) ? 720 : 640; | ||
86 | } | 85 | } |
87 | 86 | ||
87 | |||
88 | static unsigned int inline norm_maxh(struct cx88_tvnorm *norm) | 88 | static unsigned int inline norm_maxh(struct cx88_tvnorm *norm) |
89 | { | 89 | { |
90 | return (norm->id & V4L2_STD_625_50) ? 576 : 480; | 90 | return (norm->id & V4L2_STD_625_50) ? 576 : 480; |
@@ -220,7 +220,6 @@ struct cx88_subid { | |||
220 | #define RESOURCE_VBI 4 | 220 | #define RESOURCE_VBI 4 |
221 | 221 | ||
222 | #define BUFFER_TIMEOUT (HZ/2) /* 0.5 seconds */ | 222 | #define BUFFER_TIMEOUT (HZ/2) /* 0.5 seconds */ |
223 | //#define BUFFER_TIMEOUT (HZ*2) | ||
224 | 223 | ||
225 | /* buffer for one video frame */ | 224 | /* buffer for one video frame */ |
226 | struct cx88_buffer { | 225 | struct cx88_buffer { |
@@ -336,11 +335,6 @@ struct cx8800_dev { | |||
336 | struct pci_dev *pci; | 335 | struct pci_dev *pci; |
337 | unsigned char pci_rev,pci_lat; | 336 | unsigned char pci_rev,pci_lat; |
338 | 337 | ||
339 | #if 0 | ||
340 | /* video overlay */ | ||
341 | struct v4l2_framebuffer fbuf; | ||
342 | struct cx88_buffer *screen; | ||
343 | #endif | ||
344 | 338 | ||
345 | /* capture queues */ | 339 | /* capture queues */ |
346 | struct cx88_dmaqueue vidq; | 340 | struct cx88_dmaqueue vidq; |
@@ -435,8 +429,6 @@ struct cx8802_dev { | |||
435 | /* ----------------------------------------------------------- */ | 429 | /* ----------------------------------------------------------- */ |
436 | /* cx88-core.c */ | 430 | /* cx88-core.c */ |
437 | 431 | ||
438 | extern char *cx88_vid_irqs[32]; | ||
439 | extern char *cx88_mpeg_irqs[32]; | ||
440 | extern void cx88_print_irqbits(char *name, char *tag, char **strings, | 432 | extern void cx88_print_irqbits(char *name, char *tag, char **strings, |
441 | u32 bits, u32 mask); | 433 | u32 bits, u32 mask); |
442 | extern void cx88_print_ioctl(char *name, unsigned int cmd); | 434 | extern void cx88_print_ioctl(char *name, unsigned int cmd); |