diff options
author | msmith <msmith@FreeBSD.org> | 2001-07-21 10:24:37 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 2001-07-21 10:24:37 +0000 |
commit | a67f578d2b31873dd3b9906157d4998436a6b327 (patch) | |
tree | 1fc3787f42a591447b248bc0c7af5b8d53fd16a7 /sys/dev/acpica/acpi_ec.c | |
parent | bd6df0c72b8ada00c19e59bb38c04b39400a26b4 (diff) | |
download | FreeBSD-src-a67f578d2b31873dd3b9906157d4998436a6b327.zip FreeBSD-src-a67f578d2b31873dd3b9906157d4998436a6b327.tar.gz |
Convert from acpi_strerror() to AcpiFormatException()
Fix dangling include of the dear departed acpi_ecreg.h
Diffstat (limited to 'sys/dev/acpica/acpi_ec.c')
-rw-r--r-- | sys/dev/acpica/acpi_ec.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index 76c114e..2258f18 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -147,7 +147,6 @@ #include "acpi.h" #include <dev/acpica/acpivar.h> -#include <dev/acpica/acpi_ecreg.h> /* * Hooks for the ACPI CA debugging infrastructure @@ -400,7 +399,7 @@ acpi_ec_attach(device_t dev) */ DEBUG_PRINT(TRACE_RESOURCES, ("attaching GPE\n")); if ((Status = acpi_EvaluateInteger(sc->ec_handle, "_GPE", &sc->ec_gpebit)) != AE_OK) { - device_printf(dev, "can't evaluate _GPE - %s\n", acpi_strerror(Status)); + device_printf(dev, "can't evaluate _GPE - %s\n", AcpiFormatException(Status)); return_VALUE(ENXIO); } @@ -415,7 +414,7 @@ acpi_ec_attach(device_t dev) if ((Status = AcpiInstallGpeHandler(sc->ec_gpebit, ACPI_EVENT_LEVEL_TRIGGERED | ACPI_EVENT_EDGE_TRIGGERED, EcGpeHandler, sc)) != AE_OK) { device_printf(dev, "can't install GPE handler for %s - %s\n", - acpi_name(sc->ec_handle), acpi_strerror(Status)); + acpi_name(sc->ec_handle), AcpiFormatException(Status)); return_VALUE(ENXIO); } @@ -426,7 +425,7 @@ acpi_ec_attach(device_t dev) if ((Status = AcpiInstallAddressSpaceHandler(sc->ec_handle, ACPI_ADR_SPACE_EC, EcSpaceHandler, EcSpaceSetup, sc)) != AE_OK) { device_printf(dev, "can't install address space handler for %s - %s\n", - acpi_name(sc->ec_handle), acpi_strerror(Status)); + acpi_name(sc->ec_handle), AcpiFormatException(Status)); panic("very suck"); return_VALUE(ENXIO); } @@ -470,7 +469,7 @@ EcGpeQueryHandler(void *Context) * If we failed to get anything from the EC, give up */ if (Status != AE_OK) { - device_printf(sc->ec_dev, "GPE query failed - %s\n", acpi_strerror(Status)); + device_printf(sc->ec_dev, "GPE query failed - %s\n", AcpiFormatException(Status)); break; } @@ -485,7 +484,7 @@ EcGpeQueryHandler(void *Context) */ if (Status != AE_OK && (Data != 0 || Status != AE_NOT_FOUND)) { device_printf(sc->ec_dev, "evaluation of GPE query method %s failed - %s\n", - qxx, acpi_strerror(Status)); + qxx, AcpiFormatException(Status)); } } /* I know I request Level trigger cleanup */ |