From owner-cvs-all Fri Jul 27 0:21:49 2001 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1561937B403; Fri, 27 Jul 2001 00:21:43 -0700 (PDT) (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f6R7Lh826050; Fri, 27 Jul 2001 00:21:43 -0700 (PDT) (envelope-from imp) Message-Id: <200107270721.f6R7Lh826050@freefall.freebsd.org> From: Warner Losh Date: Fri, 27 Jul 2001 00:21:43 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/pccard cardinfo.h pccard.c pcic.c pcic_isa.c pcicvar.h slot.h X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG imp 2001/07/27 00:21:43 PDT Modified files: sys/pccard cardinfo.h pccard.c pcic.c pcic_isa.c pcicvar.h slot.h Log: 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. Revision Changes Path 1.22 +29 -1 src/sys/pccard/cardinfo.h 1.129 +18 -25 src/sys/pccard/pccard.c 1.149 +18 -19 src/sys/pccard/pcic.c 1.14 +3 -8 src/sys/pccard/pcic_isa.c 1.16 +2 -1 src/sys/pccard/pcicvar.h 1.32 +2 -2 src/sys/pccard/slot.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message