summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJohn-Mark Gurney <jmg@FreeBSD.org>1997-05-05 20:54:54 +0000
committerJohn-Mark Gurney <jmg@FreeBSD.org>1997-05-05 20:54:54 +0000
commitdc01e23eda85615febc052a3546c67e6cf664324 (patch)
tree6fc7c80b482eb4a805022330bb45b175273e4e85 /sys
parent805bd6d9821b9d914ed6814d48e6b0ae4c721611 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/bktr/bktr_core.c5
-rw-r--r--sys/pci/brooktree848.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 898ced193f8c..7b044307b407 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -986,6 +986,10 @@ video_open( bktr_ptr_t bktr )
bktr->video.width = 0;
bktr->video.banksize = 0;
bktr->video.ramsize = 0;
+ bktr->pixfmt_compat = TRUE;
+ bktr->format = METEOR_GEO_RGB16;
+ bktr->pixfmt = oformat_meteor_to_bt( bktr->format );
+
bt848->int_mask = BT848_INT_MYSTERYBIT; /* what does this bit do ??? */
@@ -2849,7 +2853,6 @@ set_fps( bktr_ptr_t bktr, u_short fps )
return;
} else {
bt848->tdec = (int) (((float) fps / 30.0) * 60.0) & 0x3f;
- bt848->tdec |= 0x80;
}
if ( bktr->flags & METEOR_CAP_MASK ) {
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 898ced193f8c..7b044307b407 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -986,6 +986,10 @@ video_open( bktr_ptr_t bktr )
bktr->video.width = 0;
bktr->video.banksize = 0;
bktr->video.ramsize = 0;
+ bktr->pixfmt_compat = TRUE;
+ bktr->format = METEOR_GEO_RGB16;
+ bktr->pixfmt = oformat_meteor_to_bt( bktr->format );
+
bt848->int_mask = BT848_INT_MYSTERYBIT; /* what does this bit do ??? */
@@ -2849,7 +2853,6 @@ set_fps( bktr_ptr_t bktr, u_short fps )
return;
} else {
bt848->tdec = (int) (((float) fps / 30.0) * 60.0) & 0x3f;
- bt848->tdec |= 0x80;
}
if ( bktr->flags & METEOR_CAP_MASK ) {