diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-01 23:03:23 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-01 23:03:23 +0200 |
| commit | dbe2e81959f002660345a0b09161b230df7765cf (patch) | |
| tree | acf7f951b6b6f4d03873bc776c2b76a4af514cb5 /linux/drivers/media/video/pvrusb2 | |
| parent | b1828398ae5cd6585d502c5e0361e2c2cef74c38 (diff) | |
| download | mediapointer-dvb-s2-dbe2e81959f002660345a0b09161b230df7765cf.tar.gz mediapointer-dvb-s2-dbe2e81959f002660345a0b09161b230df7765cf.tar.bz2 | |
Make msp3400 routing defines more consistent
From: Hans Verkuil <hverkuil@xs4all.nl>
Renamed various msp3400 routing defines to be more consistent and less
confusing. Esp. the MSP_DSP_OUT defines were confusing since it is really
a DSP input.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-audio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c index 79395d540..031412327 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c @@ -74,7 +74,7 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt) } route.input = MSP_INPUT_DEFAULT; - route.output = MSP_OUTPUT(MSP_OUT_SCART1_DA); + route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1); switch (hdw->controls[PVR2_CID_INPUT].value) { case PVR2_CVAL_INPUT_TV: break; @@ -83,14 +83,14 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt) we're still using the tuner. */ /* HV: actually it is more likely to be the SCART2 input if the ivtv experience is any indication. */ - route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1, - MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART); + route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1, + MSP_DSP_IN_SCART, MSP_DSP_IN_SCART); break; case PVR2_CVAL_INPUT_SVIDEO: case PVR2_CVAL_INPUT_COMPOSITE: /* SCART 1 input */ - route.input = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1, - MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART); + route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, + MSP_DSP_IN_SCART, MSP_DSP_IN_SCART); break; } pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route); |