[src/trunk]: src/sys/dev/ic Do not try to lock out MAC until the firmware cor...

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

details:   https://anonhg.NetBSD.org/src/rev/0d8eb7130e91
branches:  trunk
changeset: 484182:0d8eb7130e91
user:      onoe <onoe%NetBSD.org@localhost>
date:      Mon Mar 27 12:54:59 2000 +0000

description:
Do not try to lock out MAC until the firmware correctly start up, to avoid
"awi: failed to lock interrupt" message when IRQ are shared with other
devices [PR kern/9660]

diffstat:

 sys/dev/ic/awi.c    |  6 ++++--
 sys/dev/ic/awivar.h |  3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r d63e536231d2 -r 0d8eb7130e91 sys/dev/ic/awi.c
--- a/sys/dev/ic/awi.c  Mon Mar 27 12:52:45 2000 +0000
+++ b/sys/dev/ic/awi.c  Mon Mar 27 12:54:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awi.c,v 1.14 2000/03/27 12:52:45 onoe Exp $    */
+/*     $NetBSD: awi.c,v 1.15 2000/03/27 12:54:59 onoe Exp $    */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -867,7 +867,7 @@
        u_int16_t status;
        int error, handled = 0, ocansleep;
 
-       if (sc->sc_invalid)
+       if (!sc->sc_enabled || !sc->sc_enab_intr || sc->sc_invalid)
                return 0;
 
        am79c930_gcr_setbits(&sc->sc_chip,
@@ -1490,6 +1490,7 @@
        int i, error;
        u_int8_t banner[AWI_BANNER_LEN];
 
+       sc->sc_enab_intr = 0;
        awi_drvstate(sc, AWI_DRV_RESET);
 
        /* reset firmware */
@@ -1535,6 +1536,7 @@
        }
 
        /* initializing interrupt */
+       sc->sc_enab_intr = 1;
        error = awi_intr_lock(sc);
        if (error)
                return error;
diff -r d63e536231d2 -r 0d8eb7130e91 sys/dev/ic/awivar.h
--- a/sys/dev/ic/awivar.h       Mon Mar 27 12:52:45 2000 +0000
+++ b/sys/dev/ic/awivar.h       Mon Mar 27 12:54:59 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awivar.h,v 1.6 2000/03/22 11:22:22 onoe Exp $ */
+/* $NetBSD: awivar.h,v 1.7 2000/03/27 12:55:00 onoe Exp $ */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -105,6 +105,7 @@
                                sc_busy:1,
                                sc_cansleep:1,
                                sc_invalid:1,
+                               sc_enab_intr:1,
                                sc_cmd_inprog:1,
                                sc_format_llc:1,
                                sc_start_bss:1,