Attempt to fix and document interactions between suspend/resume and pccardc

power x 0.

pccardc power x 0 used to disable the slot.  But a suspend/resume
would reactivate the pccard.  It no longer does that.  Now the
disabling of the slot is sticy until it is reset with power x 1 or the
card is ejected.  This seems closer to correct behavior to me.

o Process all card state changes the same using pccard_do_stat_change().
o Cleanup disabling the card so that we can preserve the state after
  the change.  Basically, don't set it to empty as often as we do.
o On suspend, the new state is "empty" and the laststate is "suspend"
o Document state machine with a diagram of states and edges.  The
  edges are labeld to tell the reader what event causes the external
  state changes.
o "machdep.pccard.pcic_resume_reset" may be obsolete now.  We always
  call the bridge driver's resume method on resume now.  Otherwise cards
  won't automatically show up.  If it needs to stay, I'll add it back.

1 files changed, 2 insertions, 7 deletions

diff --git a/sys/pccard/pcic_isa.c b/sys/pccard/pcic_isa.c
index f90e76f..4383e25 100644
--- a/sys/pccard/pcic_isa.c
+++ b/sys/pccard/pcic_isa.c
@@ -396,13 +396,8 @@ pcicintr1(void *arg)
 				splx(s);
 				return (EIO);
 			}
-			if (chg & PCIC_CDTCH) {
-				if ((sp->getb(sp, PCIC_STATUS) & PCIC_CD) ==
-				    PCIC_CD)
-					pccard_event(sp->slt, card_inserted);
-				else
-					pccard_event(sp->slt, card_removed);
-			}
+			if (chg & PCIC_CDTCH)
+				pcic_do_stat_delta(sp);
 		}
 	}
 	splx(s);