Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 45074
b: refs/heads/master
c: 38284ba
h: refs/heads/master
v: v3
  • Loading branch information
Thierry MERLE authored and Mauro Carvalho Chehab committed Dec 27, 2006
1 parent d0ddbb8 commit 0ed4329
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 49 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: 3a4456a073150c8b0d790daa007d2aab9ebdecb5
refs/heads/master: 38284ba361d69eca34a3bfc553ebfac81fea2698
48 changes: 12 additions & 36 deletions trunk/drivers/media/video/usbvision/usbvision-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ static void scratch_reset(struct usb_usbvision *usbvision)

int usbvision_scratch_alloc(struct usb_usbvision *usbvision)
{
usbvision->scratch = vmalloc(scratch_buf_size);
usbvision->scratch = vmalloc_32(scratch_buf_size);
scratch_reset(usbvision);
if(usbvision->scratch == NULL) {
err("%s: unable to allocate %d bytes for scratch",
Expand Down Expand Up @@ -485,7 +485,7 @@ static void usbvision_testpattern(struct usb_usbvision *usbvision,
int usbvision_decompress_alloc(struct usb_usbvision *usbvision)
{
int IFB_size = MAX_FRAME_WIDTH * MAX_FRAME_HEIGHT * 3 / 2;
usbvision->IntraFrameBuffer = vmalloc(IFB_size);
usbvision->IntraFrameBuffer = vmalloc_32(IFB_size);
if (usbvision->IntraFrameBuffer == NULL) {
err("%s: unable to allocate %d for compr. frame buffer", __FUNCTION__, IFB_size);
return -ENOMEM;
Expand Down Expand Up @@ -2204,6 +2204,7 @@ int usbvision_power_on(struct usb_usbvision *usbvision)
usbvision_write_reg(usbvision, USBVISION_PWR_REG, USBVISION_SSPND_EN);
usbvision_write_reg(usbvision, USBVISION_PWR_REG,
USBVISION_SSPND_EN | USBVISION_RES2);

usbvision_write_reg(usbvision, USBVISION_PWR_REG,
USBVISION_SSPND_EN | USBVISION_PWR_VID);
errCode = usbvision_write_reg(usbvision, USBVISION_PWR_REG,
Expand Down Expand Up @@ -2351,40 +2352,6 @@ int usbvision_setup(struct usb_usbvision *usbvision,int format)
return USBVISION_IS_OPERATIONAL(usbvision);
}


int usbvision_sbuf_alloc(struct usb_usbvision *usbvision)
{
int i, errCode = 0;
const int sb_size = USBVISION_URB_FRAMES * USBVISION_MAX_ISOC_PACKET_SIZE;

/* Clean pointers so we know if we allocated something */
for (i = 0; i < USBVISION_NUMSBUF; i++)
usbvision->sbuf[i].data = NULL;

for (i = 0; i < USBVISION_NUMSBUF; i++) {
usbvision->sbuf[i].data = kzalloc(sb_size, GFP_KERNEL);
if (usbvision->sbuf[i].data == NULL) {
err("%s: unable to allocate %d bytes for sbuf", __FUNCTION__, sb_size);
errCode = -ENOMEM;
break;
}
}
return errCode;
}


void usbvision_sbuf_free(struct usb_usbvision *usbvision)
{
int i;

for (i = 0; i < USBVISION_NUMSBUF; i++) {
if (usbvision->sbuf[i].data != NULL) {
kfree(usbvision->sbuf[i].data);
usbvision->sbuf[i].data = NULL;
}
}
}

/*
* usbvision_init_isoc()
*
Expand All @@ -2393,6 +2360,7 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
{
struct usb_device *dev = usbvision->dev;
int bufIdx, errCode, regValue;
const int sb_size = USBVISION_URB_FRAMES * USBVISION_MAX_ISOC_PACKET_SIZE;

if (!USBVISION_IS_OPERATIONAL(usbvision))
return -EFAULT;
Expand Down Expand Up @@ -2428,6 +2396,7 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
return -ENOMEM;
}
usbvision->sbuf[bufIdx].urb = urb;
usbvision->sbuf[bufIdx].data = usb_buffer_alloc(usbvision->dev, sb_size, GFP_KERNEL,&urb->transfer_dma);
urb->dev = dev;
urb->context = usbvision;
urb->pipe = usb_rcvisocpipe(dev, usbvision->video_endp);
Expand Down Expand Up @@ -2469,13 +2438,20 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
void usbvision_stop_isoc(struct usb_usbvision *usbvision)
{
int bufIdx, errCode, regValue;
const int sb_size = USBVISION_URB_FRAMES * USBVISION_MAX_ISOC_PACKET_SIZE;

if ((usbvision->streaming == Stream_Off) || (usbvision->dev == NULL))
return;

/* Unschedule all of the iso td's */
for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) {
usb_kill_urb(usbvision->sbuf[bufIdx].urb);
if (usbvision->sbuf[bufIdx].data){
usb_buffer_free(usbvision->dev,
sb_size,
usbvision->sbuf[bufIdx].data,
usbvision->sbuf[bufIdx].urb->transfer_dma);
}
usb_free_urb(usbvision->sbuf[bufIdx].urb);
usbvision->sbuf[bufIdx].urb = NULL;
}
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/media/video/usbvision/usbvision-i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,9 @@ static int attach_inform(struct i2c_client *client)
case 0x4a:
PDEBUG(DBG_I2C,"attach_inform: saa7113 detected.");
break;
case 0x48:
PDEBUG(DBG_I2C,"attach_inform: saa7111 detected.");
break;
case 0xa0:
PDEBUG(DBG_I2C,"attach_inform: eeprom detected.");
break;
Expand Down
14 changes: 4 additions & 10 deletions trunk/drivers/media/video/usbvision/usbvision-video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,20 +353,15 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
if(!errCode) {
/* Allocate memory for the scratch ring buffer */
errCode = usbvision_scratch_alloc(usbvision);
if(!errCode) {
/* Allocate memory for the USB S buffers */
errCode = usbvision_sbuf_alloc(usbvision);
if ((!errCode) && (usbvision->isocMode==ISOC_MODE_COMPRESS)) {
/* Allocate intermediate decompression buffers only if needed */
errCode = usbvision_decompress_alloc(usbvision);
}
if ((!errCode) && (isocMode==ISOC_MODE_COMPRESS)) {
/* Allocate intermediate decompression buffers only if needed */
errCode = usbvision_decompress_alloc(usbvision);
}
}
if (errCode) {
/* Deallocate all buffers if trouble */
usbvision_frames_free(usbvision);
usbvision_scratch_free(usbvision);
usbvision_sbuf_free(usbvision);
usbvision_decompress_free(usbvision);
}
}
Expand Down Expand Up @@ -437,9 +432,8 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
usbvision_stop_isoc(usbvision);

usbvision_decompress_free(usbvision);
usbvision_rvfree(usbvision->fbuf, usbvision->fbuf_size);
usbvision_frames_free(usbvision);
usbvision_scratch_free(usbvision);
usbvision_sbuf_free(usbvision);

usbvision->user--;

Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/media/video/usbvision/usbvision.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,6 @@ int usbvision_frames_alloc(struct usb_usbvision *usbvision);
void usbvision_frames_free(struct usb_usbvision *usbvision);
int usbvision_scratch_alloc(struct usb_usbvision *usbvision);
void usbvision_scratch_free(struct usb_usbvision *usbvision);
int usbvision_sbuf_alloc(struct usb_usbvision *usbvision);
void usbvision_sbuf_free(struct usb_usbvision *usbvision);
int usbvision_decompress_alloc(struct usb_usbvision *usbvision);
void usbvision_decompress_free(struct usb_usbvision *usbvision);

Expand Down

0 comments on commit 0ed4329

Please sign in to comment.