Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits)
  V4L/DVB (4210b): git-dvb: tea575x-tuner build fix
  V4L/DVB (4210a): git-dvb versus matroxfb
  V4L/DVB (4209): Added some BTTV PCI IDs for newer boards
  Fixes some sync issues between V4L/DVB development and GIT
  V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
  V4L/DVB (4205): Merge tda9887 module into tuner.
  V4L/DVB (4203): Explicitly set the enum values.
  V4L/DVB (4202): allow selecting CX2341x port mode
  V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1.
  V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c
  V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API
  V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs
  V4L/DVB (4196): Port cx88-blackbird to the new MPEG API.
  V4L/DVB (4193): Update cx2341x fw encoding API doc.
  V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400.
  V4L/DVB (4191): Add CX2341X MPEG encoder module.
  V4L/DVB (4190): Add helper functions for control processing to v4l2-common.
  V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.
  V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h
  V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
  ...

1 files changed, 30 insertions, 37 deletions

diff --git a/drivers/media/video/pwc/pwc-misc.c b/drivers/media/video/pwc/pwc-misc.c
index 58fe79747992..589c687439da 100644
--- a/drivers/media/video/pwc/pwc-misc.c
+++ b/drivers/media/video/pwc/pwc-misc.c
@@ -1,7 +1,7 @@
 /* Linux driver for Philips webcam
    Various miscellaneous functions and tables.
    (C) 1999-2003 Nemosoft Unv.
-   (C) 2004      Luc Saillard (luc@saillard.org)
+   (C) 2004-2006 Luc Saillard (luc@saillard.org)
 
    NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
    driver and thus may have bugs that are not present in the original version.
@@ -24,18 +24,17 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <linux/slab.h>
 
 #include "pwc.h"
 
-struct pwc_coord pwc_image_sizes[PSZ_MAX] =
+const struct pwc_coord pwc_image_sizes[PSZ_MAX] =
 {
-        { 128,  96, 0 },
-        { 160, 120, 0 },
-        { 176, 144, 0 },
-        { 320, 240, 0 },
-        { 352, 288, 0 },
-        { 640, 480, 0 },
+        { 128,  96, 0 }, /* sqcif */
+        { 160, 120, 0 }, /* qsif */
+        { 176, 144, 0 }, /* qcif */
+        { 320, 240, 0 }, /* sif */
+        { 352, 288, 0 }, /* cif */
+        { 640, 480, 0 }, /* vga */
 };
 
 /* x,y -> PSZ_ */
@@ -52,7 +51,7 @@ int pwc_decode_size(struct pwc_device *pdev, int width, int height)
         {
                 if (width > pdev->abs_max.x || height > pdev->abs_max.y)
                 {
-                        Debug("VIDEO_PALETTE_RAW: going beyond abs_max.\n");
+                        PWC_DEBUG_SIZE("VIDEO_PALETTE_RAW: going beyond abs_max.\n");
                         return -1;
                 }
         }
@@ -60,7 +59,7 @@ int pwc_decode_size(struct pwc_device *pdev, int width, int height)
         {
                 if (width > pdev->view_max.x || height > pdev->view_max.y)
                 {
-                        Debug("VIDEO_PALETTE_ not RAW: going beyond view_max.\n");
+                        PWC_DEBUG_SIZE("VIDEO_PALETTE_not RAW: going beyond view_max.\n");
                         return -1;
                 }
         }
@@ -81,9 +80,8 @@ int pwc_decode_size(struct pwc_device *pdev, int width, int height)
 /* initialize variables depending on type and decompressor*/
 void pwc_construct(struct pwc_device *pdev)
 {
-        switch(pdev->type) {
-        case 645:
-        case 646:
+        if (DEVICE_USE_CODEC1(pdev->type)) {
+
                 pdev->view_min.x = 128;
                 pdev->view_min.y =  96;
                 pdev->view_max.x = 352;
@@ -95,10 +93,23 @@ void pwc_construct(struct pwc_device *pdev)
                 pdev->vendpoint = 4;
                 pdev->frame_header_size = 0;
                 pdev->frame_trailer_size = 0;
-                break;
-        case 675:
-        case 680:
-        case 690:
+
+        } else if (DEVICE_USE_CODEC3(pdev->type)) {
+
+                pdev->view_min.x = 160;
+                pdev->view_min.y = 120;
+                pdev->view_max.x = 640;
+                pdev->view_max.y = 480;
+                pdev->image_mask = 1 << PSZ_QSIF | 1 << PSZ_SIF | 1 << PSZ_VGA;
+                pdev->abs_max.x = 640;
+                pdev->abs_max.y = 480;
+                pdev->vcinterface = 3;
+                pdev->vendpoint = 5;
+                pdev->frame_header_size = TOUCAM_HEADER_SIZE;
+                pdev->frame_trailer_size = TOUCAM_TRAILER_SIZE;
+
+        } else /* if (DEVICE_USE_CODEC2(pdev->type)) */ {
+
                 pdev->view_min.x = 128;
                 pdev->view_min.y =  96;
                 /* Anthill bug #38: PWC always reports max size, even without PWCX */
@@ -111,30 +122,12 @@ void pwc_construct(struct pwc_device *pdev)
                 pdev->vendpoint = 4;
                 pdev->frame_header_size = 0;
                 pdev->frame_trailer_size = 0;
-                break;
-        case 720:
-        case 730:
-        case 740:
-        case 750:
-                pdev->view_min.x = 160;
-                pdev->view_min.y = 120;
-                pdev->view_max.x = 640;
-                pdev->view_max.y = 480;
-                pdev->image_mask = 1 << PSZ_QSIF | 1 << PSZ_SIF | 1 << PSZ_VGA;
-                pdev->abs_max.x = 640;
-                pdev->abs_max.y = 480;
-                pdev->vcinterface = 3;
-                pdev->vendpoint = 5;
-                pdev->frame_header_size = TOUCAM_HEADER_SIZE;
-                pdev->frame_trailer_size = TOUCAM_TRAILER_SIZE;
-                break;
         }
-        Debug("type = %d\n",pdev->type);
         pdev->vpalette = VIDEO_PALETTE_YUV420P; /* default */
         pdev->view_min.size = pdev->view_min.x * pdev->view_min.y;
         pdev->view_max.size = pdev->view_max.x * pdev->view_max.y;
         /* length of image, in YUV format; always allocate enough memory. */
-        pdev->len_per_image = (pdev->abs_max.x * pdev->abs_max.y * 3) / 2;
+        pdev->len_per_image = PAGE_ALIGN((pdev->abs_max.x * pdev->abs_max.y * 3) / 2);
 }