patch-2.4.23 linux-2.4.23/drivers/media/video/bttv-driver.c
Next file: linux-2.4.23/drivers/media/video/bttv-if.c
Previous file: linux-2.4.23/drivers/media/video/bttv-cards.c
Back to the patch index
Back to the overall index
- Lines: 60
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/media/video/bttv-driver.c
- Orig date:
2003-08-25 04:44:42.000000000 -0700
diff -urN linux-2.4.22/drivers/media/video/bttv-driver.c linux-2.4.23/drivers/media/video/bttv-driver.c
@@ -400,13 +400,10 @@
#endif
input %= bttv_tvcards[btv->type].video_inputs;
- if (input==bttv_tvcards[btv->type].svhs)
- {
+ if (input == btv->svhs) {
btor(BT848_CONTROL_COMP, BT848_E_CONTROL);
btor(BT848_CONTROL_COMP, BT848_O_CONTROL);
- }
- else
- {
+ } else {
btand(~BT848_CONTROL_COMP, BT848_E_CONTROL);
btand(~BT848_CONTROL_COMP, BT848_O_CONTROL);
}
@@ -1668,7 +1665,7 @@
v.type=VIDEO_TYPE_TV;
v.tuners=1;
}
- else if (channel==bttv_tvcards[btv->type].svhs)
+ else if (channel == btv->svhs)
strcpy(v.name,"S-Video");
else if (bttv_tvcards[btv->type].muxsel[v.channel] < 0)
strcpy(v.name,"Digital Video");
@@ -2200,7 +2197,7 @@
static struct video_device bttv_template=
{
.owner = THIS_MODULE,
- .name = "UNSET",
+ .name = "bttv video",
.type = VID_TYPE_TUNER|VID_TYPE_CAPTURE|VID_TYPE_OVERLAY|VID_TYPE_TELETEXT,
.hardware = VID_HARDWARE_BT848,
.open = bttv_open,
@@ -2369,7 +2366,6 @@
static int radio_open(struct video_device *dev, int flags)
{
struct bttv *btv = (struct bttv *)(dev-1);
- unsigned long v;
down(&btv->lock);
if (btv->user)
@@ -2377,8 +2373,6 @@
btv->user++;
btv->radio = 1;
- v = 400*16;
- bttv_call_i2c_clients(btv,VIDIOCSFREQ,&v);
bttv_call_i2c_clients(btv,AUDC_SET_RADIO,&btv->tuner_type);
bt848_muxsel(btv,0);
up(&btv->lock);
@@ -3153,7 +3147,7 @@
return result;
}
-static struct pci_device_id bttv_pci_tbl[] __devinitdata = {
+static struct pci_device_id bttv_pci_tbl[] = {
{PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849,
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)