summaryrefslogtreecommitdiffstats
path: root/sys/dev/bktr
diff options
context:
space:
mode:
authorsos <sos@FreeBSD.org>1998-08-08 07:15:16 +0000
committersos <sos@FreeBSD.org>1998-08-08 07:15:16 +0000
commita5e1d6e09cff33279213d996def3d9ebea963d49 (patch)
tree4b6848e8fef2cab018b2b169b04784ea1ca52b49 /sys/dev/bktr
parent912ec94d68f55da823d1818442c50925d735455f (diff)
downloadFreeBSD-src-a5e1d6e09cff33279213d996def3d9ebea963d49.zip
FreeBSD-src-a5e1d6e09cff33279213d996def3d9ebea963d49.tar.gz
Updated Hauppauge detection code for Tuner ID 0x0a for newer NTSC
WinCastTV 404 with Bt878 chipset. Tidied up PAL default in video_open() Submitted by: Roger Hardiman <roger@cs.strath.ac.uk>
Diffstat (limited to 'sys/dev/bktr')
-rw-r--r--sys/dev/bktr/bktr_core.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 01b42c4..3eab68b 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* BT848 1.38 Driver for Brooktree's Bt848 based cards.
+/* BT848 1.39 Driver for Brooktree's Bt848 based cards.
The Brooktree BT848 Driver driver is based upon Mark Tinguely and
Jim Lowe's driver for the Matrox Meteor PCI card . The
Philips SAA 7116 and SAA 7196 are very different chipsets than
@@ -267,6 +267,13 @@
1.38 Further improvements on Hauppauge's rely on
eeprom[9] to determine the tuner type 8)
+ AVerMedia card type added <sos@freebsd.org>
+
+1.39 08/05/98 Roger Hardiman <roger@cs.strath.ac.uk>
+ Updated Hauppauge detection code for Tuner ID 0x0a
+ for newer NTSC WinCastTV 404 with Bt878 chipset.
+ Tidied up PAL default in video_open()
+
*/
#define DDB(x) x
@@ -1621,19 +1628,19 @@ video_open( bktr_ptr_t bktr )
BT848_IFORM_X_XT0 |
BT848_IFORM_F_NTSCM;
bktr->format_params = BT848_IFORM_F_NTSCM;
- frame_rate = 30;
} else {
bt848->iform = BT848_IFORM_M_MUX1 |
BT848_IFORM_X_XT1 |
BT848_IFORM_F_PALBDGHI;
- bt848->adelay = format_params[BT848_IFORM_F_PALBDGHI].adelay;
- bt848->bdelay = format_params[BT848_IFORM_F_PALBDGHI].bdelay;
bktr->format_params = BT848_IFORM_F_PALBDGHI;
- frame_rate = 25;
}
+ bt848->adelay = format_params[bktr->format_params].adelay;
+ bt848->bdelay = format_params[bktr->format_params].bdelay;
+ frame_rate = format_params[bktr->format_params].frame_rate;
+
bktr->flags = (bktr->flags & ~METEOR_DEV_MASK) | METEOR_DEV0;
bktr->max_clip_node = 0;
@@ -4413,6 +4420,7 @@ checkTuner:
bktr->card.tuner = &tuners[ PHILIPS_NTSC ];
goto checkDBX;
+ case 0x0a:
case 0x12:
case 0x17:
bktr->card.tuner = &tuners[ PHILIPS_FR1236_NTSC ];
OpenPOWER on IntegriCloud