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

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

details:   https://anonhg.NetBSD.org/src/rev/3901bff46163
branches:  netbsd-1-5
changeset: 488360:3901bff46163
user:      wiz <wiz%NetBSD.org@localhost>
date:      Mon Jul 03 02:17:12 2000 +0000

description:
Pull up revision 1.9 (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_core.c |  42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 deletions(-)

diffs (88 lines):

diff -r bc3ff216a17d -r 3901bff46163 sys/dev/pci/bktr/bktr_core.c
--- a/sys/dev/pci/bktr/bktr_core.c      Mon Jul 03 02:16:12 2000 +0000
+++ b/sys/dev/pci/bktr/bktr_core.c      Mon Jul 03 02:17:12 2000 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: bktr_core.c,v 1.5 2000/05/22 01:00:29 wiz Exp $        */
-
-/* FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.106 2000/04/16 07:50:08 roger Exp */
+/*     $NetBSD: bktr_core.c,v 1.5.4.1 2000/07/03 02:17:12 wiz Exp $    */
+
+/* FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.109 2000/06/28 15:09:12 roger Exp */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -110,9 +110,14 @@
     || (defined(__NetBSD__))                                     \
     )
 
+
+/*******************/
+/* *** FreeBSD *** */
+/*******************/
+#ifdef __FreeBSD__
+
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
@@ -122,11 +127,6 @@
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-/*******************/
-/* *** FreeBSD *** */
-/*******************/
-#ifdef __FreeBSD__
-
 #if (__FreeBSD_version >=400000) || (NSMBUS > 0)
 #include <sys/bus.h>           /* used by smbus and newbus */
 #endif
@@ -157,13 +157,10 @@
 #include "iicbus_if.h"
 #endif
 
-char *
+const char *
 bktr_name(bktr_ptr_t bktr)
 {
-        char buf[10];                                                          
-       
-        snprintf(buf, sizeof(buf), "bktr%d", bktr->sc_dev.dv_unit);            
-        return buf;                                                            
+  return bktr->bktr_xname;
 }
 
 
@@ -185,6 +182,21 @@
 /**************************/
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/signalvar.h>
+#include <sys/vnode.h>
+
+#ifdef __NetBSD__
+#include <uvm/uvm_extern.h>
+#else
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/pmap.h>
+#include <vm/vm_extern.h>
+#endif
+
 #include <sys/inttypes.h>              /* uintptr_t */
 #include <dev/ic/bt8xx.h>
 #include <dev/pci/bktr/bktr_reg.h>
@@ -196,7 +208,7 @@
 
 static int bt848_format = -1;
 
-char *
+const char *
 bktr_name(bktr_ptr_t bktr)
 {
         return (bktr->bktr_dev.dv_xname);