Attachment 20653 Details for Bug 36415 – file.diff

[patch] file.diff

file.diff (text/plain), 1.91 KB, created by brandt on 2002-03-28 09:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: brandt

Created: 2002-03-28 09:30:01 UTC

Size: 1.91 KB

patch

obsolete

>Index: bktr_core.c
>===================================================================
>RCS file: /usr/ncvs/src/sys/dev/bktr/bktr_core.c,v
>retrieving revision 1.118
>diff -u -r1.118 bktr_core.c
>--- bktr_core.c	14 Mar 2002 01:32:21 -0000	1.118
>+++ bktr_core.c	28 Mar 2002 09:15:56 -0000
>@@ -962,7 +962,7 @@
> 	bktr->flags |= METEOR_OPEN;
> 
> #ifdef BT848_DUMP
>-	dump_bt848( bt848 );
>+	dump_bt848(bktr);
> #endif
> 
>         bktr->clr_on_start = FALSE;
>@@ -1640,7 +1640,7 @@
> 			                    BT848_INT_VSYNC      |
> 					    BT848_INT_FMTCHG);
> #ifdef BT848_DUMP
>-			dump_bt848( bt848 );
>+			dump_bt848(bktr);
> #endif
> 			break;
> 		
>@@ -2473,7 +2473,7 @@
> /*
>  * 
>  */
>-#ifdef BT848_DEBUG 
>+#if defined(BT848_DEBUG) || defined(BT848_DUMP)
> static int
> dump_bt848( bktr_ptr_t bktr )
> {
>@@ -2493,7 +2493,7 @@
> 		       r[i], INL(bktr, r[i]),
> 		       r[i+1], INL(bktr, r[i+1]),
> 		       r[i+2], INL(bktr, r[i+2]),
>-		       r[i+3], INL(bktr, r[i+3]]));
>+		       r[i+3], INL(bktr, r[i+3]));
> 	}
> 
> 	printf("%s: INT STAT %x \n", bktr_name(bktr),
>@@ -3657,28 +3657,26 @@
> 
> 
> /*
>- * 
>+ * Set the temporal decimation register to get the desired frame rate.
>+ * We use the 'skip frame' modus always and always start dropping on an
>+ * odd field.
>  */
> static void
> set_fps( bktr_ptr_t bktr, u_short fps )
> {
> 	struct format_params	*fp;
>-	int i_flag;
> 
> 	fp = &format_params[bktr->format_params];
> 
> 	switch(bktr->flags & METEOR_ONLY_FIELDS_MASK) {
> 	case METEOR_ONLY_EVEN_FIELDS:
> 		bktr->flags |= METEOR_WANT_EVEN;
>-		i_flag = 1;
> 		break;
> 	case METEOR_ONLY_ODD_FIELDS:
> 		bktr->flags |= METEOR_WANT_ODD;
>-		i_flag = 1;
> 		break;
> 	default:
> 		bktr->flags |= METEOR_WANT_MASK;
>-		i_flag = 2;
> 		break;
> 	}
> 
>@@ -3689,7 +3687,7 @@
> 	OUTB(bktr, BKTR_TDEC, 0);
> 
> 	if (fps < fp->frame_rate)
>-		OUTB(bktr, BKTR_TDEC, i_flag*(fp->frame_rate - fps) & 0x3f);
>+		OUTB(bktr, BKTR_TDEC, (fp->frame_rate - fps) & 0x3f);
> 	else
> 		OUTB(bktr, BKTR_TDEC, 0);
> 	return;

Actions: View | Diff

Attachments on bug 36415: 20653