Commit 3febc04d authored Apr 16, 2006 by Michael Krufky Committed by Mauro Carvalho Chehab Jun 25, 2006

V4L/DVB (3810): KWorld HardwareMpegTV XPert: Enable Blackbird MPEG encoder support



- clear I2SIN to deliver the audio stream to the cx23416 mpeg encoder.
- enable blackbird support on the KWorld HardwareMpegTV XPert

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

parent 1b77c54e

drivers/media/video/cx88/cx88-blackbird.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -1686,6 +1686,8 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
		memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params));
		memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params));

		if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) {

		if (core->tuner_formats & V4L2_STD_525_60) {
		dev->height = 480;
		dev->params.vi_frame_rate = 30;
		@@ -1694,6 +1696,8 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
		dev->params.vi_frame_rate = 25;
		}

		}

		err = cx8802_init_common(dev);
		if (0 != err)
		goto fail_free;

drivers/media/video/cx88/cx88-cards.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1071,6 +1071,7 @@ struct cx88_board cx88_boards[] = {
		.gpio0 = 0x3de6,
		.gpio2 = 0x00ff,
		},
		.blackbird = 1,
		},
		[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
		.name = "DViCO FusionHDTV DVB-T Hybrid",

drivers/media/video/cx88/cx88-tvaudio.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
		switch (core->board) {
		case CX88_BOARD_HAUPPAUGE_ROSLYN:
		case CX88_BOARD_KWORLD_MCE200_DELUXE:
		case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
		cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
		break;
		default: