diff options
| author | njl <njl@FreeBSD.org> | 2004-12-13 23:31:46 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2004-12-13 23:31:46 +0000 |
| commit | 1af716f4fc0088ebb0635bf1011aa021e1a57144 (patch) | |
| tree | f9313bd6572e841ab2702a33bee412b6747eb0af | |
| parent | 6eba135a351d1f0eca1d8b3a0c0916aae13cd517 (diff) | |
| download | FreeBSD-src-1af716f4fc0088ebb0635bf1011aa021e1a57144.zip FreeBSD-src-1af716f4fc0088ebb0635bf1011aa021e1a57144.tar.gz | |
Unify ACPI_DEBUG support for all OEM drivers under ACPI_OEM. Since more than
one will never be supported on the same platform, this does not hurt
debugging.
MFC after: 3 days
| -rw-r--r-- | share/man/man4/acpi.4 | 2 | ||||
| -rw-r--r-- | sys/dev/acpi_support/acpi_asus.c | 2 | ||||
| -rw-r--r-- | sys/dev/acpi_support/acpi_ibm.c | 2 | ||||
| -rw-r--r-- | sys/dev/acpi_support/acpi_panasonic.c | 3 | ||||
| -rw-r--r-- | sys/dev/acpi_support/acpi_sony.c | 5 | ||||
| -rw-r--r-- | sys/dev/acpi_support/acpi_toshiba.c | 3 | ||||
| -rw-r--r-- | sys/dev/acpica/acpivar.h | 3 |
7 files changed, 16 insertions, 4 deletions
diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4 index de6611b..34a32ee 100644 --- a/share/man/man4/acpi.4 +++ b/share/man/man4/acpi.4 @@ -109,6 +109,8 @@ The supported layers are: .It .Li ACPI_FAN .It +.Li ACPI_OEM +.It .Li ACPI_POWER .It .Li ACPI_PROCESSOR diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c index d65e187..372a9c3 100644 --- a/sys/dev/acpi_support/acpi_asus.c +++ b/sys/dev/acpi_support/acpi_asus.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <dev/acpica/acpivar.h> #include <dev/led/led.h> -#define _COMPONENT ACPI_ASUS +#define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASUS") struct acpi_asus_model { diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index e679efb..adcd760 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -38,7 +38,7 @@ #include <sys/sysctl.h> #include <machine/clock.h> -#define _COMPONENT ACPI_IBM +#define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("IBM") #define IBM_RTC_MISCKEY 0x65 diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c index 452344b..0434ae8 100644 --- a/sys/dev/acpi_support/acpi_panasonic.c +++ b/sys/dev/acpi_support/acpi_panasonic.c @@ -40,6 +40,9 @@ __FBSDID("$FreeBSD$"); #include "acpi.h" #include <dev/acpica/acpivar.h> +#define _COMPONENT ACPI_OEM +ACPI_MODULE_NAME("Panasonic") + /* Debug */ #undef ACPI_PANASONIC_DEBUG diff --git a/sys/dev/acpi_support/acpi_sony.c b/sys/dev/acpi_support/acpi_sony.c index 50b58a2..dbdb062 100644 --- a/sys/dev/acpi_support/acpi_sony.c +++ b/sys/dev/acpi_support/acpi_sony.c @@ -35,9 +35,14 @@ #include <sys/module.h> #include <dev/acpica/acpivar.h> #include <sys/sysctl.h> + +#define _COMPONENT ACPI_OEM +ACPI_MODULE_NAME("Sony") + #define ACPI_SONY_GET_BRIGHTNESS "GBRT" #define ACPI_SONY_SET_BRIGHTNESS "SBRT" #define ACPI_SONY_GET_PID "GPID" + /* * SNY5001 * [GS]BRT [GS]PBR [GS]CTR [GS]PCR [GS]CMI [CDPW GCDP]? GWDP PWAK PWRN diff --git a/sys/dev/acpi_support/acpi_toshiba.c b/sys/dev/acpi_support/acpi_toshiba.c index 9bb9137..3f68425 100644 --- a/sys/dev/acpi_support/acpi_toshiba.c +++ b/sys/dev/acpi_support/acpi_toshiba.c @@ -37,6 +37,9 @@ __FBSDID("$FreeBSD$"); #include "acpi.h" #include <dev/acpica/acpivar.h> +#define _COMPONENT ACPI_OEM +ACPI_MODULE_NAME("Toshiba") + /* * Toshiba HCI interface definitions * diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 41f3fdf..a06717e 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -151,8 +151,7 @@ extern struct mtx acpi_mutex; #define ACPI_PROCESSOR 0x00800000 #define ACPI_THERMAL 0x01000000 #define ACPI_TIMER 0x02000000 -#define ACPI_ASUS 0x04000000 -#define ACPI_IBM 0x08000000 +#define ACPI_OEM 0x04000000 /* * Constants for different interrupt models used with acpi_SetIntrModel(). |
