diff options
Diffstat (limited to 'drivers/media/video/pwc/pwc-misc.c')
-rw-r--r-- | drivers/media/video/pwc/pwc-misc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/video/pwc/pwc-misc.c b/drivers/media/video/pwc/pwc-misc.c index b7a4bd3524c7..58fe79747992 100644 --- a/drivers/media/video/pwc/pwc-misc.c +++ b/drivers/media/video/pwc/pwc-misc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* Linux driver for Philips webcam | 1 | /* Linux driver for Philips webcam |
2 | Various miscellaneous functions and tables. | 2 | Various miscellaneous functions and tables. |
3 | (C) 1999-2003 Nemosoft Unv. | 3 | (C) 1999-2003 Nemosoft Unv. |
4 | (C) 2004 Luc Saillard (luc@saillard.org) | 4 | (C) 2004 Luc Saillard (luc@saillard.org) |
@@ -44,17 +44,17 @@ int pwc_decode_size(struct pwc_device *pdev, int width, int height) | |||
44 | int i, find; | 44 | int i, find; |
45 | 45 | ||
46 | /* Make sure we don't go beyond our max size. | 46 | /* Make sure we don't go beyond our max size. |
47 | NB: we have different limits for RAW and normal modes. In case | 47 | NB: we have different limits for RAW and normal modes. In case |
48 | you don't have the decompressor loaded or use RAW mode, | 48 | you don't have the decompressor loaded or use RAW mode, |
49 | the maximum viewable size is smaller. | 49 | the maximum viewable size is smaller. |
50 | */ | 50 | */ |
51 | if (pdev->vpalette == VIDEO_PALETTE_RAW) | 51 | if (pdev->vpalette == VIDEO_PALETTE_RAW) |
52 | { | 52 | { |
53 | if (width > pdev->abs_max.x || height > pdev->abs_max.y) | 53 | if (width > pdev->abs_max.x || height > pdev->abs_max.y) |
54 | { | 54 | { |
55 | Debug("VIDEO_PALETTE_RAW: going beyond abs_max.\n"); | 55 | Debug("VIDEO_PALETTE_RAW: going beyond abs_max.\n"); |
56 | return -1; | 56 | return -1; |
57 | } | 57 | } |
58 | } | 58 | } |
59 | else | 59 | else |
60 | { | 60 | { |
@@ -88,8 +88,8 @@ void pwc_construct(struct pwc_device *pdev) | |||
88 | pdev->view_min.y = 96; | 88 | pdev->view_min.y = 96; |
89 | pdev->view_max.x = 352; | 89 | pdev->view_max.x = 352; |
90 | pdev->view_max.y = 288; | 90 | pdev->view_max.y = 288; |
91 | pdev->abs_max.x = 352; | 91 | pdev->abs_max.x = 352; |
92 | pdev->abs_max.y = 288; | 92 | pdev->abs_max.y = 288; |
93 | pdev->image_mask = 1 << PSZ_SQCIF | 1 << PSZ_QCIF | 1 << PSZ_CIF; | 93 | pdev->image_mask = 1 << PSZ_SQCIF | 1 << PSZ_QCIF | 1 << PSZ_CIF; |
94 | pdev->vcinterface = 2; | 94 | pdev->vcinterface = 2; |
95 | pdev->vendpoint = 4; | 95 | pdev->vendpoint = 4; |
@@ -105,8 +105,8 @@ void pwc_construct(struct pwc_device *pdev) | |||
105 | pdev->view_max.x = 640; | 105 | pdev->view_max.x = 640; |
106 | pdev->view_max.y = 480; | 106 | pdev->view_max.y = 480; |
107 | pdev->image_mask = 1 << PSZ_SQCIF | 1 << PSZ_QSIF | 1 << PSZ_QCIF | 1 << PSZ_SIF | 1 << PSZ_CIF | 1 << PSZ_VGA; | 107 | pdev->image_mask = 1 << PSZ_SQCIF | 1 << PSZ_QSIF | 1 << PSZ_QCIF | 1 << PSZ_SIF | 1 << PSZ_CIF | 1 << PSZ_VGA; |
108 | pdev->abs_max.x = 640; | 108 | pdev->abs_max.x = 640; |
109 | pdev->abs_max.y = 480; | 109 | pdev->abs_max.y = 480; |
110 | pdev->vcinterface = 3; | 110 | pdev->vcinterface = 3; |
111 | pdev->vendpoint = 4; | 111 | pdev->vendpoint = 4; |
112 | pdev->frame_header_size = 0; | 112 | pdev->frame_header_size = 0; |
@@ -121,8 +121,8 @@ void pwc_construct(struct pwc_device *pdev) | |||
121 | pdev->view_max.x = 640; | 121 | pdev->view_max.x = 640; |
122 | pdev->view_max.y = 480; | 122 | pdev->view_max.y = 480; |
123 | pdev->image_mask = 1 << PSZ_QSIF | 1 << PSZ_SIF | 1 << PSZ_VGA; | 123 | pdev->image_mask = 1 << PSZ_QSIF | 1 << PSZ_SIF | 1 << PSZ_VGA; |
124 | pdev->abs_max.x = 640; | 124 | pdev->abs_max.x = 640; |
125 | pdev->abs_max.y = 480; | 125 | pdev->abs_max.y = 480; |
126 | pdev->vcinterface = 3; | 126 | pdev->vcinterface = 3; |
127 | pdev->vendpoint = 5; | 127 | pdev->vendpoint = 5; |
128 | pdev->frame_header_size = TOUCAM_HEADER_SIZE; | 128 | pdev->frame_header_size = TOUCAM_HEADER_SIZE; |