[src/netbsd-1-5]: src/sys/dev/pci/bktr Pull up revision 1.5 (requested by wiz):

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fb4291eca7b1
branches:  netbsd-1-5
changeset: 488364:fb4291eca7b1
user:      wiz <wiz%NetBSD.org@localhost>
date:      Mon Jul 03 02:21:25 2000 +0000

description:
Pull up revision 1.5 (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_reg.h   |  34 ++++++++++++++++++++++++++++++++--
 sys/dev/pci/bktr/bktr_tuner.c |   6 +++---
 2 files changed, 35 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r fedf9df53044 -r fb4291eca7b1 sys/dev/pci/bktr/bktr_reg.h
--- a/sys/dev/pci/bktr/bktr_reg.h       Mon Jul 03 02:20:50 2000 +0000
+++ b/sys/dev/pci/bktr/bktr_reg.h       Mon Jul 03 02:21:25 2000 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: bktr_reg.h,v 1.4 2000/05/07 14:59:23 veego Exp $       */
+/*     $NetBSD: bktr_reg.h,v 1.4.4.1 2000/07/03 02:21:25 wiz Exp $     */
 
 /*
- * FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.36 1999/10/28 13:58:17 roger Exp
+ * FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.38 2000/06/26 09:41:32 roger Exp
  *
  * Copyright (c) 1999 Roger Hardiman
  * Copyright (c) 1998 Amancio Hasty
@@ -58,6 +58,35 @@
 # endif
 #endif
 
+/*
+ * The kernel options for the driver now all begin with BKTR.
+ * Support the older kernel options on FreeBSD and OpenBSD.
+ *
+ */
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(BROOKTREE_SYSTEM_DEFAULT)
+#define BKTR_SYSTEM_DEFAULT BROOKTREE_SYSTEM_DEFAULT
+#endif
+
+#if defined(OVERRIDE_CARD)
+#define BKTR_OVERRIDE_CARD OVERRIDE_CARD
+#endif
+
+#if defined(OVERRIDE_TUNER)
+#define BKTR_OVERRIDE_TUNER OVERRIDE_TUNER
+#endif
+
+#if defined(OVERRIDE_DBX)
+#define BKTR_OVERRIDE_DBX OVERRIDE_DBX
+#endif
+
+#if defined(OVERRIDE_MSP)
+#define BKTR_OVERRIDE_MSP OVERRIDE_MSP
+#endif
+
+#endif
+
+
 #ifndef PCI_LATENCY_TIMER
 #define        PCI_LATENCY_TIMER               0x0c    /* pci timer register */
 #endif
@@ -512,6 +541,7 @@
     #if (NSMBUS > 0)
       struct bktr_i2c_softc i2c_sc;    /* bt848_i2c device */
     #endif
+    char       bktr_xname[7];  /* device name and unit number */
 #endif
 
     /* the following definitions are common over all platforms */
diff -r fedf9df53044 -r fb4291eca7b1 sys/dev/pci/bktr/bktr_tuner.c
--- a/sys/dev/pci/bktr/bktr_tuner.c     Mon Jul 03 02:20:50 2000 +0000
+++ b/sys/dev/pci/bktr/bktr_tuner.c     Mon Jul 03 02:21:25 2000 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: bktr_tuner.c,v 1.3 2000/05/21 15:43:57 wiz Exp $       */
+/*     $NetBSD: bktr_tuner.c,v 1.3.4.1 2000/07/03 02:21:54 wiz Exp $   */
 
-/* FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.5 2000/01/24 14:00:21 roger Exp */
+/* FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.7 2000/06/26 09:41:32 roger Exp */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -848,7 +848,7 @@
                        else
                            frequency = N - TBL_IF;
 #if defined( TEST_TUNER_AFC )
- printf("%s: do_afc: returned freq %d (%d %% %d)\n", frequency, frequency / 16, bktr_name(bktr), frequency % 16);
+ printf("%s: do_afc: returned freq %d (%d %% %d)\n", bktr_name(bktr), frequency, frequency / 16, frequency % 16);
                            afcDelta = frequency - oldFrequency;
  printf("%s: changed by: %d clicks (%d mod %d)\n", bktr_name(bktr), afcDelta, afcDelta / 16, afcDelta % 16);
 #endif