diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-04 06:31:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-10 06:05:41 -0500 |
commit | 6714b01263b06b2e7d054625486451a9fd8e03f4 (patch) | |
tree | 7aa5cc3e56dab3ec15aeac46b7b4b154ead095c0 /drivers/media/video/usbvision/usbvision-core.c | |
parent | 781aa1d1ab7ba13314af0af6c5d70c0eb0e96bf4 (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.c | 16 |
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 62699ca020a1..a23fcd15a1d0 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c | |||
@@ -339,12 +339,10 @@ | |||
339 | #include <linux/module.h> | 339 | #include <linux/module.h> |
340 | #include <linux/init.h> | 340 | #include <linux/init.h> |
341 | #include <linux/spinlock.h> | 341 | #include <linux/spinlock.h> |
342 | #include <linux/usb.h> | ||
343 | #include <asm/io.h> | 342 | #include <asm/io.h> |
344 | #include <linux/videodev2.h> | 343 | #include <linux/videodev2.h> |
345 | #include <linux/video_decoder.h> | 344 | #include <linux/video_decoder.h> |
346 | #include <linux/i2c.h> | 345 | #include <linux/i2c.h> |
347 | #include "usbvision-i2c.h" | ||
348 | 346 | ||
349 | #define USBVISION_DRIVER_VERSION_MAJOR 0 | 347 | #define USBVISION_DRIVER_VERSION_MAJOR 0 |
350 | #define USBVISION_DRIVER_VERSION_MINOR 8 | 348 | #define USBVISION_DRIVER_VERSION_MINOR 8 |
@@ -428,6 +426,18 @@ enum { | |||
428 | ISOC_MODE_COMPRESS = 0x60, | 426 | ISOC_MODE_COMPRESS = 0x60, |
429 | }; | 427 | }; |
430 | 428 | ||
429 | static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = { | ||
430 | { 1, 1, 8, V4L2_PIX_FMT_GREY , "GREY" }, | ||
431 | { 1, 2, 16, V4L2_PIX_FMT_RGB565 , "RGB565" }, | ||
432 | { 1, 3, 24, V4L2_PIX_FMT_RGB24 , "RGB24" }, | ||
433 | { 1, 4, 32, V4L2_PIX_FMT_RGB32 , "RGB32" }, | ||
434 | { 1, 2, 16, V4L2_PIX_FMT_RGB555 , "RGB555" }, | ||
435 | { 1, 2, 16, V4L2_PIX_FMT_YUYV , "YUV422" }, | ||
436 | { 1, 2, 12, V4L2_PIX_FMT_YVU420 , "YUV420P" }, // 1.5 ! | ||
437 | { 1, 2, 16, V4L2_PIX_FMT_YUV422P , "YUV422P" } | ||
438 | }; | ||
439 | |||
440 | |||
431 | /* | 441 | /* |
432 | * The value of 'scratch_buf_size' affects quality of the picture | 442 | * The value of 'scratch_buf_size' affects quality of the picture |
433 | * in many ways. Shorter buffers may cause loss of data when client | 443 | * 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) | |||
5691 | 5701 | ||
5692 | } | 5702 | } |
5693 | 5703 | ||
5694 | MODULE_DEVICE_TABLE (usb, usbvision_table); | ||
5695 | |||
5696 | static struct usb_driver usbvision_driver = { | 5704 | static struct usb_driver usbvision_driver = { |
5697 | .name = "usbvision", | 5705 | .name = "usbvision", |
5698 | .id_table = usbvision_table, | 5706 | .id_table = usbvision_table, |