diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2006-02-17 06:57:59 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2006-02-17 06:57:59 +0000 |
| commit | 31da0da33f29d78ec378f9f2492774a0092ea480 (patch) | |
| tree | f07dfe012d10adbecf6bc6b5a29150f3e97e0096 /sys/dev | |
| parent | fb2d1b0d8188c97adbdfb31cb20213fbed695383 (diff) | |
Use tsleep instead of delay when !cold.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index fc63fe317e5..b8354d672da 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.30 2006/02/17 05:10:39 marco Exp $ */ +/* $OpenBSD: acpi.c,v 1.31 2006/02/17 06:57:58 marco Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -164,9 +164,11 @@ acpi_gasio(struct acpi_softc *sc, int iodir, int iospace, uint64_t address, } } - /* XXX bah! blame ACPI spec for this */ - /* make this a tsleep after !cold */ - delay(10000); + /* XXX bah! blame ACPI spec for this, cleanup later */ + if (cold) + delay(10000); + else + tsleep(sc, PWAIT, "acpiwait", 1); } acpi_bus_space_unmap(sc->sc_iot, ioh, len, &ioaddr); break; |