lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (9857): gspca: Use smaller chunks for urb buffer in ov534.

Browse Source 
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antonio Ospite
2008-12-03 16:21:08 -03:00
committed by Mauro Carvalho Chehab
parent 9e1e7b068d
commit 442a43f50f
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/media/video/gspca/ov534.c
View File

@@ -346,7 +346,14 @@ static int sd_config(struct gspca_dev *gspca_dev,
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
cam->nmodes = ARRAY_SIZE(vga_mode); cam->nmodes = ARRAY_SIZE(vga_mode);
cam->bulk_size = vga_mode[0].sizeimage; /*
* On some architectures we need contiguous memory for urb buffers, and
* in low memory situation 'sizeimage' can be too much.
* 16kiB chunks should be available even when we are low in memory.
* TODO: CHECK this description: is the problem arch-dependent or more
* general?
*/
cam->bulk_size = 16 * 1024;
cam->bulk_nurbs = 2; cam->bulk_nurbs = 2;
PDEBUG(D_PROBE, "bulk_size = %d", cam->bulk_size); PDEBUG(D_PROBE, "bulk_size = %d", cam->bulk_size);
@@ -395,15 +402,19 @@ static int sd_init(struct gspca_dev *gspca_dev)
static int sd_start(struct gspca_dev *gspca_dev) static int sd_start(struct gspca_dev *gspca_dev)
{ {
PDEBUG(D_PROBE, "width = %d, height = %d", struct gspca_frame *frame;
gspca_dev->width, gspca_dev->height);
gspca_dev->cam.bulk_size = gspca_dev->width * gspca_dev->height * 2;
/* start streaming data */ /* start streaming data */
ov534_set_led(gspca_dev->dev, 1); ov534_set_led(gspca_dev->dev, 1);
ov534_reg_write(gspca_dev->dev, 0xe0, 0x00); ov534_reg_write(gspca_dev->dev, 0xe0, 0x00);
frame = gspca_get_i_frame(gspca_dev);
if (frame == NULL) {
PDEBUG(D_ERR, "NULL frame!");
return -1;
}
gspca_frame_add(gspca_dev, FIRST_PACKET, frame, gspca_dev->usb_buf, 0);
return 0; return 0;
} }
@@ -421,18 +432,21 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, struct gspca_frame *frame,
* The current camera setup doesn't stream the last pixel, so we set it * The current camera setup doesn't stream the last pixel, so we set it
* to a dummy value * to a dummy value
*/ */
__u8 last_pixel[4] = { 0, 0, 0, 0 }; __u8 last[4] = { 0, 0, 0, 0 };
int framesize = gspca_dev->cam.bulk_size; int framesize = frame->v4l2_buf.length;
if (len == framesize - 4) { PDEBUG(D_PACK, "");
frame = PDEBUG(D_PACK, "** packet len = %d, framesize = %d", len, framesize);
gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len); PDEBUG(D_PACK, "** frame->data_end - frame->data + len = %d",
frame = frame->data_end - frame->data + len);
gspca_frame_add(gspca_dev, LAST_PACKET, frame, last_pixel,
4); if (frame->data_end - frame->data + len == framesize - 4) {
PDEBUG(D_PACK, " end of frame!");
gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, last, 4);
gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, 0);
} else } else
PDEBUG(D_PACK, "packet len = %d, framesize = %d", len, gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
framesize);
} }
/* sub-driver description */ /* sub-driver description */