aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/bktr/bktr_card.c
diff options
context:
space:
mode:
authorRoger Hardiman <roger@FreeBSD.org>1999-11-13 14:54:00 +0000
committerRoger Hardiman <roger@FreeBSD.org>1999-11-13 14:54:00 +0000
commit753d64dfbb2d5434bd15e9329ce16b0b4b929b40 (patch)
tree4f1220cfab4557a5c3b0733e0a05cd055ddddd88 /sys/dev/bktr/bktr_card.c
parent020024f3d28ec68648ecd71a4188c70b8b9f2553 (diff)
downloadsrc-753d64dfbb2d5434bd15e9329ce16b0b4b929b40.tar.gz
src-753d64dfbb2d5434bd15e9329ce16b0b4b929b40.zip
Update to driver 2.05
Make tuner on French SECAM Hauppauge cards work Submitted by: Cyrille Lefevre <clefevre@citeweb.net> Fix clipping bugs ready for Xv support in XFree86 4.0 Submitted by: Thomas Mueller <tmueller@thmu.de> Fix the 'feature' where /dev/vbi needed to be opened before /dev/bktr when using Teletext with Alevt and FXTV. Requested by: Randall Hopper
Notes
Notes: svn path=/head/; revision=53123
Diffstat (limited to 'sys/dev/bktr/bktr_card.c')
-rw-r--r--sys/dev/bktr/bktr_card.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index f9d69675fd41..63659459f428 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -800,12 +800,12 @@ checkTuner:
1 EXTERNAL
2 OTHER
3 Philips FI1216 BG
- 4 Philips FI1216MF BGLL'
+ 4 Philips FI1216MF BGLL' PHILIPS_SECAM
5 Philips FI1236 MN PHILIPS_NTSC
6 Philips FI1246 I PHILIPS_PALI
7 Philips FI1256 DK
8 Philips FI1216 MK2 BG PHILIPS_PALI
- 9 Philips FI1216MF MK2 BGLL'
+ 9 Philips FI1216MF MK2 BGLL' PHILIPS_SECAM
a Philips FI1236 MK2 MN PHILIPS_NTSC
b Philips FI1246 MK2 I PHILIPS_PALI
c Philips FI1256 MK2 DK
@@ -813,12 +813,12 @@ checkTuner:
e Temic 4002FH5 BG TEMIC_PAL
f Temic 4062FY5 I TEMIC_PALI
10 Philips FR1216 MK2 BG
- 11 Philips FR1216MF MK2 BGLL'
+ 11 Philips FR1216MF MK2 BGLL' PHILIPS_FR1236_SECAM
12 Philips FR1236 MK2 MN PHILIPS_FR1236_NTSC
13 Philips FR1246 MK2 I
14 Philips FR1256 MK2 DK
15 Philips FM1216 BG PHILIPS_FR1216_PAL
- 16 Philips FM1216MF BGLL'
+ 16 Philips FM1216MF BGLL' PHILIPS_FR1236_SECAM
17 Philips FM1236 MN PHILIPS_FR1236_NTSC
18 Philips FM1246 I
19 Philips FM1256 DK
@@ -857,10 +857,14 @@ checkTuner:
tuner_code = eeprom[9];
switch (tuner_code) {
- case 0x5:
- case 0x0a:
- case 0x1a:
- select_tuner( bktr, PHILIPS_NTSC );
+ case 0x4:
+ case 0x9:
+ select_tuner( bktr, PHILIPS_SECAM );
+ goto checkDBX;
+
+ case 0x11:
+ case 0x16:
+ select_tuner( bktr, PHILIPS_FR1236_SECAM );
goto checkDBX;
case 0x12: