adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] v4l: 801: whitespaces cleanups

Browse source 
- Whitespaces Cleanups.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Mauro Carvalho Chehab 2005-11-08 21:37:45 -08:00 committed by Linus Torvalds
parent 4ac97914c6
commit f2421ca338
12 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/video4linux/lifeview.txt
View file

@ -28,9 +28,9 @@ saa7134:
/* GP17 Strap "GP7"=High */ /* GP17 Strap "GP7"=High */
/* GP16 Strap "GP6"=High /* GP16 Strap "GP6"=High
0=Radio 1=TV 0=Radio 1=TV
Drives SA630D ENCH1 and HEF4052 A1 pins Drives SA630D ENCH1 and HEF4052 A1 pins
to do FM radio through SIF input */ to do FM radio through SIF input */
/* GP15 nc */ /* GP15 nc */
/* GP14 nc */ /* GP14 nc */
/* GP13 nc */ /* GP13 nc */

4
drivers/media/video/bttv-cards.c
View file

@ -3585,7 +3585,7 @@ static void __devinit osprey_eeprom(struct bttv *btv)
for(i = 0; i<14; i++) checksum += ee[i+offset]; for(i = 0; i<14; i++) checksum += ee[i+offset];
checksum = ~checksum; /* no idea why */ checksum = ~checksum; /* no idea why */
if ((((checksum>>8)&0x0FF) == ee[offset+14]) && if ((((checksum>>8)&0x0FF) == ee[offset+14]) &&
((checksum & 0x0FF) == ee[offset+15])) { ((checksum & 0x0FF) == ee[offset+15])) {
break; break;
} }
} }
@ -4420,7 +4420,7 @@ windvr_audio(struct bttv *btv, struct video_audio *v, int set)
if (val) { if (val) {
gpio_bits(0x140000, val); gpio_bits(0x140000, val);
if (bttv_gpio) if (bttv_gpio)
bttv_gpio_tracking(btv,"windvr"); bttv_gpio_tracking(btv,"windvr");
} }
} else { } else {
v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO |

4
drivers/media/video/bttv-risc.c
View file

@ -88,9 +88,9 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
offset = 0; offset = 0;
sg++; sg++;
while (todo > sg_dma_len(sg)) { while (todo > sg_dma_len(sg)) {
*(rp++)=cpu_to_le32(BT848_RISC_WRITE| *(rp++)=cpu_to_le32(BT848_RISC_WRITE|
sg_dma_len(sg)); sg_dma_len(sg));
*(rp++)=cpu_to_le32(sg_dma_address(sg)); *(rp++)=cpu_to_le32(sg_dma_address(sg));
todo -= sg_dma_len(sg); todo -= sg_dma_len(sg);
sg++; sg++;
} }

4
drivers/media/video/cx88/cx88-core.c
View file

@ -166,9 +166,9 @@ static u32* cx88_risc_field(u32 *rp, struct scatterlist *sglist,
offset = 0; offset = 0;
sg++; sg++;
while (todo > sg_dma_len(sg)) { while (todo > sg_dma_len(sg)) {
*(rp++)=cpu_to_le32(RISC_WRITE| *(rp++)=cpu_to_le32(RISC_WRITE|
sg_dma_len(sg)); sg_dma_len(sg));
*(rp++)=cpu_to_le32(sg_dma_address(sg)); *(rp++)=cpu_to_le32(sg_dma_address(sg));
todo -= sg_dma_len(sg); todo -= sg_dma_len(sg);
sg++; sg++;
} }

2
drivers/media/video/cx88/cx88-dvb.c
View file

@ -128,7 +128,7 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe)
static u8 reset [] = { 0x50, 0x80 }; static u8 reset [] = { 0x50, 0x80 };
static u8 adc_ctl_1_cfg [] = { 0x8E, 0x40 }; static u8 adc_ctl_1_cfg [] = { 0x8E, 0x40 };
static u8 agc_cfg [] = { 0x67, 0x10, 0x23, 0x00, 0xFF, 0xFF, static u8 agc_cfg [] = { 0x67, 0x10, 0x23, 0x00, 0xFF, 0xFF,
0x00, 0xFF, 0x00, 0x40, 0x40 }; 0x00, 0xFF, 0x00, 0x40, 0x40 };
static u8 dntv_extra[] = { 0xB5, 0x7A }; static u8 dntv_extra[] = { 0xB5, 0x7A };
static u8 capt_range_cfg[] = { 0x75, 0x32 }; static u8 capt_range_cfg[] = { 0x75, 0x32 };

12
drivers/media/video/saa7134/saa7134-alsa.c
View file

@ -277,7 +277,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
BUG(); BUG();
videobuf_dma_init(&dev->oss.dma); videobuf_dma_init(&dev->oss.dma);
err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE, err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE,
(dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT); (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
if (0 != err) if (0 != err)
return err; return err;
return 0; return 0;
@ -336,9 +336,9 @@ static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream)
if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt))) if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt)))
goto fail1; goto fail1;
if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt, if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt,
dev->oss.dma.sglist, dev->oss.dma.sglist,
dev->oss.dma.sglen, dev->oss.dma.sglen,
0))) 0)))
goto fail2; goto fail2;
@ -481,8 +481,8 @@ static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t *
static snd_pcm_hardware_t snd_card_saa7134_capture = static snd_pcm_hardware_t snd_card_saa7134_capture =
{ {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP_VALID), SNDRV_PCM_INFO_MMAP_VALID),
.formats = USE_FORMATS, .formats = USE_FORMATS,
.rates = USE_RATE, .rates = USE_RATE,
.rate_min = USE_RATE_MIN, .rate_min = USE_RATE_MIN,

