Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 124522
b: refs/heads/master
c: cc611b8
h: refs/heads/master
v: v3
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Dec 30, 2008
1 parent bc24954 commit 7e4b39d
Show file tree
Hide file tree
Showing 24 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c98834addfee3fdd42c505c37569261bf669d94
refs/heads/master: cc611b8aef7a8a9a2e614f1bdf3e2b8f066c8c8d
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/conex.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = 176 * 144 * 3 / 8 + 590,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/gspca/etoms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240,
Expand All @@ -125,7 +125,7 @@ static struct v4l2_pix_format vga_mode[] = {
.priv = 0}, */
};

static struct v4l2_pix_format sif_mode[] = {
static const struct v4l2_pix_format sif_mode[] = {
{176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = 176 * 144,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/finepix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ struct usb_fpix {
}

/* These cameras only support 320x200. */
static struct v4l2_pix_format fpix_mode[1] = {
static const struct v4l2_pix_format fpix_mode[1] = {
{ 320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/gspca.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extern int gspca_debug;
/* device information - set at probe time */
struct cam {
int bulk_size; /* buffer size when image transfer by bulk */
struct v4l2_pix_format *cam_mode; /* size nmodes */
const struct v4l2_pix_format *cam_mode; /* size nmodes */
char nmodes;
__u8 bulk_nurbs; /* number of URBs in bulk mode
* - cannot be > MAX_NURBS
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/mars.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct sd {
static struct ctrl sd_ctrls[] = {
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 589,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/gspca/ov519.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
Expand All @@ -176,7 +176,7 @@ static struct v4l2_pix_format vga_mode[] = {
.colorspace = V4L2_COLORSPACE_JPEG,
.priv = 0},
};
static struct v4l2_pix_format sif_mode[] = {
static const struct v4l2_pix_format sif_mode[] = {
{176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = 176 * 144 * 3 / 8 + 590,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/ov534.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct sd {
static struct ctrl sd_ctrls[] = {
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{640, 480, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
.bytesperline = 640 * 2,
.sizeimage = 640 * 480 * 2,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/pac207.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format sif_mode[] = {
static const struct v4l2_pix_format sif_mode[] = {
{176, 144, V4L2_PIX_FMT_PAC207, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = (176 + 2) * 144,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/pac7311.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{160, 120, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120 * 3 / 8 + 590,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/gspca/sonixb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120,
Expand All @@ -249,7 +249,7 @@ static struct v4l2_pix_format vga_mode[] = {
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0},
};
static struct v4l2_pix_format sif_mode[] = {
static const struct v4l2_pix_format sif_mode[] = {
{160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/sonixj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ static __u32 ctrl_dis[] = {
/* SENSOR_OV7660 6 */
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120 * 4 / 8 + 590,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/gspca/spca500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
Expand All @@ -124,7 +124,7 @@ static struct v4l2_pix_format vga_mode[] = {
.priv = 0},
};

static struct v4l2_pix_format sif_mode[] = {
static const struct v4l2_pix_format sif_mode[] = {
{176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = 176 * 144 * 3 / 8 + 590,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/spca501.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{160, 120, V4L2_PIX_FMT_SPCA501, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120 * 3 / 2,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/spca505.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120 * 3 / 2,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/spca506.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120 * 3 / 2,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/spca508.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format sif_mode[] = {
static const struct v4l2_pix_format sif_mode[] = {
{160, 120, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120 * 3 / 2,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/gspca/spca561.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ struct sd {
#define AG_CNT_START 13
};

static struct v4l2_pix_format sif_012a_mode[] = {
static const struct v4l2_pix_format sif_012a_mode[] = {
{160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120,
Expand All @@ -96,7 +96,7 @@ static struct v4l2_pix_format sif_012a_mode[] = {
.priv = 0},
};

static struct v4l2_pix_format sif_072a_mode[] = {
static const struct v4l2_pix_format sif_072a_mode[] = {
{160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/stk014.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/gspca/sunplus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
Expand All @@ -136,7 +136,7 @@ static struct v4l2_pix_format vga_mode[] = {
.priv = 1},
};

static struct v4l2_pix_format custom_mode[] = {
static const struct v4l2_pix_format custom_mode[] = {
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
Expand All @@ -149,7 +149,7 @@ static struct v4l2_pix_format custom_mode[] = {
.priv = 1},
};

static struct v4l2_pix_format vga_mode2[] = {
static const struct v4l2_pix_format vga_mode2[] = {
{176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = 176 * 144 * 3 / 8 + 590,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/t613.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ static char *effects_control[] = {
"Negative",
};

static struct v4l2_pix_format vga_mode_t16[] = {
static const struct v4l2_pix_format vga_mode_t16[] = {
{160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120 * 4 / 8 + 590,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/gspca/tv8532.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format sif_mode[] = {
static const struct v4l2_pix_format sif_mode[] = {
{176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = 176 * 144,
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/gspca/vc032x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vc0321_mode[] = {
static const struct v4l2_pix_format vc0321_mode[] = {
{320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 2,
Expand All @@ -138,7 +138,7 @@ static struct v4l2_pix_format vc0321_mode[] = {
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0},
};
static struct v4l2_pix_format vc0323_mode[] = {
static const struct v4l2_pix_format vc0323_mode[] = {
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
Expand All @@ -151,7 +151,7 @@ static struct v4l2_pix_format vc0323_mode[] = {
.priv = 0},
};

static struct v4l2_pix_format svga_mode[] = {
static const struct v4l2_pix_format svga_mode[] = {
{800, 600, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 800,
.sizeimage = 800 * 600 * 1 / 4 + 590,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/gspca/zc3xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static struct ctrl sd_ctrls[] = {
},
};

static struct v4l2_pix_format vga_mode[] = {
static const struct v4l2_pix_format vga_mode[] = {
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
Expand All @@ -186,7 +186,7 @@ static struct v4l2_pix_format vga_mode[] = {
.priv = 0},
};

static struct v4l2_pix_format sif_mode[] = {
static const struct v4l2_pix_format sif_mode[] = {
{176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = 176 * 144 * 3 / 8 + 590,
Expand Down

0 comments on commit 7e4b39d

Please sign in to comment.