1 files changed, 30 insertions, 134 deletions

diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index d8cd93866a4a..b608a27ad115 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -22,9 +22,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA508 USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -33,10 +30,6 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        int buflen;
-        unsigned char tmpbuf[352 * 288 * 3 / 2]; /* YUVY per line */
-        unsigned char tmpbuf2[352 * 288 * 2];   /* YUYV */
-
         unsigned char brightness;
 
         char subtype;
@@ -71,23 +64,23 @@ static struct ctrl sd_ctrls[] = {
 
 static struct v4l2_pix_format sif_mode[] = {
         {160, 120, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 160 * 2,
-                .sizeimage = 160 * 120 * 2,
+                .bytesperline = 160 * 3,
+                .sizeimage = 160 * 120 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 3},
         {176, 144, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 176 * 2,
-                .sizeimage = 176 * 144 * 2,
+                .bytesperline = 176 * 3,
+                .sizeimage = 176 * 144 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 2},
         {320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 320 * 2,
-                .sizeimage = 320 * 240 * 2,
+                .bytesperline = 320 * 3,
+                .sizeimage = 320 * 240 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 1},
         {352, 288, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
-                .bytesperline = 352 * 2,
-                .sizeimage = 352 * 288 * 2,
+                .bytesperline = 352 * 3,
+                .sizeimage = 352 * 288 * 3 / 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 0},
 };
@@ -1476,58 +1469,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        __u16 product;
         int data1, data2;
 
-        product = id->idProduct;
-        switch (id->idVendor) {
-        case 0x0130:            /* Clone webcam */
-/*              switch (product) { */
-/*              case 0x0130: */
-                        sd->subtype = HamaUSBSightcam;  /* same as Hama 0010 */
-/*                      break; */
-/*              } */
-                break;
-        case 0x041e:            /* Creative cameras */
-/*              switch (product) { */
-/*              case 0x4018: */
-                        sd->subtype = CreativeVista;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0461:            /* MicroInnovation */
-/*              switch (product) { */
-/*              case 0x0815: */
-                        sd->subtype = MicroInnovationIC200;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0733:    /* Rebadged ViewQuest (Intel) and ViewQuest cameras */
-/*              switch (product) { */
-/*              case 0x110: */
-                        sd->subtype = ViewQuestVQ110;
-/*                      break; */
-/*              } */
-                break;
-        case 0x0af9:            /* Hama cameras */
-                switch (product) {
-                case 0x0010:
-                        sd->subtype = HamaUSBSightcam;
-                        break;
-                case 0x0011:
-                        sd->subtype = HamaUSBSightcam2;
-                        break;
-                }
-                break;
-        case 0x8086:            /* Intel */
-/*              switch (product) { */
-/*              case 0x0110: */
-                        sd->subtype = IntelEasyPCCamera;
-/*                      break; */
-/*              } */
-                break;
-        }
-
         /* Read from global register the USB product and vendor IDs, just to
          * prove that we can communicate with the device.  This works, which
          * confirms at we are communicating properly and that the device
@@ -1544,10 +1487,11 @@ static int sd_config(struct gspca_dev *gspca_dev,
         PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1);
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         cam->cam_mode = sif_mode;
         cam->nmodes = ARRAY_SIZE(sif_mode);
+
+        sd->subtype = id->driver_info;
         sd->brightness = BRIGHTNESS_DEF;
 
         switch (sd->subtype) {
@@ -1619,77 +1563,30 @@ static void sd_close(struct gspca_dev *gspca_dev)
 {
 }
 
-/* convert YUVY per line to YUYV (YUV 4:2:2) */
-static void yuvy_decode(unsigned char *out,
-                        unsigned char *in,
-                        int width,
-                        int height)
-{
-        unsigned char *Ui, *Vi, *yi, *yi1;
-        unsigned char *out1;
-        int i, j;
-
-        yi = in;
-        for (i = height / 2; --i >= 0; ) {
-                out1 = out + width * 2;         /* next line */
-                Ui = yi + width;
-                Vi = Ui + width / 2;
-                yi1 = Vi + width / 2;
-                for (j = width / 2; --j >= 0; ) {
-                        *out++ = 128 + *yi++;
-                        *out++ = 128 + *Ui;
-                        *out++ = 128 + *yi++;
-                        *out++ = 128 + *Vi;
-
-                        *out1++ = 128 + *yi1++;
-                        *out1++ = 128 + *Ui++;
-                        *out1++ = 128 + *yi1++;
-                        *out1++ = 128 + *Vi++;
-                }
-                yi += width * 2;
-                out = out1;
-        }
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
                         int len)                        /* iso packet length */
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         switch (data[0]) {
         case 0:                         /* start of frame */
-                if (gspca_dev->last_packet_type == FIRST_PACKET) {
-                        yuvy_decode(sd->tmpbuf2, sd->tmpbuf,
-                                        gspca_dev->width,
-                                        gspca_dev->height);
-                        frame = gspca_frame_add(gspca_dev,
-                                                LAST_PACKET,
-                                                frame,
-                                                sd->tmpbuf2,
-                                                gspca_dev->width
-                                                        * gspca_dev->height
-                                                        * 2);
-                }
-                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
-                                data, 0);
+                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
+                                        data, 0);
                 data += SPCA508_OFFSET_DATA;
                 len -= SPCA508_OFFSET_DATA;
