From 2192e342502c94109082e14247e0cad3478306b8 Mon Sep 17 00:00:00 2001 From: msmith Date: Sat, 23 Feb 2002 05:30:54 +0000 Subject: [PATCH] Add our own private defines for driver debug layers. Obsolete the acpi_GetInto* interfaces. Fix a typo to be less appropriate. --- sys/dev/acpica/acpivar.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 06083a1994b..ac86c415b1a 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -102,6 +102,21 @@ extern struct mtx acpi_mutex; # define ACPI_MSLEEP(a, b, c, d, e) tsleep(a, c, d, e) #endif +/* + * ACPI CA does not define layers for non-ACPI CA drivers. + * We define some here within the range provided. + */ +#define ACPI_BUS 0x00010000 +#define ACPI_SYSTEM 0x00020000 +#define ACPI_POWER 0x00040000 +#define ACPI_EC 0x00080000 +#define ACPI_AC_ADAPTER 0x00100000 +#define ACPI_BATTERY 0x00110000 +#define ACPI_BUTTON 0x00120000 +#define ACPI_PROCESSOR 0x00140000 +#define ACPI_THERMAL 0x00180000 +#define ACPI_FAN 0x00200000 + /* * This is a cheap and nasty way to get around the horrid counted list * argument format that AcpiEvalateObject uses. @@ -231,16 +246,12 @@ extern void acpi_EnterDebugger(void); device_printf(dev, x); \ } while (0) +#define ACPI_DEVINFO_PRESENT(x) (((x) & 0x9) == 9) extern BOOLEAN acpi_DeviceIsPresent(device_t dev); +extern BOOLEAN acpi_BatteryIsPresent(device_t dev); extern BOOLEAN acpi_MatchHid(device_t dev, char *hid); extern ACPI_STATUS acpi_GetHandleInScope(ACPI_HANDLE parent, char *path, ACPI_HANDLE *result); extern ACPI_BUFFER *acpi_AllocBuffer(int size); -extern ACPI_STATUS acpi_GetIntoBuffer(ACPI_HANDLE handle, - ACPI_STATUS (*func)(ACPI_HANDLE, ACPI_BUFFER *), - ACPI_BUFFER *buf); -extern ACPI_STATUS acpi_GetTableIntoBuffer(ACPI_TABLE_TYPE table, UINT32 instance, ACPI_BUFFER *buf); -extern ACPI_STATUS acpi_EvaluateIntoBuffer(ACPI_HANDLE object, ACPI_STRING pathname, - ACPI_OBJECT_LIST *params, ACPI_BUFFER *buf); extern ACPI_STATUS acpi_EvaluateInteger(ACPI_HANDLE handle, char *path, int *number); extern ACPI_STATUS acpi_ConvertBufferToInteger(ACPI_BUFFER *bufp, int *number); extern ACPI_STATUS acpi_ForeachPackageObject(ACPI_OBJECT *obj, @@ -328,7 +339,7 @@ extern void acpi_install_wakeup_handler(struct acpi_softc *sc); extern int acpi_sleep_machdep(struct acpi_softc *sc, int state); /* - * Battery Abstruction. + * Battery Abstraction. */ struct acpi_battinfo; struct acpi_battdesc; -- 2.45.2