Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 428 → Rev 463

/shark/trunk/drivers/bttv/bttv-driver.c
43,9 → 43,9
unsigned int bttv_num; /* number of Bt848s in use */
struct bttv bttvs[BTTV_MAX];
 
unsigned int bttv_debug = 0;
unsigned int bttv_debug = 1;
unsigned int bttv_verbose = 1;
unsigned int bttv_gpio = 0;
unsigned int bttv_gpio = 1;
 
/* config variables */
#ifdef __BIG_ENDIAN
135,7 → 135,7
{
struct video_device *vfd = to_video_device(cd);
struct bttv *btv = dev_get_drvdata(vfd->dev);
return sprintf(buf, "%d\n", btv ? btv->type : UNSET);
return sprintf26(buf, "%d\n", btv ? btv->type : UNSET);
}
static CLASS_DEVICE_ATTR(card, S_IRUGO, show_card, NULL);
 
1478,7 → 1478,7
} else if (channel == btv->svhs) {
strcpy(v->name,"S-Video");
} else {
sprintf(v->name,"Composite%d",channel);
sprintf26(v->name,"Composite%d",channel);
}
return 0;
}
1605,13 → 1605,13
i->type = V4L2_INPUT_TYPE_CAMERA;
i->audioset = 1;
if (i->index == bttv_tvcards[btv->type].tuner) {
sprintf(i->name, "Television");
sprintf26(i->name, "Television");
i->type = V4L2_INPUT_TYPE_TUNER;
i->tuner = 0;
} else if (i->index == btv->svhs) {
sprintf(i->name, "S-Video");
sprintf26(i->name, "S-Video");
} else {
sprintf(i->name,"Composite%d",i->index);
sprintf26(i->name,"Composite%d",i->index);
}
if (i->index == btv->input) {
__u32 dstatus = btread(BT848_DSTATUS);
2466,7 → 2466,7
return -EINVAL;
strcpy(cap->driver,"bttv");
strlcpy(cap->card,btv->video_dev->name,sizeof(cap->card));
sprintf(cap->bus_info,"PCI:%s",pci_name(btv->dev));
sprintf26(cap->bus_info,"PCI:%s",pci_name(btv->dev));
cap->version = BTTV_VERSION_CODE;
cap->capabilities =
V4L2_CAP_VIDEO_CAPTURE |
3452,7 → 3452,7
vfd->minor = -1;
vfd->dev = &btv->dev->dev;
vfd->release = video_device_release;
snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)",
snprintf26(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)",
btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "",
type, bttv_tvcards[btv->type].name);
return vfd;
3551,7 → 3551,7
btv=&bttvs[bttv_num];
memset(btv,0,sizeof(*btv));
btv->nr = bttv_num;
sprintf(btv->name,"bttv%d",btv->nr);
sprintf26(btv->name,"bttv%d",btv->nr);
 
/* initialize structs / fill in defaults */
init_MUTEX(&btv->lock);
3770,7 → 3770,7
.remove = __devexit_p(bttv_remove),
};
 
static int bttv_init_module(void)
int bttv_init_module(void)
{
int rc;
bttv_num = 0;