-                if (len > 0)
-                        memcpy(sd->tmpbuf, data, len);
-                else
-                        len = 0;
-                sd->buflen = len;
-                return;
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                                data, len);
+                break;
         case 0xff:                      /* drop */
 /*              gspca_dev->last_packet_type = DISCARD_PACKET; */
-                return;
+                break;
+        default:
+                data += 1;
+                len -= 1;
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                                data, len);
+                break;
         }
-        data += 1;
-        len -= 1;
-        memcpy(&sd->tmpbuf[sd->buflen], data, len);
-        sd->buflen += len;
 }
 
 static void setbrightness(struct gspca_dev *gspca_dev)
@@ -1745,15 +1642,14 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
 static const __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x0130, 0x0130), DVNM("Clone Digital Webcam 11043")},
-        {USB_DEVICE(0x041e, 0x4018), DVNM("Creative Webcam Vista (PD1100)")},
-        {USB_DEVICE(0x0461, 0x0815), DVNM("Micro Innovation IC200")},
-        {USB_DEVICE(0x0733, 0x0110), DVNM("ViewQuest VQ110")},
-        {USB_DEVICE(0x0af9, 0x0010), DVNM("Hama USB Sightcam 100")},
-        {USB_DEVICE(0x0af9, 0x0011), DVNM("Hama USB Sightcam 100")},
-        {USB_DEVICE(0x8086, 0x0110), DVNM("Intel Easy PC Camera")},
+        {USB_DEVICE(0x0130, 0x0130), .driver_info = HamaUSBSightcam},
+        {USB_DEVICE(0x041e, 0x4018), .driver_info = CreativeVista},
+        {USB_DEVICE(0x0461, 0x0815), .driver_info = MicroInnovationIC200},
+        {USB_DEVICE(0x0733, 0x0110), .driver_info = ViewQuestVQ110},
+        {USB_DEVICE(0x0af9, 0x0010), .driver_info = HamaUSBSightcam},
+        {USB_DEVICE(0x0af9, 0x0011), .driver_info = HamaUSBSightcam2},
+        {USB_DEVICE(0x8086, 0x0110), .driver_info = IntelEasyPCCamera},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1778,7 +1674,7 @@ static int __init sd_mod_init(void)
 {
         if (usb_register(&sd_driver) < 0)
                 return -1;
-        PDEBUG(D_PROBE, "v%s registered", version);
+        PDEBUG(D_PROBE, "registered");
         return 0;
 }
 static void __exit sd_mod_exit(void)