diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2008-05-16 06:50:56 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2008-05-16 06:50:56 +0000 |
| commit | 1b882095f169e506c0d98c8ddbb86c6e2e8856af (patch) | |
| tree | 4fd5ddca8f701a398926df6a1863a08e5606b9c9 /sys/dev/acpi/acpibtn.c | |
| parent | 3093a6ff905bedc86e26f69bd1e69be1d02e5d46 (diff) | |
back out jordans new parser.
it didnt have enough oks from the right people, it did break machines
that were previously working, and it bloated the RAMDISKS and install
media beyond the constraints of the media.
requested by deraadt@
Diffstat (limited to 'sys/dev/acpi/acpibtn.c')
| -rw-r--r-- | sys/dev/acpi/acpibtn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/acpi/acpibtn.c b/sys/dev/acpi/acpibtn.c index cc1e70853f3..d21b87789a0 100644 --- a/sys/dev/acpi/acpibtn.c +++ b/sys/dev/acpi/acpibtn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpibtn.c,v 1.17 2008/05/14 05:24:36 jordan Exp $ */ +/* $OpenBSD: acpibtn.c,v 1.18 2008/05/16 06:50:55 dlg Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -84,7 +84,7 @@ acpibtn_attach(struct device *parent, struct device *self, void *aux) struct acpi_attach_args *aa = aux; sc->sc_acpi = (struct acpi_softc *)parent; - sc->sc_devnode = aa->aaa_node; + sc->sc_devnode = aa->aaa_node->child; if (!strcmp(aa->aaa_dev, ACPI_DEV_LD)) sc->sc_btn_type = ACPIBTN_LID; @@ -97,9 +97,9 @@ acpibtn_attach(struct device *parent, struct device *self, void *aux) acpibtn_getsta(sc); - printf(": %s\n", sc->sc_devnode->name); + printf(": %s\n", sc->sc_devnode->parent->name); - aml_register_notify(sc->sc_devnode, aa->aaa_dev, acpibtn_notify, + aml_register_notify(sc->sc_devnode->parent, aa->aaa_dev, acpibtn_notify, sc, ACPIDEV_NOPOLL); } @@ -120,7 +120,7 @@ acpibtn_notify(struct aml_node *node, int notify_type, void *arg) struct acpibtn_softc *sc = arg; dnprintf(10, "acpibtn_notify: %.2x %s\n", notify_type, - sc->sc_devnode->name); + sc->sc_devnode->parent->name); switch (sc->sc_btn_type) { case ACPIBTN_LID: |