Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 773 → Rev 774

/shark/trunk/drivers/cm7326/saa7146_video.c
843,7 → 843,7
DEB_EE(("VIDIOC_QUERYCAP\n"));
strcpy(cap->driver, "saa7146 v4l2");
strlcpy(cap->card, dev->ext->name, sizeof(cap->card));
strncpy(cap->card, dev->ext->name, sizeof(cap->card));
sprintf26(cap->bus_info,"PCI:%s",dev->pci->slot_name);
cap->version = SAA7146_VERSION_CODE;
cap->capabilities =
926,7 → 926,7
}
memset(f,0,sizeof(*f));
f->index = index;
strlcpy(f->description,formats[index].name,sizeof(f->description));
strncpy(f->description,formats[index].name,sizeof(f->description));
f->pixelformat = formats[index].pixelformat;
break;
}
1025,7 → 1025,7
return -EINVAL;
if( e->index < dev->ext_vv_data->num_stds ) {
DEB_EE(("VIDIOC_ENUMSTD: index:%d\n",e->index));
v4l2_video_std_construct(e, dev->ext_vv_data->stds[e->index].id, dev->ext_vv_data->stds[e->index].name);
//v4l2_video_std_construct(e, dev->ext_vv_data->stds[e->index].id, dev->ext_vv_data->stds[e->index].name);
return 0;
}
return -EINVAL;
1209,8 → 1209,7
return 0;
}
default:
return v4l_compat_translate_ioctl(inode,file,cmd,arg,
saa7146_video_do_ioctl);
return 0;//v4l_compat_translate_ioctl(inode,file,cmd,arg,saa7146_video_do_ioctl);
}
return 0;
}
1227,7 → 1226,7
buf->vb.state = STATE_ACTIVE;
saa7146_set_capture(dev,buf,next);
mod_timer(&vv->video_q.timeout, jiffies+BUFFER_TIMEOUT);
mod_timer(&vv->video_q.timeout, jiffies26+BUFFER_TIMEOUT);
return 0;
}
 
1401,7 → 1400,7
V4L2_FIELD_INTERLACED,
sizeof(struct saa7146_buf));
 
init_MUTEX(&fh->video_q.lock);
//init_MUTEX(&fh->video_q.lock);
 
return 0;
}