4
drivers/media/video/saa7134/saa7134-dvb.c
View file

@ -547,7 +547,7 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
u8 tuner_buf[14]; u8 tuner_buf[14];
struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf, struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,
.len = sizeof(tuner_buf) }; .len = sizeof(tuner_buf) };
int i, tuner_freq, if_freq; int i, tuner_freq, if_freq;
u32 N; u32 N;
switch (params->u.ofdm.bandwidth) { switch (params->u.ofdm.bandwidth) {
@ -606,7 +606,7 @@ static void philips_tda827x_pll_sleep(struct dvb_frontend *fe)
struct saa7134_dev *dev = fe->dvb->priv; struct saa7134_dev *dev = fe->dvb->priv;
static u8 tda827x_sleep[] = { 0x30, 0xd0}; static u8 tda827x_sleep[] = { 0x30, 0xd0};
struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep, struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep,
.len = sizeof(tda827x_sleep) }; .len = sizeof(tda827x_sleep) };
i2c_transfer(&dev->i2c_adap, &tuner_msg, 1); i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
} }

2
drivers/media/video/saa7134/saa7134-input.c
View file

@ -118,7 +118,7 @@ static IR_KEYTAB_TYPE eztv_codes[IR_KEYTAB_SIZE] = {
[ 1 ] = KEY_TV, // DVR [ 1 ] = KEY_TV, // DVR
[ 21 ] = KEY_DVD, // DVD [ 21 ] = KEY_DVD, // DVD
[ 23 ] = KEY_AUDIO, // music [ 23 ] = KEY_AUDIO, // music
// DVR mode / DVD mode / music mode // DVR mode / DVD mode / music mode
[ 27 ] = KEY_MUTE, // mute [ 27 ] = KEY_MUTE, // mute
[ 2 ] = KEY_LANGUAGE, // MTS/SAP / audio / autoseek [ 2 ] = KEY_LANGUAGE, // MTS/SAP / audio / autoseek

4
drivers/media/video/saa7134/saa7134-video.c
View file

@ -1345,8 +1345,8 @@ video_poll(struct file *file, struct poll_table_struct *wait)
return POLLERR; return POLLERR;
} }
if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field)) { if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field)) {
up(&fh->cap.lock); up(&fh->cap.lock);
return POLLERR; return POLLERR;
} }
fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf); fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf);
fh->cap.read_off = 0; fh->cap.read_off = 0;

8
drivers/media/video/tvaudio.c
View file

