Commit 7025e521 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] bttv: The Hauppauge 61334 needs the msp3410 to do radio demodulation



The (radio) audio out from the tuner (which can also demod FM radio) does not
seem to be hooked up to the msp3410 on this board in any way, so the only way
to get sound from the radio part is to make the msp3410 do the FM radio demod.

The msp3410 can handle this fine, but it is a bit weird compared to how it
is handled on other boards.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 792a21b0
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -3648,6 +3648,10 @@ static void __devinit hauppauge_eeprom(struct bttv *btv)
			bttv_tvcards[BTTV_BOARD_HAUPPAUGE_IMPACTVCB].name);
		btv->c.type = BTTV_BOARD_HAUPPAUGE_IMPACTVCB;
	}

	/* The 61334 needs the msp3410 to do the radio demod to get sound */
	if (tv.model == 61334)
		btv->radio_uses_msp_demodulator = 1;
}

static int terratec_active_radio_upgrade(struct bttv *btv)
+5 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,11 @@ audio_mux(struct bttv *btv, int input, int mute)
		   For now this is sufficient. */
		switch (input) {
		case TVAUDIO_INPUT_RADIO:
			/* Some boards need the msp do to the radio demod */
			if (btv->radio_uses_msp_demodulator) {
				in = MSP_INPUT_DEFAULT;
				break;
			}
			in = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
				    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
			break;
+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ struct bttv {
	/* radio data/state */
	int has_radio;
	int radio_user;
	int radio_uses_msp_demodulator;

	/* miro/pinnacle + Aimslab VHX
	   philips matchbox (tea5757 radio tuner) support */