From 1048e6f4a67f2cbee222c65f6a6131ef6bc22586 Mon Sep 17 00:00:00 2001 From: scottl Date: Mon, 13 Dec 2004 03:22:11 +0000 Subject: [PATCH] Allow the acpi_ibm module to be built with ACPI_DEBUG. --- sys/dev/acpi_support/acpi_ibm.c | 5 +++++ sys/dev/acpica/acpivar.h | 1 + sys/modules/acpi/acpi_ibm/Makefile | 1 + 3 files changed, 7 insertions(+) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index 97e5f308d850..e679efb21039 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -38,6 +38,9 @@ #include #include +#define _COMPONENT ACPI_IBM +ACPI_MODULE_NAME("IBM") + #define IBM_RTC_MISCKEY 0x65 #define IBM_RTC_BRIGHTNESS 0x6c #define IBM_RTC_MASK_BRI 0x7 @@ -252,6 +255,8 @@ acpi_ibm_attach(device_t dev) static int acpi_ibm_detach(device_t dev) { + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + struct acpi_ibm_softc *sc = device_get_softc(dev); acpi_SetInteger(acpi_get_handle(dev), IBM_NAME_ENABLE, 0); acpi_ibm_enable_mask(dev, sc->ibm_initialmask); diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 88d041caac20..41f3fdf2fdd6 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -152,6 +152,7 @@ extern struct mtx acpi_mutex; #define ACPI_THERMAL 0x01000000 #define ACPI_TIMER 0x02000000 #define ACPI_ASUS 0x04000000 +#define ACPI_IBM 0x08000000 /* * Constants for different interrupt models used with acpi_SetIntrModel(). diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile index eff6dd8818ce..29f85969ebc8 100644 --- a/sys/modules/acpi/acpi_ibm/Makefile +++ b/sys/modules/acpi/acpi_ibm/Makefile @@ -4,5 +4,6 @@ KMOD= acpi_ibm CFLAGS+= -I/sys/contrib/dev/acpica SRCS= acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h +SRCS+= opt_ddb.h .include