Attachment #27689 for bug #46872

View | Details | Raw Unified | Return to bug 46872
Collapse All | Expand All

Lines 482-488 Link Here

(-)sys/dev/bktr/bktr_audio.c (-4 / +11 lines)
482		482
483	msp_dpl_write(bktr, bktr->msp_addr, 0x10, 0x0030,0x2003);/* Enable Auto format detection */	483	msp_dpl_write(bktr, bktr->msp_addr, 0x10, 0x0030,0x2003);/* Enable Auto format detection */
484	msp_dpl_write(bktr, bktr->msp_addr, 0x10, 0x0020,0x0020);/* Standard Select Reg. = BTSC-Stereo*/	484	msp_dpl_write(bktr, bktr->msp_addr, 0x10, 0x0020,0x0020);/* Standard Select Reg. = BTSC-Stereo*/
485	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x000E,0x2403);/* darned if I know */	485	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x000e,0x2403);/* FM prescale */
486	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008,0x0320);/* Source select = (St or A) */	486	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008,0x0320);/* Source select = (St or A) */
487	/* & Ch. Matrix = St */	487	/* & Ch. Matrix = St */
488	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0000,0x7300);/* Set volume to 0db gain */	488	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0000,0x7300);/* Set volume to 0db gain */
Lines 500-507 Link Here
500	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008, 0x0220); /* SCART \| STEREO */	500	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008, 0x0220); /* SCART \| STEREO */
501	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0013, 0x0100); /* DSP In = MONO IN */	501	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0013, 0x0100); /* DSP In = MONO IN */
502	}	502	}
503		503	/* MSP3415D-B3 SPECIAL CASE Use same calls as setting up the FM Tuner */
504		504	/* (for Hauppauge 44xxx card with Tuner Type 0x15) */
		505	else if( bktr->slow_msp_audio == 3){
		506	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0000, 0x7300); /* 0 db volume */
		507	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x000d, 0x7f00); /* scart prescale */
		508	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008, 0x0220); /* SCART \| STEREO */
		509	msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0013, 0x0200); /* DSP In = SC2_IN_L/R */
		510	}
		511
505	/* MSP3410/MSP3415 - countries with mono, stereo using 2 FM channels and NICAM */	512	/* MSP3410/MSP3415 - countries with mono, stereo using 2 FM channels and NICAM */
506	/* FAST sound scheme */	513	/* FAST sound scheme */
507	else if (bktr->slow_msp_audio == 0) {	514	else if (bktr->slow_msp_audio == 0) {
Lines 524-530 Link Here
524	DELAY(100000);	531	DELAY(100000);
525	auto_detect = msp_dpl_read(bktr, bktr->msp_addr, 0x10, 0x007e);	532	auto_detect = msp_dpl_read(bktr, bktr->msp_addr, 0x10, 0x007e);
526	loops++;	533	loops++;
527	} while (auto_detect > 0xff && loops < 50);	534	} while (auto_detect > 0x07ff && loops < 500);
528	if (bootverbose)printf ("%s: Result of autodetect after %dms: %d\n",	535	if (bootverbose)printf ("%s: Result of autodetect after %dms: %d\n",
529	bktr_name(bktr), loops*10, auto_detect);	536	bktr_name(bktr), loops*10, auto_detect);
530		537





                  case 0x15:
		    select_tuner( bktr, PHILIPS_FR1216_PAL );
		    bktr->slow_msp_audio = 3;
		    goto checkDBX;

                  case 0x2a:
		    bktr->msp_use_mono_source = 1;
		    select_tuner( bktr, PHILIPS_FR1216_PAL );
		    bktr->msp_use_mono_source = 1;
		    goto checkDBX;

	          default :

Return to bug 46872

Lines 995-1005 Link Here

(-)sys/dev/bktr/bktr_card.c (-1 / +2 lines)
995		995
996	case 0x15:	996	case 0x15:
997	select_tuner( bktr, PHILIPS_FR1216_PAL );	997	select_tuner( bktr, PHILIPS_FR1216_PAL );
		998	bktr->slow_msp_audio = 3;
998	goto checkDBX;	999	goto checkDBX;
999		1000
1000	case 0x2a:	1001	case 0x2a:
1001	bktr->msp_use_mono_source = 1;
1002	select_tuner( bktr, PHILIPS_FR1216_PAL );	1002	select_tuner( bktr, PHILIPS_FR1216_PAL );
		1003	bktr->msp_use_mono_source = 1;
1003	goto checkDBX;	1004	goto checkDBX;
1004		1005
1005	default :	1006	default :