git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-tvaudio.c
diff --git
a/drivers/media/video/cx88/cx88-tvaudio.c
b/drivers/media/video/cx88/cx88-tvaudio.c
index
cbd85fe
..
da8d97c
100644
(file)
--- a/
drivers/media/video/cx88/cx88-tvaudio.c
+++ b/
drivers/media/video/cx88/cx88-tvaudio.c
@@
-137,28
+137,21
@@
static void set_audio_finish(struct cx88_core *core, u32 ctl)
{
u32 volume;
{
u32 volume;
-#ifndef
CONFIG_VIDEO
_CX88_ALSA
+#ifndef
USING
_CX88_ALSA
/* restart dma; This avoids buzz in NICAM and is good in others */
cx88_stop_audio_dma(core);
#endif
cx_write(AUD_RATE_THRES_DMD, 0x000000C0);
/* restart dma; This avoids buzz in NICAM and is good in others */
cx88_stop_audio_dma(core);
#endif
cx_write(AUD_RATE_THRES_DMD, 0x000000C0);
-#ifndef
CONFIG_VIDEO
_CX88_ALSA
+#ifndef
USING
_CX88_ALSA
cx88_start_audio_dma(core);
#endif
if (cx88_boards[core->board].blackbird) {
/* sets sound input from external adc */
cx88_start_audio_dma(core);
#endif
if (cx88_boards[core->board].blackbird) {
/* sets sound input from external adc */
- switch (core->board) {
- case CX88_BOARD_HAUPPAUGE_ROSLYN:
- case CX88_BOARD_KWORLD_MCE200_DELUXE:
- case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
- case CX88_BOARD_PIXELVIEW_PLAYTV_P7000:
- case CX88_BOARD_ASUS_PVR_416:
+ if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN)
cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
- break;
- default:
+ else
cx_set(AUD_CTL, EN_I2SIN_ENABLE);
cx_set(AUD_CTL, EN_I2SIN_ENABLE);
- }
cx_write(AUD_I2SINPUTCNTL, 4);
cx_write(AUD_BAUDRATE, 1);
cx_write(AUD_I2SINPUTCNTL, 4);
cx_write(AUD_BAUDRATE, 1);
@@
-725,7
+718,7
@@
static void set_audio_standard_FM(struct cx88_core *core,
/* ----------------------------------------------------------- */
/* ----------------------------------------------------------- */
-
static
int cx88_detect_nicam(struct cx88_core *core)
+int cx88_detect_nicam(struct cx88_core *core)
{
int i, j = 0;
{
int i, j = 0;
@@
-892,7
+885,6
@@
void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
set_audio_standard_BTSC(core, 1, EN_BTSC_FORCE_SAP);
break;
case V4L2_TUNER_MODE_STEREO:
set_audio_standard_BTSC(core, 1, EN_BTSC_FORCE_SAP);
break;
case V4L2_TUNER_MODE_STEREO:
- case V4L2_TUNER_MODE_LANG1_LANG2:
set_audio_standard_BTSC(core, 0, EN_BTSC_FORCE_STEREO);
break;
}
set_audio_standard_BTSC(core, 0, EN_BTSC_FORCE_STEREO);
break;
}
@@
-913,7
+905,6
@@
void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
EN_NICAM_FORCE_MONO2);
break;
case V4L2_TUNER_MODE_STEREO:
EN_NICAM_FORCE_MONO2);
break;
case V4L2_TUNER_MODE_STEREO:
- case V4L2_TUNER_MODE_LANG1_LANG2:
set_audio_standard_NICAM(core,
EN_NICAM_FORCE_STEREO);
break;
set_audio_standard_NICAM(core,
EN_NICAM_FORCE_STEREO);
break;
@@
-935,7
+926,6
@@
void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
EN_A2_FORCE_MONO2);
break;
case V4L2_TUNER_MODE_STEREO:
EN_A2_FORCE_MONO2);
break;
case V4L2_TUNER_MODE_STEREO:
- case V4L2_TUNER_MODE_LANG1_LANG2:
set_audio_standard_A2(core,
EN_A2_FORCE_STEREO);
break;
set_audio_standard_A2(core,
EN_A2_FORCE_STEREO);
break;