Attachment 27689 Details for Bug 46872 – bktr.patch

[patch] bktr.patch

bktr.patch (text/plain), 2.40 KB, created by Ulrich Spoerlein on 2003-01-08 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ulrich Spoerlein

Created: 2003-01-08 16:40:01 UTC

Size: 2.40 KB

patch

obsolete

>--- sys/dev/bktr/bktr_audio.c	1 Nov 2000 09:36:14 -0000	1.2.2.4
>+++ sys/dev/bktr/bktr_audio.c	10 Dec 2002 12:48:35 -0000
>@@ -482,7 +482,7 @@
> 
>     msp_dpl_write(bktr, bktr->msp_addr, 0x10, 0x0030,0x2003);/* Enable Auto format detection */
>     msp_dpl_write(bktr, bktr->msp_addr, 0x10, 0x0020,0x0020);/* Standard Select Reg. = BTSC-Stereo*/
>-    msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x000E,0x2403);/* darned if I know */
>+    msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x000e,0x2403);/* FM prescale */
>     msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008,0x0320);/* Source select = (St or A) */
> 					                     /* & Ch. Matrix = St */
>     msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0000,0x7300);/* Set volume to 0db gain */
>@@ -500,8 +500,15 @@
>     msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008, 0x0220); /* SCART | STEREO */
>     msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0013, 0x0100); /* DSP In = MONO IN */
>   }
>-
>-
>+  /* MSP3415D-B3 SPECIAL CASE  Use same calls as setting up the FM Tuner */
>+  /* (for Hauppauge 44xxx card with Tuner Type 0x15) */
>+  else if( bktr->slow_msp_audio == 3){
>+    msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0000, 0x7300); /* 0 db volume */
>+    msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x000d, 0x7f00); /* scart prescale */
>+    msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008, 0x0220); /* SCART | STEREO */
>+    msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0013, 0x0200); /* DSP In = SC2_IN_L/R */
>+  }
>+	
>   /* MSP3410/MSP3415 - countries with mono, stereo using 2 FM channels and NICAM */
>   /* FAST sound scheme */
>   else if (bktr->slow_msp_audio == 0) {
>@@ -524,7 +531,7 @@
>       DELAY(100000);
>       auto_detect = msp_dpl_read(bktr, bktr->msp_addr, 0x10, 0x007e);
>       loops++;
>-    } while (auto_detect > 0xff && loops < 50);
>+    } while (auto_detect > 0x07ff && loops < 500);
>     if (bootverbose)printf ("%s: Result of autodetect after %dms: %d\n",
> 			    bktr_name(bktr), loops*10, auto_detect);
> 
>--- sys/dev/bktr/bktr_card.c	1 Nov 2000 09:36:14 -0000	1.9.2.4
>+++ sys/dev/bktr/bktr_card.c	10 Dec 2002 12:48:36 -0000
>@@ -995,11 +995,12 @@
> 
>                   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 :

Actions: View | Diff

Attachments on bug 46872: 27689