diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-alsa.c | 36 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
3 files changed, 29 insertions, 20 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c index da9b5fd27..727b85545 100644 --- a/linux/drivers/media/video/saa7134/saa7134-alsa.c +++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c @@ -2,17 +2,17 @@ * SAA713x ALSA support for V4L * Ricardo Cerqueira <v4l@cerqueira.org> * - * $Id: saa7134-alsa.c,v 1.2 2005/10/06 21:37:02 nsh Exp $ + * $Id: saa7134-alsa.c,v 1.3 2005/10/06 23:55:33 mkrufky Exp $ * - * Caveats: + * Caveats: * I still haven't got the mixer settings right. - * + * * - Volume doesn't work (it's always at max) * - There's no "memory" of the capture channel. It can be changed, * but alsamixer doesn't show it after a module restart (rmmod/insmod) * * Hotswapping DOES NOT work yet! Please remove the module before - * inserting cardbus cards. pcmcia-cs or pccardd should load it + * inserting cardbus cards. pcmcia-cs or pccardd should load it * properly after insertion, and things will work * * This program is free software; you can redistribute it and/or modify @@ -286,14 +286,14 @@ static int snd_card_saa7134_pcm_prepare(snd_pcm_substream_t * substream) switch (runtime->format) { case SNDRV_PCM_FORMAT_U8: - case SNDRV_PCM_FORMAT_S8: - fmt = 0x00; + case SNDRV_PCM_FORMAT_S8: + fmt = 0x00; break; case SNDRV_PCM_FORMAT_U16_LE: case SNDRV_PCM_FORMAT_U16_BE: case SNDRV_PCM_FORMAT_S16_LE: - case SNDRV_PCM_FORMAT_S16_BE: - fmt = 0x01; + case SNDRV_PCM_FORMAT_S16_BE: + fmt = 0x01; break; default: err = -EINVAL; @@ -303,19 +303,19 @@ static int snd_card_saa7134_pcm_prepare(snd_pcm_substream_t * substream) switch (runtime->format) { case SNDRV_PCM_FORMAT_S8: case SNDRV_PCM_FORMAT_S16_LE: - case SNDRV_PCM_FORMAT_S16_BE: - sign = 1; + case SNDRV_PCM_FORMAT_S16_BE: + sign = 1; break; - default: - sign = 0; + default: + sign = 0; break; } switch (runtime->format) { case SNDRV_PCM_FORMAT_U16_BE: - case SNDRV_PCM_FORMAT_S16_BE: + case SNDRV_PCM_FORMAT_S16_BE: bswap = 1; break; - default: + default: bswap = 0; break; } @@ -362,7 +362,7 @@ static int snd_card_saa7134_pcm_prepare(snd_pcm_substream_t * substream) runtime->dma_area = dev->oss.dma.vmalloc; saa_writel(SAA7134_RS_BA1(6),0); - saa_writel(SAA7134_RS_BA2(6),dev->oss.blksize); + saa_writel(SAA7134_RS_BA2(6),dev->oss.blksize); saa_writel(SAA7134_RS_PITCH(6),0); saa_writel(SAA7134_RS_CONTROL(6),control); @@ -531,7 +531,7 @@ static int snd_card_saa7134_capture_close(snd_pcm_substream_t * substream) { snd_card_saa7134_t *chip = snd_pcm_substream_chip(substream); - saa7134_cap_close(chip->saadev); + saa7134_cap_close(chip->saadev); return 0; } @@ -577,7 +577,7 @@ static int snd_saa7134_volume_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_ uinfo->value.integer.max = 20; return 0; } - + static int snd_saa7134_volume_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) { snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol); @@ -631,7 +631,7 @@ static int snd_saa7134_capsrc_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_ uinfo->value.integer.max = 1; return 0; } - + static int snd_saa7134_capsrc_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) { snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol); diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index bd10a0293..2912f2f2f 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.42 2005/10/06 21:37:02 nsh Exp $ + * $Id: saa7134-core.c,v 1.43 2005/10/06 23:55:33 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -1177,7 +1177,7 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev) if (oss) { unregister_sound_mixer(dev->oss.minor_mixer); unregister_sound_dsp(dev->oss.minor_dsp); - } else if (alsa) + } else if (alsa) alsa_card_saa7134_exit(); break; } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index d32dea2aa..3797c2856 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-10-06 23:54 mkrufky + + * saa7134-alsa.c: (snd_card_saa7134_pcm_prepare), + (snd_card_saa7134_capture_close): + * saa7134-core.c: (saa7134_finidev): + - Removed trailing whitespace. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-06 23:46 mkrufky * msp3400.c: (msp_detach): |