[src/trunk]: src/sys/dev/pci Don't think that a card is inserted if there is ...

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

details:   https://anonhg.NetBSD.org/src/rev/7604023c7706
branches:  trunk
changeset: 483625:7604023c7706
user:      enami <enami%NetBSD.org@localhost>
date:      Tue Mar 14 10:23:16 2000 +0000

description:
Don't think that a card is inserted if there is a card already in the slot.
Note that powerdown hook calls pccbbintr so that it detect card insertion or
removal during suspension.

diffstat:

 sys/dev/pci/pccbb.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 110061934622 -r 7604023c7706 sys/dev/pci/pccbb.c
--- a/sys/dev/pci/pccbb.c       Tue Mar 14 10:20:09 2000 +0000
+++ b/sys/dev/pci/pccbb.c       Tue Mar 14 10:23:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pccbb.c,v 1.33 2000/03/14 10:20:09 enami Exp $ */
+/*     $NetBSD: pccbb.c,v 1.34 2000/03/14 10:23:16 enami Exp $ */
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -943,7 +943,13 @@
                                            CARDSLOT_EVENT_REMOVAL_CB);
                                }
                        }
-               } else if (0x00 == (sockstate & CB_SOCKET_STAT_CD)) {
+               } else if (0x00 == (sockstate & CB_SOCKET_STAT_CD) &&
+                   /*
+                    * The pccbbintr may called from powerdown hook when
+                    * the system resumed, to detect the card
+                    * insertion/removal during suspension.
+                    */
+                   (sc->sc_flags & CBB_CARDEXIST) == 0) {
                        if (sc->sc_flags & CBB_INSERTING) {
                                untimeout(pci113x_insert, sc);
                        }