diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2014-03-13 03:52:57 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2014-03-13 03:52:57 +0000 |
| commit | ddb81f81c6b53bdfc4bba2ced060724d2beb0270 (patch) | |
| tree | 84af82316dccb1276e4f2db46dffa3136279a846 /sys/arch/zaurus | |
| parent | 755327f10676720e29b6c5b380070fbdca133628 (diff) | |
get rid of the assumption that the head of the alldevs list is the
"mainbus" device. this breaks when mpath is enabled because it
attaches before mainbus and therefore takes the head position.
have autoconf provide device_mainbus() which looks up mainbus_cd,
and use that instead.
discussed with deraadt who just wants mpath stuff to move forward
despite there being many ways to shine this particular turd.
Diffstat (limited to 'sys/arch/zaurus')
| -rw-r--r-- | sys/arch/zaurus/dev/zaurus_apm.c | 13 | ||||
| -rw-r--r-- | sys/arch/zaurus/zaurus/zaurus_machdep.c | 8 |
2 files changed, 12 insertions, 9 deletions
diff --git a/sys/arch/zaurus/dev/zaurus_apm.c b/sys/arch/zaurus/dev/zaurus_apm.c index b01ffd2a5dc..942f4bca837 100644 --- a/sys/arch/zaurus/dev/zaurus_apm.c +++ b/sys/arch/zaurus/dev/zaurus_apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zaurus_apm.c,v 1.24 2013/12/06 21:03:05 deraadt Exp $ */ +/* $OpenBSD: zaurus_apm.c,v 1.25 2014/03/13 03:52:56 dlg Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de> @@ -570,7 +570,7 @@ zapm_suspend(struct pxa2x0_apm_softc *pxa_sc) struct zapm_softc *sc = (struct zapm_softc *)pxa_sc; bufq_quiesce(); - config_suspend(TAILQ_FIRST(&alldevs), DVACT_QUIESCE); + config_suspend(device_mainbus(), DVACT_QUIESCE); /* Poll in suspended mode and forget the discharge timeout. */ sc->sc_suspended = 1; @@ -642,6 +642,7 @@ zapm_resume(struct pxa2x0_apm_softc *pxa_sc) void zapm_poweroff(void) { + struct device *mainbus = device_mainbus(); struct pxa2x0_apm_softc *sc; int s; @@ -653,14 +654,14 @@ zapm_poweroff(void) #endif /* NWSDISPLAY > 0 */ s = splhigh(); - config_suspend(TAILQ_FIRST(&alldevs), DVACT_SUSPEND); + config_suspend(mainbus, DVACT_SUSPEND); /* XXX * Flag to disk drivers that they should "power down" the disk * when we get to DVACT_POWERDOWN. */ boothowto |= RB_POWERDOWN; - config_suspend(TAILQ_FIRST(&alldevs), DVACT_POWERDOWN); + config_suspend(mainbus, DVACT_POWERDOWN); boothowto &= ~RB_POWERDOWN; /* XXX enable charging during suspend */ @@ -682,12 +683,12 @@ zapm_poweroff(void) zapm_restart(); /* NOTREACHED */ - config_suspend(TAILQ_FIRST(&alldevs), DVACT_RESUME); + config_suspend(mainbus, DVACT_RESUME); splx(s); bufq_restart(); - config_suspend(TAILQ_FIRST(&alldevs), DVACT_WAKEUP); + config_suspend(mainbus, DVACT_WAKEUP); #if NWSDISPLAY > 0 wsdisplay_resume(); diff --git a/sys/arch/zaurus/zaurus/zaurus_machdep.c b/sys/arch/zaurus/zaurus/zaurus_machdep.c index 2ccc0236ad6..68bb1738332 100644 --- a/sys/arch/zaurus/zaurus/zaurus_machdep.c +++ b/sys/arch/zaurus/zaurus/zaurus_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zaurus_machdep.c,v 1.40 2013/09/28 14:16:42 miod Exp $ */ +/* $OpenBSD: zaurus_machdep.c,v 1.41 2014/03/13 03:52:56 dlg Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -289,6 +289,7 @@ int comcnmode = CONMODE; void boot(int howto) { + struct device *mainbus; extern int lid_suspend; if (howto & RB_POWERDOWN) @@ -323,8 +324,9 @@ boot(int howto) haltsys: doshutdownhooks(); - if (!TAILQ_EMPTY(&alldevs)) - config_suspend(TAILQ_FIRST(&alldevs), DVACT_POWERDOWN); + mainbus = device_mainbus(); + if (mainbus != NULL) + config_suspend(mainbus, DVACT_POWERDOWN); /* Make sure IRQ's are disabled */ IRQdisable; |