diff options
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 24 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 18 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 18 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-i2c.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-oss.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 12 |
7 files changed, 48 insertions, 48 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 1bb5ed381..b14c73be5 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.74 2005/06/25 19:47:02 nsh Exp $ + * $Id: saa7134-cards.c,v 1.75 2005/06/28 23:41:47 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -49,7 +49,7 @@ struct saa7134_board saa7134_boards[] = { .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, - + .inputs = {{ .name = "default", .vmux = 0, @@ -64,7 +64,7 @@ struct saa7134_board saa7134_boards[] = { .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, - + .inputs = {{ .name = name_comp1, .vmux = 0, @@ -844,7 +844,7 @@ struct saa7134_board saa7134_boards[] = { }}, /* radio and probably mute is missing */ }, [SAA7134_BOARD_CRONOS_PLUS] = { - /* + /* gpio pins: 0 .. 3 BASE_ID 4 .. 7 PROTECT_ID @@ -951,7 +951,7 @@ struct saa7134_board saa7134_boards[] = { .vmux = 1, .amux = TV, .tv = 1, - + },{ .name = name_comp1, .vmux = 4, @@ -961,7 +961,7 @@ struct saa7134_board saa7134_boards[] = { .vmux = 6, .amux = LINE2, }}, - .radio = { + .radio = { .name = name_radio, .amux = LINE1, }, @@ -1350,7 +1350,7 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE2_LEFT, .tv = 1, .gpio = 0x00080, - }}, + }}, .radio = { .name = name_radio, .amux = LINE2, @@ -1450,7 +1450,7 @@ struct saa7134_board saa7134_boards[] = { } }, [SAA7134_BOARD_AVERMEDIA_STUDIO_307] = { - /* + /* Nickolay V. Shmyrev <nshmyrev@yandex.ru> Lots of thanks to Andrey Zolotarev <zolotarev_andrey@mail.ru> */ @@ -1824,7 +1824,7 @@ struct saa7134_board saa7134_boards[] = { }, [SAA7134_BOARD_ADS_INSTANT_TV] = { .name = "ADS Tech Instant TV (saa7135)", - .audio_clock = 0x00187de7, + .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TDA8290, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, @@ -1919,7 +1919,7 @@ struct saa7134_board saa7134_boards[] = { .name = name_mute, .amux = LINE1, }, - }, + }, [SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII] = { .name = "Compro VideoMate TV Gold+II", .audio_clock = 0x002187de7, @@ -1930,7 +1930,7 @@ struct saa7134_board saa7134_boards[] = { .gpiomask = 0x8c1880, .inputs = {{ .name = name_svideo, - .vmux = 0, + .vmux = 0, .amux = LINE1, .gpio = 0x800800, },{ @@ -1956,7 +1956,7 @@ struct saa7134_board saa7134_boards[] = { .gpio = 0x840000, }, }, - [SAA7134_BOARD_KWORLD_XPERT] = { + [SAA7134_BOARD_KWORLD_XPERT] = { /* FIXME: - Remote control doesn't initialize properly. diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 3f81aac46..8fed24e6a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.33 2005/06/20 22:06:52 mkrufky Exp $ + * $Id: saa7134-core.c,v 1.34 2005/06/28 23:41:47 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -999,7 +999,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, struct i2c_msg msg[] = {{.addr=0x50, .flags=0, .buf=&subaddr, .len = 1}, {.addr=0x50, .flags=I2C_M_RD, .buf=data, .len = 3}}; subaddr= 0x14; - tuner_t = 0; + tuner_t = 0; ret = i2c_transfer(&dev->i2c_adap, msg, 2); if (ret != 2) { printk(KERN_ERR "EEPROM read failure\n"); @@ -1015,12 +1015,12 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, dev->tuner_type = TUNER_PHILIPS_PAL; break; case 0x010C: - dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; + dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; break; default: printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t); - } - } else { + } + } else { if ((data[1] != 0) && (data[1] != 0xff)) { /* Hac: new config structure */ subaddr = data[1] + 1; @@ -1046,15 +1046,15 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, } } } - printk(KERN_INFO "%s Tuner type is %d\n", dev->name, dev->tuner_type); - saa7134_boards[SAA7134_BOARD_MD7134].tuner_type = dev->tuner_type; + printk(KERN_INFO "%s Tuner type is %d\n", dev->name, dev->tuner_type); + saa7134_boards[SAA7134_BOARD_MD7134].tuner_type = dev->tuner_type; if (dev->tuner_type == TUNER_PHILIPS_FMD1216ME_MK3) { dev->tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE; saa7134_boards[SAA7134_BOARD_MD7134].tda9887_conf = dev->tda9887_conf; saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG, &dev->tda9887_conf); } saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&dev->tuner_type); - } + } /* initialize hardware #2 */ saa7134_board_init2(dev); @@ -1063,7 +1063,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, /* load i2c helpers */ if (TUNER_ABSENT != dev->tuner_type) request_module("tuner"); - if (dev->tda9887_conf) + if (dev->tda9887_conf) request_module("tda9887"); if (card_is_empress(dev)) { request_module("saa6752hs"); diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 3bb6ff17e..16b1e82c6 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-dvb.c,v 1.16 2005/06/21 20:42:53 hhackmann Exp $ + * $Id: saa7134-dvb.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -358,11 +358,11 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_ } mode = 7; cp = 1; - + } /* calculate divisor */ /* ((36166000 + Finput) / 166666) rounded! */ - divider = (tuner_frequency + 83333) / 166667; + divider = (tuner_frequency + 83333) / 166667; /* setup tuner buffer */ tuner_buf[0] = (divider >> 8) & 0x7f; @@ -375,9 +375,9 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_ return 0; } - + static struct tda1004x_config medion_cardbus = { - .demod_address = 0x08, + .demod_address = 0x08, .invert = 1, .invert_oclk = 0, .xtal_freq = TDA10046_XTAL_16M, @@ -465,14 +465,14 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_ if(tda827x_dvbt[i + 1].lomax == 0) break; i++; - } + } N = ((tuner_freq + 125000) / 250000) << (tda827x_dvbt[i].spd + 2); tuner_buf[0] = 0; tuner_buf[1] = (N>>8) | 0x40; tuner_buf[2] = N & 0xff; tuner_buf[3] = 0; - tuner_buf[4] = 0x52; + tuner_buf[4] = 0x52; tuner_buf[5] = (tda827x_dvbt[i].spd << 6) + (tda827x_dvbt[i].div1p5 << 5) + (tda827x_dvbt[i].bs << 3) + tda827x_dvbt[i].bp; tuner_buf[6] = (tda827x_dvbt[i].gc3 << 4) + 0x8f; @@ -487,7 +487,7 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_ tuner_msg.len = 14; if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1) return -EIO; - + msleep(500); /* correct CP value */ tuner_buf[0] = 0x30; @@ -508,7 +508,7 @@ static void philips_tda827x_pll_sleep(struct dvb_frontend *fe) } static struct tda1004x_config tda827x_lifeview_config = { - .demod_address = 0x08, + .demod_address = 0x08, .invert = 1, .invert_oclk = 0, .xtal_freq = TDA10046_XTAL_16M, diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c index a7038361e..abb8a75fd 100644 --- a/linux/drivers/media/video/saa7134/saa7134-i2c.c +++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-i2c.c,v 1.13 2005/06/28 03:17:39 mchehab Exp $ + * $Id: saa7134-i2c.c,v 1.14 2005/06/28 23:41:47 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * i2c interface support @@ -347,7 +347,7 @@ static int attach_inform(struct i2c_client *client) tun_addr.type = saa7134_boards[dev->board].tuner_type; tun_addr.addr = saa7134_boards[dev->board].tuner_addr; - if (tun_addr.addr != ADDR_UNSET) + if (tun_addr.addr != ADDR_UNSET) saa7134_i2c_call_clients(dev,TUNER_SET_TYPE_ADDR,&tun_addr); else saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&tuner); diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c index 7d1a1961f..b5bede95d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-oss.c +++ b/linux/drivers/media/video/saa7134/saa7134-oss.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-oss.c,v 1.16 2005/06/14 19:12:45 hhackmann Exp $ + * $Id: saa7134-oss.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * oss dsp interface @@ -164,7 +164,7 @@ static int dsp_rec_start(struct saa7134_dev *dev) saa_writeb(SAA7134_NUM_SAMPLES1, ((dev->oss.blksize - 1) & 0x00ff00) >> 8); saa_writeb(SAA7134_NUM_SAMPLES2, ((dev->oss.blksize - 1) & 0xff0000) >> 16); saa_writeb(SAA7134_AUDIO_FORMAT_CTRL, fmt); - + break; case PCI_DEVICE_ID_PHILIPS_SAA7133: case PCI_DEVICE_ID_PHILIPS_SAA7135: @@ -577,7 +577,7 @@ mixer_recsrc_7133(struct saa7134_dev *dev) saa_dsp_writel(dev, 0x46c >> 2, 0xbbbb10); saa_dsp_writel(dev, 0x464 >> 2, xbarin); saa_writel(0x594 >> 2, anabar); - + return 0; } diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index 692190e25..b320e06f8 100644 --- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-tvaudio.c,v 1.29 2005/06/22 22:31:38 nsh Exp $ + * $Id: saa7134-tvaudio.c,v 1.30 2005/06/28 23:41:47 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * tv audio decoder (fm stereo, nicam, ...) @@ -220,7 +220,7 @@ static void mute_input_7134(struct saa7134_dev *dev) mute = (dev->ctl_mute || (dev->automute && (&card(dev).radio) != in)); if (card(dev).mute.name) { - /* + /* * 7130 - we'll mute using some unconnected audio input * 7134 - we'll probably should switch external mux with gpio */ @@ -259,7 +259,7 @@ static void mute_input_7134(struct saa7134_dev *dev) saa_andorb(SAA7134_SIF_SAMPLE_FREQ, 0x03, 0x00); else saa_andorb(SAA7134_SIF_SAMPLE_FREQ, 0x03, 0x01); - + /* switch gpio-connected external audio mux */ if (0 == card(dev).gpiomask) return; @@ -451,9 +451,9 @@ static int tvaudio_getstereo(struct saa7134_dev *dev, struct saa7134_tvaudio *au if (nicam & 0x1) { nicam_status = saa_readb(SAA7134_NICAM_STATUS); dprintk("getstereo: nicam_status=0x%x\n", nicam_status); - + switch (nicam_status & 0x03) { - case 0x01: + case 0x01: retval = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2; break; case 0x02: @@ -807,9 +807,9 @@ static int mute_input_7133(struct saa7134_dev *dev) if (card(dev).mute.name && dev->ctl_mute) in = &card(dev).mute; - else + else in = dev->input; - + saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, mask, mask); saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio); saa7134_track_gpio(dev,in->name); diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index d9ee6cb02..9a1d0a13e 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-video.c,v 1.35 2005/06/16 21:20:44 hhackmann Exp $ + * $Id: saa7134-video.c,v 1.36 2005/06/28 23:41:47 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * video4linux video interface @@ -280,7 +280,7 @@ static struct saa7134_tvnorm tvnorms[] = { .vbi_v_stop_0 = 21, .vbi_v_start_1 = 273, .src_timing = 7, - + .sync_control = 0x18, .luma_control = 0x40, .chroma_ctrl1 = 0x81, @@ -1219,7 +1219,7 @@ static int video_open(struct inode *inode, struct file *file) } if (NULL == dev) return -ENODEV; - + dprintk("open minor=%d radio=%d type=%s\n",minor,radio, v4l2_type_names[type]); @@ -1377,7 +1377,7 @@ static int video_release(struct inode *inode, struct file *file) ret = i2c_transfer(&dev->i2c_adap, &msg, 1); if (ret != 1) printk(KERN_ERR "TDA8290 access failure\n"); - msg.addr = I2C_ADDR_TDA8275; + msg.addr = I2C_ADDR_TDA8275; data[0] = 0x30; data[1] = 0xd0; ret = i2c_transfer(&dev->i2c_adap, &msg, 1); @@ -1391,7 +1391,7 @@ static int video_release(struct inode *inode, struct file *file) data[1] = 0x02; i2c_transfer(&dev->i2c_adap, &msg, 1); } - + /* free stuff */ videobuf_mmap_free(&fh->cap); videobuf_mmap_free(&fh->vbi); @@ -2160,7 +2160,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, if (0 != t->index) return -EINVAL; - + saa7134_i2c_call_clients(dev,VIDIOC_S_TUNER,t); return 0; |