diff options
| author |   jordan <jordan@openbsd.org> | 2006-10-19 03:24:45 +0000 |
|---|---|---|
| committer | jordan <jordan@openbsd.org> | 2006-10-19 03:24:45 +0000 |
| commit | bc4762133a8cac46f0b8acd542f20348a80f99a8 (patch) | |
| tree | 024fd38a1a5a0b06d9fb08fb4e75396ac6da85a9 | |
| parent | Fixed acpitz match function (diff) | |
| download | wireguard-openbsd-bc4762133a8cac46f0b8acd542f20348a80f99a8.tar.xz wireguard-openbsd-bc4762133a8cac46f0b8acd542f20348a80f99a8.zip | |
Fixed GPE debug levels
Fixed ref counter on temporary bufferfields
DSDT parsing fully working on IBM Thinkpad
ok marco@
| -rw-r--r-- | sys/dev/acpi/acpi.c | 18 | ||||
| -rw-r--r-- | sys/dev/acpi/dsdt.c | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 52fde7312bf..3ead6295cae 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.57 2006/10/15 15:22:17 jordan Exp $ */ +/* $OpenBSD: acpi.c,v 1.58 2006/10/19 03:24:45 jordan Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -410,7 +410,7 @@ acpi_read_pmreg(struct acpi_softc *sc, int reg, int offset) acpi_read_pmreg(sc, ACPIREG_PM1B_CNT, offset)); case ACPIREG_GPE_STS: __size = 1; - dnprintf(0, "read GPE_STS offset: %.2x %.2x %.2x\n", offset, + dnprintf(50, "read GPE_STS offset: %.2x %.2x %.2x\n", offset, sc->sc_fadt->gpe0_blk_len>>1, sc->sc_fadt->gpe1_blk_len>>1); if (offset < (sc->sc_fadt->gpe0_blk_len >> 1)) { reg = ACPIREG_GPE0_STS; @@ -418,7 +418,7 @@ acpi_read_pmreg(struct acpi_softc *sc, int reg, int offset) break; case ACPIREG_GPE_EN: __size = 1; - dnprintf(0, "read GPE_EN offset: %.2x %.2x %.2x\n", + dnprintf(50, "read GPE_EN offset: %.2x %.2x %.2x\n", offset, sc->sc_fadt->gpe0_blk_len>>1, sc->sc_fadt->gpe1_blk_len>>1); if (offset < (sc->sc_fadt->gpe0_blk_len >> 1)) { @@ -480,7 +480,7 @@ acpi_write_pmreg(struct acpi_softc *sc, int reg, int offset, int regval) break; case ACPIREG_GPE_STS: __size = 1; - dnprintf(0, "write GPE_STS offset: %.2x %.2x %.2x %.2x\n", + dnprintf(50, "write GPE_STS offset: %.2x %.2x %.2x %.2x\n", offset, sc->sc_fadt->gpe0_blk_len>>1, sc->sc_fadt->gpe1_blk_len>>1, regval); if (offset < (sc->sc_fadt->gpe0_blk_len >> 1)) { @@ -489,7 +489,7 @@ acpi_write_pmreg(struct acpi_softc *sc, int reg, int offset, int regval) break; case ACPIREG_GPE_EN: __size = 1; - dnprintf(0, "write GPE_EN offset: %.2x %.2x %.2x %.2x\n", + dnprintf(50, "write GPE_EN offset: %.2x %.2x %.2x %.2x\n", offset, sc->sc_fadt->gpe0_blk_len>>1, sc->sc_fadt->gpe1_blk_len>>1, regval); if (offset < (sc->sc_fadt->gpe0_blk_len >> 1)) { @@ -1117,7 +1117,7 @@ __acpi_enable_gpe(struct acpi_softc *sc, int gpe, int enable) /* Read enabled register */ en = acpi_read_pmreg(sc, ACPIREG_GPE_EN, gpe>>3); - dnprintf(0, "%sabling GPE %.2x (current: %sabled) %.2x\n", + dnprintf(50, "%sabling GPE %.2x (current: %sabled) %.2x\n", enable ? "en" : "dis", gpe, (en & mask) ? "en" : "dis", en); if (enable) en |= mask; @@ -1138,7 +1138,7 @@ acpi_set_gpehandler(struct acpi_softc *sc, int gpe, int (*handler) return -EBUSY; } - dnprintf(0, "Adding GPE handler %.2x (%s)\n", gpe, label); + dnprintf(50, "Adding GPE handler %.2x (%s)\n", gpe, label); sc->gpe_table[gpe].handler = handler; sc->gpe_table[gpe].arg = arg; @@ -1190,7 +1190,7 @@ acpi_init_gpes(struct acpi_softc *sc) sc->sc_lastgpe = sc->sc_fadt->gpe0_blk_len << 2; if (sc->sc_fadt->gpe1_blk_len) { } - dnprintf(0, "Last GPE: %.2x\n", sc->sc_lastgpe); + dnprintf(50, "Last GPE: %.2x\n", sc->sc_lastgpe); /* Allocate GPE table */ sc->gpe_table = malloc(sc->sc_lastgpe * sizeof(struct gpe_block), @@ -1576,7 +1576,7 @@ acpi_isr_thread(void *arg) if (pgpe->active) { pgpe->active = 0; - dnprintf(0, "softgpe: %.2x\n", gpe); + dnprintf(50, "softgpe: %.2x\n", gpe); if (pgpe->handler) { pgpe->handler(sc, gpe, pgpe->arg); } diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c index e31ca170383..50e8935536f 100644 --- a/sys/dev/acpi/dsdt.c +++ b/sys/dev/acpi/dsdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.c,v 1.54 2006/10/19 01:06:54 jordan Exp $ */ +/* $OpenBSD: dsdt.c,v 1.55 2006/10/19 03:24:45 jordan Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> * @@ -1133,6 +1133,7 @@ aml_derefvalue(struct aml_scope *scope, struct aml_value *ref, int mode) tmp->v_field.bitpos = index * 8; tmp->v_field.bitlen = 8; tmp->v_field.ref1 = ref; + aml_addref(ref); } return tmp; default: |