aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/usbvision/usbvision-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-12-04 08:31:01 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 09:05:41 -0200
commit6714b01263b06b2e7d054625486451a9fd8e03f4 (patch)
tree7aa5cc3e56dab3ec15aeac46b7b4b154ead095c0 /drivers/media/video/usbvision/usbvision-core.c
parent781aa1d1ab7ba13314af0af6c5d70c0eb0e96bf4 (diff)
V4L/DVB (4923): Splitted usbvision cards from usbvison.h
Having the cards description into a separated file makes easier to maintain and follows the same standard as other drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-core.c')
-rw-r--r--drivers/media/video/usbvision/usbvision-core.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 62699ca020a..a23fcd15a1d 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -339,12 +339,10 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/spinlock.h>
-#include <linux/usb.h>
#include <asm/io.h>
#include <linux/videodev2.h>
#include <linux/video_decoder.h>
#include <linux/i2c.h>
-#include "usbvision-i2c.h"
#define USBVISION_DRIVER_VERSION_MAJOR 0
#define USBVISION_DRIVER_VERSION_MINOR 8
@@ -428,6 +426,18 @@ enum {
ISOC_MODE_COMPRESS = 0x60,
};
+static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = {
+ { 1, 1, 8, V4L2_PIX_FMT_GREY , "GREY" },
+ { 1, 2, 16, V4L2_PIX_FMT_RGB565 , "RGB565" },
+ { 1, 3, 24, V4L2_PIX_FMT_RGB24 , "RGB24" },
+ { 1, 4, 32, V4L2_PIX_FMT_RGB32 , "RGB32" },
+ { 1, 2, 16, V4L2_PIX_FMT_RGB555 , "RGB555" },
+ { 1, 2, 16, V4L2_PIX_FMT_YUYV , "YUV422" },
+ { 1, 2, 12, V4L2_PIX_FMT_YVU420 , "YUV420P" }, // 1.5 !
+ { 1, 2, 16, V4L2_PIX_FMT_YUV422P , "YUV422P" }
+};
+
+
/*
* The value of 'scratch_buf_size' affects quality of the picture
* in many ways. Shorter buffers may cause loss of data when client
@@ -5691,8 +5701,6 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
}
-MODULE_DEVICE_TABLE (usb, usbvision_table);
-
static struct usb_driver usbvision_driver = {
.name = "usbvision",
.id_table = usbvision_table,