[src/netbsd-1-5]: src/sys/dev/pci Apply patch (requested by tacha):

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

details:   https://anonhg.NetBSD.org/src/rev/781d8aca88c2
branches:  netbsd-1-5
changeset: 490859:781d8aca88c2
user:      he <he%NetBSD.org@localhost>
date:      Tue Mar 13 21:01:14 2001 +0000

description:
Apply patch (requested by tacha):
  Correct checking of AC97 Input Slot Valid register bits.

diffstat:

 sys/dev/pci/cs4280.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r a0a689a6f191 -r 781d8aca88c2 sys/dev/pci/cs4280.c
--- a/sys/dev/pci/cs4280.c      Tue Mar 13 20:55:05 2001 +0000
+++ b/sys/dev/pci/cs4280.c      Tue Mar 13 21:01:14 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cs4280.c,v 1.4.4.6 2001/02/26 17:53:08 he Exp $        */
+/*     $NetBSD: cs4280.c,v 1.4.4.7 2001/03/13 21:01:14 he Exp $        */
 
 /*
  * Copyright (c) 1999, 2000 Tatoku Ogaito.  All rights reserved.
@@ -986,7 +986,8 @@
 
        /* Wait for valid AC97 input slot */
        n = 0;
-       while (BA0READ4(sc, CS4280_ACISV) != (ACISV_ISV3 | ACISV_ISV4)) {
+       while ((BA0READ4(sc, CS4280_ACISV) & (ACISV_ISV3 | ACISV_ISV4)) != 
+           (ACISV_ISV3 | ACISV_ISV4)) {
                delay(1000);
                if (++n > 1000) {
                        printf("reset_codec: AC97 inputs slot ready timeout\n");
@@ -1703,7 +1704,8 @@
 
        /* Wait for valid AC97 input slot */
        n = 0;
-       while (BA0READ4(sc, CS4280_ACISV) != (ACISV_ISV3 | ACISV_ISV4)) {
+       while ((BA0READ4(sc, CS4280_ACISV) & (ACISV_ISV3 | ACISV_ISV4)) !=
+           (ACISV_ISV3 | ACISV_ISV4)) {
                delay(1000);
                if (++n > 1000) {
                        printf("AC97 inputs slot ready timeout\n");