aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/spca508.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/spca508.c')
-rw-r--r--drivers/media/video/gspca/spca508.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 2ccd877b998d..3b54f41d21c1 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -22,8 +22,8 @@
22 22
23#include "gspca.h" 23#include "gspca.h"
24 24
25#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 0) 25#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 4)
26static const char version[] = "2.1.0"; 26static const char version[] = "2.1.4";
27 27
28MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); 28MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
29MODULE_DESCRIPTION("GSPCA/SPCA508 USB Camera Driver"); 29MODULE_DESCRIPTION("GSPCA/SPCA508 USB Camera Driver");
@@ -92,7 +92,7 @@ static struct cam_mode sif_mode[] = {
92 * Initialization data: this is the first set-up data written to the 92 * Initialization data: this is the first set-up data written to the
93 * device (before the open data). 93 * device (before the open data).
94 */ 94 */
95static __u16 spca508_init_data[][3] = 95static const __u16 spca508_init_data[][3] =
96#define IGN(x) /* nothing */ 96#define IGN(x) /* nothing */
97{ 97{
98 /* line URB value, index */ 98 /* line URB value, index */
@@ -584,7 +584,7 @@ static __u16 spca508_init_data[][3] =
584/* 584/*
585 * Initialization data for Intel EasyPC Camera CS110 585 * Initialization data for Intel EasyPC Camera CS110
586 */ 586 */
587static __u16 spca508cs110_init_data[][3] = { 587static const __u16 spca508cs110_init_data[][3] = {
588 {0x0000, 0x870b}, /* Reset CTL3 */ 588 {0x0000, 0x870b}, /* Reset CTL3 */
589 {0x0003, 0x8111}, /* Soft Reset compression, memory, TG & CDSP */ 589 {0x0003, 0x8111}, /* Soft Reset compression, memory, TG & CDSP */
590 {0x0000, 0x8111}, /* Normal operation on reset */ 590 {0x0000, 0x8111}, /* Normal operation on reset */
@@ -668,7 +668,7 @@ static __u16 spca508cs110_init_data[][3] = {
668 {} 668 {}
669}; 669};
670 670
671static __u16 spca508_sightcam_init_data[][3] = { 671static const __u16 spca508_sightcam_init_data[][3] = {
672/* This line seems to setup the frame/canvas */ 672/* This line seems to setup the frame/canvas */
673 /*368 */ {0x000f, 0x8402}, 673 /*368 */ {0x000f, 0x8402},
674 674
@@ -752,7 +752,7 @@ static __u16 spca508_sightcam_init_data[][3] = {
752 {0, 0} 752 {0, 0}
753}; 753};
754 754
755static __u16 spca508_sightcam2_init_data[][3] = { 755static const __u16 spca508_sightcam2_init_data[][3] = {
756/* 35 */ {0x0020, 0x8112}, 756/* 35 */ {0x0020, 0x8112},
757 757
758/* 36 */ {0x000f, 0x8402}, 758/* 36 */ {0x000f, 0x8402},
@@ -1099,7 +1099,7 @@ static __u16 spca508_sightcam2_init_data[][3] = {
1099/* 1099/*
1100 * Initialization data for Creative Webcam Vista 1100 * Initialization data for Creative Webcam Vista
1101 */ 1101 */
1102static __u16 spca508_vista_init_data[][3] = { 1102static const __u16 spca508_vista_init_data[][3] = {
1103 {0x0008, 0x8200}, /* Clear register */ 1103 {0x0008, 0x8200}, /* Clear register */
1104 {0x0000, 0x870b}, /* Reset CTL3 */ 1104 {0x0000, 0x870b}, /* Reset CTL3 */
1105 {0x0020, 0x8112}, /* Video Drop packet enable */ 1105 {0x0020, 0x8112}, /* Video Drop packet enable */
@@ -1441,7 +1441,7 @@ static int reg_read(struct usb_device *dev,
1441} 1441}
1442 1442
1443static int write_vector(struct gspca_dev *gspca_dev, 1443static int write_vector(struct gspca_dev *gspca_dev,
1444 __u16 data[][3]) 1444 const __u16 data[][3])
1445{ 1445{
1446 struct usb_device *dev = gspca_dev->dev; 1446 struct usb_device *dev = gspca_dev->dev;
1447 int ret, i = 0; 1447 int ret, i = 0;
@@ -1639,7 +1639,7 @@ static void yuvy_decode(unsigned char *out,
1639 1639
1640static void sd_pkt_scan(struct gspca_dev *gspca_dev, 1640static void sd_pkt_scan(struct gspca_dev *gspca_dev,
1641 struct gspca_frame *frame, /* target */ 1641 struct gspca_frame *frame, /* target */
1642 unsigned char *data, /* isoc packet */ 1642 __u8 *data, /* isoc packet */
1643 int len) /* iso packet length */ 1643 int len) /* iso packet length */
1644{ 1644{
1645 struct sd *sd = (struct sd *) gspca_dev; 1645 struct sd *sd = (struct sd *) gspca_dev;
@@ -1717,7 +1717,7 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
1717} 1717}
1718 1718
1719/* sub-driver description */ 1719/* sub-driver description */
1720static struct sd_desc sd_desc = { 1720static const struct sd_desc sd_desc = {
1721 .name = MODULE_NAME, 1721 .name = MODULE_NAME,
1722 .ctrls = sd_ctrls, 1722 .ctrls = sd_ctrls,
1723 .nctrls = ARRAY_SIZE(sd_ctrls), 1723 .nctrls = ARRAY_SIZE(sd_ctrls),
@@ -1732,7 +1732,7 @@ static struct sd_desc sd_desc = {
1732 1732
1733/* -- module initialisation -- */ 1733/* -- module initialisation -- */
1734#define DVNM(name) .driver_info = (kernel_ulong_t) name 1734#define DVNM(name) .driver_info = (kernel_ulong_t) name
1735static __devinitdata struct usb_device_id device_table[] = { 1735static const __devinitdata struct usb_device_id device_table[] = {
1736 {USB_DEVICE(0x041e, 0x4018), DVNM("Creative Webcam Vista (PD1100)")}, 1736 {USB_DEVICE(0x041e, 0x4018), DVNM("Creative Webcam Vista (PD1100)")},
1737 {USB_DEVICE(0x0461, 0x0815), DVNM("Micro Innovation IC200")}, 1737 {USB_DEVICE(0x0461, 0x0815), DVNM("Micro Innovation IC200")},
1738 {USB_DEVICE(0x0733, 0x0110), DVNM("ViewQuest VQ110")}, 1738 {USB_DEVICE(0x0733, 0x0110), DVNM("ViewQuest VQ110")},