@ -1028,7 +1028,7 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
#define TEA6300_TR 0x03 /* treble */ #define TEA6300_TR 0x03 /* treble */
#define TEA6300_FA 0x04 /* fader control */ #define TEA6300_FA 0x04 /* fader control */
#define TEA6300_S 0x05 /* switch register */ #define TEA6300_S 0x05 /* switch register */
/* values for those registers: */ /* values for those registers: */
#define TEA6300_S_SA 0x01 /* stereo A input */ #define TEA6300_S_SA 0x01 /* stereo A input */
#define TEA6300_S_SB 0x02 /* stereo B */ #define TEA6300_S_SB 0x02 /* stereo B */
#define TEA6300_S_SC 0x04 /* stereo C */ #define TEA6300_S_SC 0x04 /* stereo C */
@ -1042,7 +1042,7 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
#define TEA6320_BA 0x05 /* bass (0-4) */ #define TEA6320_BA 0x05 /* bass (0-4) */
#define TEA6320_TR 0x06 /* treble (0-4) */ #define TEA6320_TR 0x06 /* treble (0-4) */
#define TEA6320_S 0x07 /* switch register */ #define TEA6320_S 0x07 /* switch register */
/* values for those registers: */ /* values for those registers: */
#define TEA6320_S_SA 0x07 /* stereo A input */ #define TEA6320_S_SA 0x07 /* stereo A input */
#define TEA6320_S_SB 0x06 /* stereo B */ #define TEA6320_S_SB 0x06 /* stereo B */
#define TEA6320_S_SC 0x05 /* stereo C */ #define TEA6320_S_SC 0x05 /* stereo C */
@ -1082,7 +1082,7 @@ static int tea6320_initialize(struct CHIPSTATE * chip)
#define TDA8425_BA 0x02 /* bass */ #define TDA8425_BA 0x02 /* bass */
#define TDA8425_TR 0x03 /* treble */ #define TDA8425_TR 0x03 /* treble */
#define TDA8425_S1 0x08 /* switch functions */ #define TDA8425_S1 0x08 /* switch functions */
/* values for those registers: */ /* values for those registers: */
#define TDA8425_S1_OFF 0xEE /* audio off (mute on) */ #define TDA8425_S1_OFF 0xEE /* audio off (mute on) */
#define TDA8425_S1_CH1 0xCE /* audio channel 1 (mute off) - "linear stereo" mode */ #define TDA8425_S1_CH1 0xCE /* audio channel 1 (mute off) - "linear stereo" mode */
#define TDA8425_S1_CH2 0xCF /* audio channel 2 (mute off) - "linear stereo" mode */ #define TDA8425_S1_CH2 0xCF /* audio channel 2 (mute off) - "linear stereo" mode */
@ -1148,7 +1148,7 @@ static void tda8425_setmode(struct CHIPSTATE *chip, int mode)
/* bit definition of the RESET register, I2C data. */ /* bit definition of the RESET register, I2C data. */
#define PIC16C54_MISC_RESET_REMOTE_CTL 0x01 /* bit 0, Reset to receive the key */ #define PIC16C54_MISC_RESET_REMOTE_CTL 0x01 /* bit 0, Reset to receive the key */
/* code of remote controller */ /* code of remote controller */
#define PIC16C54_MISC_MTS_MAIN 0x02 /* bit 1 */ #define PIC16C54_MISC_MTS_MAIN 0x02 /* bit 1 */
#define PIC16C54_MISC_MTS_SAP 0x04 /* bit 2 */ #define PIC16C54_MISC_MTS_SAP 0x04 /* bit 2 */
#define PIC16C54_MISC_MTS_BOTH 0x08 /* bit 3 */ #define PIC16C54_MISC_MTS_BOTH 0x08 /* bit 3 */

2
drivers/media/video/tveeprom.c
View file

@ -331,7 +331,7 @@ static int hasRadioTuner(int tunerType)
} }
void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
unsigned char *eeprom_data) unsigned char *eeprom_data)
{ {
/* ---------------------------------------------- /* ----------------------------------------------
** The hauppauge eeprom format is tagged ** The hauppauge eeprom format is tagged

10
include/linux/videodev2.h
View file

@ -393,7 +393,7 @@ struct v4l2_jpegcompression
#define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */ #define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */
#define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */ #define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */
#define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will #define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will
* allways use APP0 */ * allways use APP0 */
}; };
@ -849,8 +849,8 @@ struct v4l2_sliced_vbi_format
__u16 service_set; __u16 service_set;
/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
(equals frame lines 313-336 for 625 line video (equals frame lines 313-336 for 625 line video
standards, 263-286 for 525 line standards) */ standards, 263-286 for 525 line standards) */
__u16 service_lines[2][24]; __u16 service_lines[2][24];
__u32 io_size; __u32 io_size;
__u32 reserved[2]; /* must be zero */ __u32 reserved[2]; /* must be zero */
@ -869,8 +869,8 @@ struct v4l2_sliced_vbi_cap
__u16 service_set; __u16 service_set;
/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
(equals frame lines 313-336 for 625 line video (equals frame lines 313-336 for 625 line video
standards, 263-286 for 525 line standards) */ standards, 263-286 for 525 line standards) */
__u16 service_lines[2][24]; __u16 service_lines[2][24];
__u32 reserved[4]; /* must be 0 */ __u32 reserved[4]; /* must be 0 */
}; };