[src/netbsd-2-0]: src/sys/dev/pci Pullup rev 1.62 (requested by kent in ticke...

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

details:   https://anonhg.NetBSD.org/src/rev/74a9b41117a9
branches:  netbsd-2-0
changeset: 562688:74a9b41117a9
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Sep 22 20:58:09 2004 +0000

description:
Pullup rev 1.62 (requested by kent in ticket #867)

ac97_host_if::reset() returns non-zero value if codec reset fails, and
ac97 is not attached in that case. PR#26973

diffstat:

 sys/dev/pci/auich.c |  26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diffs (63 lines):

diff -r 465e7ee9d980 -r 74a9b41117a9 sys/dev/pci/auich.c
--- a/sys/dev/pci/auich.c       Wed Sep 22 20:58:06 2004 +0000
+++ b/sys/dev/pci/auich.c       Wed Sep 22 20:58:09 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auich.c,v 1.58 2004/01/13 14:42:50 kent Exp $  */
+/*     $NetBSD: auich.c,v 1.58.2.1 2004/09/22 20:58:09 jmc Exp $       */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.58 2004/01/13 14:42:50 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.58.2.1 2004/09/22 20:58:09 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -322,7 +322,7 @@
 int    auich_attach_codec(void *, struct ac97_codec_if *);
 int    auich_read_codec(void *, u_int8_t, u_int16_t *);
 int    auich_write_codec(void *, u_int8_t, u_int16_t);
-void   auich_reset_codec(void *);
+int    auich_reset_codec(void *);
 
 static const struct auich_devtype {
        int     vendor;
@@ -600,7 +600,7 @@
        return 0;
 }
 
-void
+int
 auich_reset_codec(void *v)
 {
        struct auich_softc *sc = v;
@@ -620,17 +620,17 @@
        }
        if (i <= 0) {
                printf("%s: auich_reset_codec: time out\n", sc->sc_dev.dv_xname);
-               /* XXX: should not attach the audio device */
-       } else {
+               return ETIMEDOUT;
+       }
 #ifdef DEBUG
-               if (status & ICH_SCR)
-                       printf("%s: The 2nd codec is ready.\n",
-                              sc->sc_dev.dv_xname);
-               if (status & ICH_S2CR)
-                       printf("%s: The 3rd codec is ready.\n",
-                              sc->sc_dev.dv_xname);
+       if (status & ICH_SCR)
+               printf("%s: The 2nd codec is ready.\n",
+                      sc->sc_dev.dv_xname);
+       if (status & ICH_S2CR)
+               printf("%s: The 3rd codec is ready.\n",
+                      sc->sc_dev.dv_xname);
 #endif
-       }
+       return 0;
 }
 
 int