Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/sys/dev/pci/bktr Pull up revision 1.6 (requested by wiz):
details: https://anonhg.NetBSD.org/src/rev/b82ab3d417e8
branches: netbsd-1-5
changeset: 488358:b82ab3d417e8
user: wiz <wiz%NetBSD.org@localhost>
date: Mon Jul 03 02:14:29 2000 +0000
description:
Pull up revision 1.6 (requested by wiz):
Sync with release 2.14 of the bktr driver. Changes: mostly integration
of NetBSD changes; support for new Hauppauge tuner types.
Approved by thorpej.
diffstat:
sys/dev/pci/bktr/bktr_audio.c | 4 +-
sys/dev/pci/bktr/bktr_card.c | 90 ++++++++++++++++++++++++------------------
2 files changed, 54 insertions(+), 40 deletions(-)
diffs (125 lines):
diff -r b5e0c782ad9c -r b82ab3d417e8 sys/dev/pci/bktr/bktr_audio.c
--- a/sys/dev/pci/bktr/bktr_audio.c Sun Jul 02 23:32:02 2000 +0000
+++ b/sys/dev/pci/bktr/bktr_audio.c Mon Jul 03 02:14:29 2000 +0000
@@ -1,6 +1,6 @@
-/* $NetBSD: bktr_audio.c,v 1.5 2000/05/21 15:43:56 wiz Exp $ */
+/* $NetBSD: bktr_audio.c,v 1.5.4.1 2000/07/03 02:14:29 wiz Exp $ */
-/* FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.2 1999/10/28 13:58:14 roger Exp */
+/* FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.5 2000/06/26 09:41:31 roger Exp */
/*
* This is part of the Driver for Video Capture Cards (Frame grabbers)
* and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879
diff -r b5e0c782ad9c -r b82ab3d417e8 sys/dev/pci/bktr/bktr_card.c
--- a/sys/dev/pci/bktr/bktr_card.c Sun Jul 02 23:32:02 2000 +0000
+++ b/sys/dev/pci/bktr/bktr_card.c Mon Jul 03 02:14:29 2000 +0000
@@ -1,6 +1,6 @@
-/* $NetBSD: bktr_card.c,v 1.5 2000/05/21 15:43:57 wiz Exp $ */
+/* $NetBSD: bktr_card.c,v 1.5.4.1 2000/07/03 02:15:16 wiz Exp $ */
-/* FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.9 2000/02/12 08:49:21 peter Exp */
+/* FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.12 2000/06/28 15:09:12 roger Exp */
/*
* This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -826,43 +826,56 @@
/* Hauppauge kindly supplied the following Tuner Table */
/* FIXME: I think the tuners the driver selects for types */
/* 0x08 and 0x15 may be incorrect but no one has complained. */
+ /* Old Temic tuners had their own API, but newer Temic tuners */
+ /* have the same API as Philips tuners */
/*
- ID Tuner Model Format We select Format
- 0 NONE
- 1 EXTERNAL
- 2 OTHER
- 3 Philips FI1216 BG
- 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' PHILIPS_SECAM
- a Philips FI1236 MK2 MN PHILIPS_NTSC
- b Philips FI1246 MK2 I PHILIPS_PALI
- c Philips FI1256 MK2 DK
- d Temic 4032FY5 NTSC TEMIC_NTSC
- e Temic 4002FH5 BG TEMIC_PAL
- f Temic 4062FY5 I TEMIC_PALI
- 10 Philips FR1216 MK2 BG
- 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' PHILIPS_FR1236_SECAM
- 17 Philips FM1236 MN PHILIPS_FR1236_NTSC
- 18 Philips FM1246 I
- 19 Philips FM1256 DK
- 1a Temic 4036FY5 MN - FI1236 MK2 clone PHILIPS_NTSC
- 1b Samsung TCPN9082D MN
- 1c Samsung TCPM9092P Pal BG/I/DK
- 1d Temic 4006FH5 BG PHILIPS_PALI clone
- 1e Samsung TCPN9085D MN/Radio
- 1f Samsung TCPB9085P Pal BG/I/DK / Radio
- 20 Samsung TCPL9091P Pal BG & Secam L/L'
- 21 Temic 4039FY5 NTSC Radio
-
+ ID Tuner Model Format We select Format
+ 0x00 NONE
+ 0x01 EXTERNAL
+ 0x02 OTHER
+ 0x03 Philips FI1216 BG
+ 0x04 Philips FI1216MF BGLL' PHILIPS_SECAM
+ 0x05 Philips FI1236 MN PHILIPS_NTSC
+ 0x06 Philips FI1246 I PHILIPS_PALI
+ 0x07 Philips FI1256 DK
+ 0x08 Philips FI1216 MK2 BG PHILIPS_PALI
+ 0x09 Philips FI1216MF MK2 BGLL' PHILIPS_SECAM
+ 0x0a Philips FI1236 MK2 MN PHILIPS_NTSC
+ 0x0b Philips FI1246 MK2 I PHILIPS_PALI
+ 0x0c Philips FI1256 MK2 DK
+ 0x0d Temic 4032FY5 NTSC TEMIC_NTSC
+ 0x0e Temic 4002FH5 BG TEMIC_PAL
+ 0x0f Temic 4062FY5 I TEMIC_PALI
+ 0x10 Philips FR1216 MK2 BG
+ 0x11 Philips FR1216MF MK2 BGLL' PHILIPS_FR1236_SECAM
+ 0x12 Philips FR1236 MK2 MN PHILIPS_FR1236_NTSC
+ 0x13 Philips FR1246 MK2 I
+ 0x14 Philips FR1256 MK2 DK
+ 0x15 Philips FM1216 BG PHILIPS_FR1216_PAL
+ 0x16 Philips FM1216MF BGLL' PHILIPS_FR1236_SECAM
+ 0x17 Philips FM1236 MN PHILIPS_FR1236_NTSC
+ 0x18 Philips FM1246 I
+ 0x19 Philips FM1256 DK
+ 0x1a Temic 4036FY5 MN (FI1236 MK2 clone) PHILIPS_NTSC
+ 0x1b Samsung TCPN9082D MN
+ 0x1c Samsung TCPM9092P Pal BG/I/DK
+ 0x1d Temic 4006FH5 BG PHILIPS_PALI
+ 0x1e Samsung TCPN9085D MN/Radio
+ 0x1f Samsung TCPB9085P Pal BG/I/DK / Radio
+ 0x20 Samsung TCPL9091P Pal BG & Secam L/L'
+ 0x21 Temic 4039FY5 NTSC Radio
+ 0x22 Philips FQ1216ME Pal BGIDK & Secam L/L'
+ 0x23 Temic 4066FY5 Pal I (FI1246 MK2 clone) PHILIPS_PALI
+ 0x24 Philips TD1536 MN/ATSCDigital
+ 0x25 Philips TD1536D MN/ATSCDigital DUAL INPUT
+ 0x26 Philips FMR1236 M/N FM(no demod)
+ 0x27 Philips FI1256MP B/G, D/K
+ 0x28 Samsung TCPQ9091P BG/I/DK, L/L'
+ 0x29 Temic 4006FN5 BG/I/DK
+ 0x2a Temic 4009FR5 BG FM
+ 0x2b Temic 4046FM5 B/G, I, D/K, L/L'
+ 0x2c Temic 4009FN5 B/G, I, D/K, FM (no demod)
+ 0x2d Philips TD1536D_FH_44 MN/ATSCDigital DUAL INPUT
*/
@@ -914,6 +927,7 @@
case 0x8:
case 0xb:
case 0x1d:
+ case 0x23:
select_tuner( bktr, PHILIPS_PALI );
goto checkDBX;
Home |
Main Index |
Thread Index |
Old Index