[src/trunk]: src/sys/dev/bluetooth Make it compile. Rename a macro.

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

details:   https://anonhg.NetBSD.org/src/rev/f33ccbc1878a
branches:  trunk
changeset: 536245:f33ccbc1878a
user:      augustss <augustss%NetBSD.org@localhost>
date:      Thu Sep 12 06:42:54 2002 +0000

description:
Make it compile.  Rename a macro.

diffstat:

 sys/dev/bluetooth/bthci.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r 43230bf1b977 -r f33ccbc1878a sys/dev/bluetooth/bthci.c
--- a/sys/dev/bluetooth/bthci.c Thu Sep 12 06:40:43 2002 +0000
+++ b/sys/dev/bluetooth/bthci.c Thu Sep 12 06:42:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bthci.c,v 1.2 2002/09/06 13:18:43 gehenna Exp $        */
+/*     $NetBSD: bthci.c,v 1.3 2002/09/12 06:42:54 augustss Exp $       */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
 #include <dev/bluetooth/bluetooth.h>
 #include <dev/bluetooth/bthcivar.h>
 
-#ifdef IRFRAME_DEBUG
+#ifdef BTHCI_DEBUG
 #define DPRINTF(x)     if (bthcidebug) printf x
 #define Static
 int bthcidebug = 0;
@@ -90,7 +90,7 @@
        nostop, notty, bthcipoll, nommap,
 };
 
-#define IRFRAMEUNIT(dev) (minor(dev))
+#define BTHCIUNIT(dev) (minor(dev))
 
 int
 bthci_match(struct device *parent, struct cfdata *match, void *aux)
@@ -145,7 +145,7 @@
        /* XXX needs reference count */
 
        /* locate the major number */
-       maj = cdevsw_lookup(&bthciopen);
+       maj = cdevsw_lookup_major(&bthci_cdevsw);
 
        /* Nuke the vnodes for any open instances (calls close). */
        mn = self->dv_unit;
@@ -160,7 +160,7 @@
        struct bthci_softc *sc;
        int error;
 
-       sc = device_lookup(&bthci_cd, IRFRAMEUNIT(dev));
+       sc = device_lookup(&bthci_cd, BTHCIUNIT(dev));
        if (sc == NULL)
                return (ENXIO);
        if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0)
@@ -182,7 +182,7 @@
        struct bthci_softc *sc;
        int error;
 
-       sc = device_lookup(&bthci_cd, IRFRAMEUNIT(dev));
+       sc = device_lookup(&bthci_cd, BTHCIUNIT(dev));
        if (sc == NULL)
                return (ENXIO);
        sc->sc_open = 0;
@@ -199,7 +199,7 @@
 {
        struct bthci_softc *sc;
 
-       sc = device_lookup(&bthci_cd, IRFRAMEUNIT(dev));
+       sc = device_lookup(&bthci_cd, BTHCIUNIT(dev));
        if (sc == NULL)
                return (ENXIO);
        if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0 || !sc->sc_open)
@@ -219,7 +219,7 @@
 {
        struct bthci_softc *sc;
 
-       sc = device_lookup(&bthci_cd, IRFRAMEUNIT(dev));
+       sc = device_lookup(&bthci_cd, BTHCIUNIT(dev));
        if (sc == NULL)
                return (ENXIO);
        if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0 || !sc->sc_open)
@@ -243,7 +243,7 @@
        void *vaddr = addr;
        int error;
 
-       sc = device_lookup(&bthci_cd, IRFRAMEUNIT(dev));
+       sc = device_lookup(&bthci_cd, BTHCIUNIT(dev));
        if (sc == NULL)
                return (ENXIO);
        if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0 || !sc->sc_open)
@@ -284,7 +284,7 @@
 {
        struct bthci_softc *sc;
 
-       sc = device_lookup(&bthci_cd, IRFRAMEUNIT(dev));
+       sc = device_lookup(&bthci_cd, BTHCIUNIT(dev));
        if (sc == NULL)
                return (ENXIO);
        if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0 || !sc->sc_open)