Module Name: src
Committed By: mlelstv
Date: Wed Sep 16 10:47:55 UTC 2009
Modified Files:
src/sys/arch/i386/acpi: vald_acpi.c
src/sys/arch/x86/x86: mpacpi.c
src/sys/dev/acpi: acpi.c acpi_bat.c acpi_ec.c acpi_pci_link.c
acpi_powerres.c acpi_resource.c acpi_tz.c acpireg.h aiboost.c
asus_acpi.c dalb_acpi.c fdc_acpi.c sony_acpi.c
Log Message:
Allow for 'options ACPI_DEBUG' by providing module declarations
and using memory allocation macros instead of calling AcpiOs* stubs
directly.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/acpi/vald_acpi.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpi_pci_link.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_powerres.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/acpi_resource.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/acpi/acpi_tz.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpireg.h
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/acpi/aiboost.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/asus_acpi.c \
src/sys/dev/acpi/sony_acpi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/dalb_acpi.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/fdc_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/acpi/vald_acpi.c
diff -u src/sys/arch/i386/acpi/vald_acpi.c:1.29 src/sys/arch/i386/acpi/vald_acpi.c:1.30
--- src/sys/arch/i386/acpi/vald_acpi.c:1.29 Sun May 4 16:16:56 2008
+++ src/sys/arch/i386/acpi/vald_acpi.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vald_acpi.c,v 1.29 2008/05/04 16:16:56 xtraeme Exp $ */
+/* $NetBSD: vald_acpi.c,v 1.30 2009/09/16 10:47:54 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.29 2008/05/04 16:16:56 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.30 2009/09/16 10:47:54 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,6 +86,9 @@
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("vald_acpi")
+
#define GHCI_WORDS 6
#define GHCI_FIFO_EMPTY 0x8c00
#define GHCI_NOT_SUPPORT 0x8000
@@ -350,7 +353,7 @@
ArgList.Pointer = Arg;
buf.Pointer = NULL;
- buf.Length = ACPI_ALLOCATE_BUFFER;
+ buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
rv = AcpiEvaluateObject(sc->sc_node->ad_handle,
"GHCI", &ArgList, &buf);
@@ -374,7 +377,7 @@
}
if (buf.Pointer)
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
return (rv);
}
@@ -408,7 +411,7 @@
ArgList.Pointer = Arg;
buf.Pointer = NULL;
- buf.Length = ACPI_ALLOCATE_BUFFER;
+ buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
rv = AcpiEvaluateObject(sc->sc_node->ad_handle,
"GHCI", &ArgList, &buf);
@@ -427,7 +430,7 @@
}
if (buf.Pointer)
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
return (rv);
}
@@ -457,10 +460,10 @@
printf("_BCL retrun: %d packages\n", param->Package.Count);
sc->lcd_num = param->Package.Count;
- sc->lcd_level = AcpiOsAllocate(sizeof(int) * sc->lcd_num);
+ sc->lcd_level = ACPI_ALLOCATE(sizeof(int) * sc->lcd_num);
if (sc->lcd_level == NULL) {
if (buf.Pointer)
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
return (AE_NO_MEMORY);
}
@@ -490,7 +493,7 @@
}
if (buf.Pointer)
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
return (AE_OK);
}
Index: src/sys/arch/x86/x86/mpacpi.c
diff -u src/sys/arch/x86/x86/mpacpi.c:1.77 src/sys/arch/x86/x86/mpacpi.c:1.78
--- src/sys/arch/x86/x86/mpacpi.c:1.77 Tue Aug 18 16:41:03 2009
+++ src/sys/arch/x86/x86/mpacpi.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mpacpi.c,v 1.77 2009/08/18 16:41:03 jmcneill Exp $ */
+/* $NetBSD: mpacpi.c,v 1.78 2009/09/16 10:47:54 mlelstv Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.77 2009/08/18 16:41:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.78 2009/09/16 10:47:54 mlelstv Exp $");
#include "acpica.h"
#include "opt_acpi.h"
@@ -75,6 +75,9 @@
#include <dev/cons.h>
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("mpacpi")
+
#include "pci.h"
#include "ioapic.h"
#include "lapic.h"
@@ -554,14 +557,14 @@
/* add this device to the list only if it's active */
if ((devinfo->Valid & ACPI_VALID_STA) == 0 ||
(devinfo->CurrentStatus & ACPI_STA_OK) == ACPI_STA_OK) {
- AcpiOsFree(devinfo);
+ ACPI_FREE(devinfo);
dev = kmem_zalloc(sizeof(struct ac_dev), KM_SLEEP);
if (dev == NULL)
return -1;
dev->handle = current;
TAILQ_INSERT_HEAD(&dev_list, dev, list);
} else
- AcpiOsFree(devinfo);
+ ACPI_FREE(devinfo);
rv = AcpiGetParent(current, &parent);
if (ACPI_FAILURE(rv))
@@ -578,7 +581,7 @@
break;
}
- AcpiOsFree(devinfo);
+ ACPI_FREE(devinfo);
}
/*
@@ -645,7 +648,7 @@
mpr = kmem_zalloc(sizeof(struct mpacpi_pcibus), KM_SLEEP);
if (mpr == NULL) {
- AcpiOsFree(devinfo);
+ ACPI_FREE(devinfo);
return AE_NO_MEMORY;
}
@@ -697,7 +700,7 @@
mpacpi_npci++;
out:
- AcpiOsFree(devinfo);
+ ACPI_FREE(devinfo);
return AE_OK;
}
@@ -820,7 +823,7 @@
mpb->mb_intrs = mpi;
}
- AcpiOsFree(mpr->mpr_buf.Pointer);
+ ACPI_FREE(mpr->mpr_buf.Pointer);
mpr->mpr_buf.Pointer = NULL; /* be preventive to bugs */
if (mp_verbose > 1)
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.131 src/sys/dev/acpi/acpi.c:1.132
--- src/sys/dev/acpi/acpi.c:1.131 Tue Aug 25 10:34:08 2009
+++ src/sys/dev/acpi/acpi.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.131 2009/08/25 10:34:08 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.132 2009/09/16 10:47:54 mlelstv Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.131 2009/08/25 10:34:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.132 2009/09/16 10:47:54 mlelstv Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -94,6 +94,9 @@
#include <dev/acpi/acpidevs_data.h>
#endif
+#define _COMPONENT ACPI_TOOLS
+ACPI_MODULE_NAME ("acpi")
+
#if defined(ACPI_PCI_FIXUP)
#error The option ACPI_PCI_FIXUP has been obsoleted by PCI_INTR_FIXUP_DISABLED. Please adjust your kernel configuration file.
#endif
@@ -834,7 +837,7 @@
}
(void)AcpiGetObjectInfo(handle, &newdi);
- AcpiOsFree(*di);
+ ACPI_FREE(*di);
*di = newdi;
#ifdef ACPI_DEBUG
@@ -964,7 +967,7 @@
pnpstr);
buf.Pointer = NULL;
- buf.Length = ACPI_ALLOCATE_BUFFER;
+ buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
rv = AcpiEvaluateObject(aa->aa_node->ad_handle,
"_STR", NULL, &buf);
if (ACPI_SUCCESS(rv)) {
@@ -980,7 +983,7 @@
aprint_normal("type %d ",obj->Type);
break;
}
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
}
#ifdef ACPIVERBOSE
else {
@@ -1182,18 +1185,18 @@
handle = ACPI_ROOT_OBJECT;
buf.Pointer = NULL;
- buf.Length = ACPI_ALLOCATE_BUFFER;
+ buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
rv = AcpiEvaluateObjectTyped(handle, path, NULL, &buf, ACPI_TYPE_STRING);
if (ACPI_SUCCESS(rv)) {
ACPI_OBJECT *param = buf.Pointer;
const char *ptr = param->String.Pointer;
size_t len = param->String.Length;
- if ((*stringp = AcpiOsAllocate(len)) == NULL)
+ if ((*stringp = ACPI_ALLOCATE(len)) == NULL)
rv = AE_NO_MEMORY;
else
(void)memcpy(*stringp, ptr, len);
- AcpiOsFree(param);
+ ACPI_FREE(param);
}
return rv;
@@ -1204,7 +1207,7 @@
* acpi_eval_struct:
*
* Evaluate a more complex structure.
- * Caller must free buf.Pointer by AcpiOsFree().
+ * Caller must free buf.Pointer by ACPI_FREE().
*/
ACPI_STATUS
acpi_eval_struct(ACPI_HANDLE handle, const char *path, ACPI_BUFFER *bufp)
@@ -1215,7 +1218,7 @@
handle = ACPI_ROOT_OBJECT;
bufp->Pointer = NULL;
- bufp->Length = ACPI_ALLOCATE_BUFFER;
+ bufp->Length = ACPI_ALLOCATE_LOCAL_BUFFER;
rv = AcpiEvaluateObject(handle, path, NULL, bufp);
@@ -1270,14 +1273,14 @@
* acpi_get:
*
* Fetch data info the specified (empty) ACPI buffer.
- * Caller must free buf.Pointer by AcpiOsFree().
+ * Caller must free buf.Pointer by ACPI_FREE().
*/
ACPI_STATUS
acpi_get(ACPI_HANDLE handle, ACPI_BUFFER *buf,
ACPI_STATUS (*getit)(ACPI_HANDLE, ACPI_BUFFER *))
{
buf->Pointer = NULL;
- buf->Length = ACPI_ALLOCATE_BUFFER;
+ buf->Length = ACPI_ALLOCATE_LOCAL_BUFFER;
return (*getit)(handle, buf);
}
@@ -1342,7 +1345,7 @@
AcpiDisableGpe(NULL, elt[0].Integer.Value, ACPI_NOT_ISR);
out:
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
}
/*
@@ -1563,9 +1566,9 @@
out3:
free(bufn.Pointer, M_ACPI);
out2:
- AcpiOsFree(bufc.Pointer);
+ ACPI_FREE(bufc.Pointer);
out1:
- AcpiOsFree(bufp.Pointer);
+ ACPI_FREE(bufp.Pointer);
out:
return rv;
}
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.72 src/sys/dev/acpi/acpi_bat.c:1.73
--- src/sys/dev/acpi/acpi_bat.c:1.72 Tue Aug 25 10:34:08 2009
+++ src/sys/dev/acpi/acpi_bat.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.72 2009/08/25 10:34:08 jmcneill Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.73 2009/09/16 10:47:54 mlelstv Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.72 2009/08/25 10:34:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.73 2009/09/16 10:47:54 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,6 +92,9 @@
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#define _COMPONENT ACPI_BAT_COMPONENT
+ACPI_MODULE_NAME ("acpi_bat")
+
/* sensor indexes */
#define ACPIBAT_PRESENT 0
#define ACPIBAT_DCAPACITY 1
@@ -417,7 +420,7 @@
rv = AE_OK;
out:
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
return rv;
}
@@ -512,7 +515,7 @@
rv = AE_OK;
out:
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
return rv;
}
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.56 src/sys/dev/acpi/acpi_ec.c:1.57
--- src/sys/dev/acpi/acpi_ec.c:1.56 Mon Jul 6 00:54:00 2009
+++ src/sys/dev/acpi/acpi_ec.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.56 2009/07/06 00:54:00 alc Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.57 2009/09/16 10:47:54 mlelstv Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <[email protected]>.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.56 2009/07/06 00:54:00 alc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.57 2009/09/16 10:47:54 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,9 +71,13 @@
#include <sys/bus.h>
+#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_ecvar.h>
+#define _COMPONENT ACPI_EC_COMPONENT
+ACPI_MODULE_NAME ("acpi_ec")
+
/* Maximum time to wait for global ACPI lock in ms */
#define EC_LOCK_TIMEOUT 5
@@ -438,19 +442,19 @@
if (p->Type == ACPI_TYPE_INTEGER) {
*gpe_handle = NULL;
*gpebit = p->Integer.Value;
- AcpiOsFree(p);
+ ACPI_FREE(p);
return true;
}
if (p->Type != ACPI_TYPE_PACKAGE) {
aprint_error_dev(self, "_GPE is neither integer nor package\n");
- AcpiOsFree(p);
+ ACPI_FREE(p);
return false;
}
if (p->Package.Count != 2) {
aprint_error_dev(self, "_GPE package does not contain 2 elements\n");
- AcpiOsFree(p);
+ ACPI_FREE(p);
return false;
}
@@ -466,24 +470,24 @@
if (rv != AE_OK) {
aprint_error_dev(self,
"_GPE device reference unresolvable\n");
- AcpiOsFree(p);
+ ACPI_FREE(p);
return false;
}
break;
default:
aprint_error_dev(self, "_GPE device reference incorrect\n");
- AcpiOsFree(p);
+ ACPI_FREE(p);
return false;
}
c = &p->Package.Elements[1];
if (c->Type != ACPI_TYPE_INTEGER) {
aprint_error_dev(self,
"_GPE package needs integer as 2nd field\n");
- AcpiOsFree(p);
+ ACPI_FREE(p);
return false;
}
*gpebit = c->Integer.Value;
- AcpiOsFree(p);
+ ACPI_FREE(p);
return true;
}
Index: src/sys/dev/acpi/acpi_pci_link.c
diff -u src/sys/dev/acpi/acpi_pci_link.c:1.14 src/sys/dev/acpi/acpi_pci_link.c:1.15
--- src/sys/dev/acpi/acpi_pci_link.c:1.14 Mon Nov 17 23:29:49 2008
+++ src/sys/dev/acpi/acpi_pci_link.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_link.c,v 1.14 2008/11/17 23:29:49 joerg Exp $ */
+/* $NetBSD: acpi_pci_link.c,v 1.15 2009/09/16 10:47:54 mlelstv Exp $ */
/*-
* Copyright (c) 2002 Mitsuru IWASAKI <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.14 2008/11/17 23:29:49 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.15 2009/09/16 10:47:54 mlelstv Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -43,6 +43,10 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
+#define _COMPONENT ACPI_BUS_COMPONENT
+ACPI_MODULE_NAME ("acpi_pci_link")
+
+
#define NUM_ISA_INTERRUPTS 16
#define NUM_ACPI_INTERRUPTS 256
@@ -742,7 +746,7 @@
/* Fetch the _CRS. */
crsbuf.Pointer = NULL;
- crsbuf.Length = ACPI_ALLOCATE_BUFFER;
+ crsbuf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
status = AcpiGetCurrentResources(sc->pl_handle, &crsbuf);
if (ACPI_SUCCESS(status) && crsbuf.Pointer == NULL)
status = AE_NO_MEMORY;
@@ -820,8 +824,8 @@
printf("%s: Unable to build resources: %s\n",
sc->pl_name, AcpiFormatException(status));
if (srsbuf->Pointer != NULL)
- AcpiOsFree(srsbuf->Pointer);
- AcpiOsFree(crsbuf.Pointer);
+ ACPI_FREE(srsbuf->Pointer);
+ ACPI_FREE(crsbuf.Pointer);
return (status);
}
}
@@ -831,7 +835,7 @@
if (resource >= end)
break;
}
- AcpiOsFree(crsbuf.Pointer);
+ ACPI_FREE(crsbuf.Pointer);
return (AE_OK);
}
@@ -885,7 +889,7 @@
printf("%s: Unable to build resources: %s\n",
sc->pl_name, AcpiFormatException(status));
if (srsbuf->Pointer != NULL)
- AcpiOsFree(srsbuf->Pointer);
+ ACPI_FREE(srsbuf->Pointer);
return (status);
}
}
@@ -966,7 +970,7 @@
if (resource >= end)
break;
}
- AcpiOsFree(srsbuf.Pointer);
+ ACPI_FREE(srsbuf.Pointer);
return (AE_OK);
}
@@ -1165,7 +1169,7 @@
TAILQ_FOREACH(sc, &acpi_pci_linkdevs, pl_list) {
ACPI_SERIAL_BEGIN(pci_link);
if (ACPI_SUCCESS(acpi_pci_link_srs(sc, &srsbuf)))
- AcpiOsFree(srsbuf.Pointer);
+ ACPI_FREE(srsbuf.Pointer);
ACPI_SERIAL_END(pci_link);
}
}
@@ -1206,7 +1210,7 @@
/* Initialise the buffer if necessary. */
if (buf->Pointer == NULL) {
buf->Length = ACPI_INITIAL_RESOURCE_BUFFER_SIZE;
- if ((buf->Pointer = AcpiOsAllocate(buf->Length)) == NULL)
+ if ((buf->Pointer = ACPI_ALLOCATE(buf->Length)) == NULL)
return (AE_NO_MEMORY);
rp = (ACPI_RESOURCE *)buf->Pointer;
rp->Type = ACPI_RESOURCE_TYPE_END_TAG;
@@ -1246,12 +1250,12 @@
while ((((u_int8_t *)rp - (u_int8_t *)buf->Pointer) +
res->Length + ACPI_RS_SIZE_NO_DATA +
ACPI_RS_SIZE_MIN) >= buf->Length) {
- if ((newp = AcpiOsAllocate(buf->Length * 2)) == NULL)
+ if ((newp = ACPI_ALLOCATE(buf->Length * 2)) == NULL)
return (AE_NO_MEMORY);
memcpy(newp, buf->Pointer, buf->Length);
rp = (ACPI_RESOURCE *)((u_int8_t *)newp +
((u_int8_t *)rp - (u_int8_t *)buf->Pointer));
- AcpiOsFree(buf->Pointer);
+ ACPI_FREE(buf->Pointer);
buf->Pointer = newp;
buf->Length += buf->Length;
}
Index: src/sys/dev/acpi/acpi_powerres.c
diff -u src/sys/dev/acpi/acpi_powerres.c:1.6 src/sys/dev/acpi/acpi_powerres.c:1.7
--- src/sys/dev/acpi/acpi_powerres.c:1.6 Mon Apr 14 00:30:30 2008
+++ src/sys/dev/acpi/acpi_powerres.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_powerres.c,v 1.6 2008/04/14 00:30:30 jmcneill Exp $ */
+/* $NetBSD: acpi_powerres.c,v 1.7 2009/09/16 10:47:54 mlelstv Exp $ */
/*-
* Copyright (c) 2001 Michael Smith
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.6 2008/04/14 00:30:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.7 2009/09/16 10:47:54 mlelstv Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -147,7 +147,7 @@
rp->ap_resource = res;
/* get the Power Resource object */
- buf.Length = ACPI_ALLOCATE_BUFFER;
+ buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
status = AcpiEvaluateObject(res, NULL, NULL, &buf);
if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS,
@@ -184,7 +184,7 @@
acpi_name(res)));
out:
if (buf.Pointer != NULL)
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
if (ACPI_FAILURE(status) && (rp != NULL))
free(rp, M_ACPIPWR);
return_ACPI_STATUS(status);
@@ -370,7 +370,7 @@
if (ACPI_FAILURE(AcpiGetHandle(consumer, "_PR0", &pr0_handle))) {
goto bad;
}
- reslist_buffer.Length = ACPI_ALLOCATE_BUFFER;
+ reslist_buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
status = AcpiEvaluateObject(pr0_handle, NULL, NULL, &reslist_buffer);
if (ACPI_FAILURE(status))
goto bad;
@@ -379,7 +379,7 @@
(reslist_object->Package.Count == 0)) {
goto bad;
}
- AcpiOsFree(reslist_buffer.Pointer);
+ ACPI_FREE(reslist_buffer.Pointer);
reslist_buffer.Pointer = NULL;
reslist_object = NULL;
}
@@ -388,7 +388,7 @@
* Check that we can actually fetch the list of power resources
*/
if (reslist_handle != NULL) {
- reslist_buffer.Length = ACPI_ALLOCATE_BUFFER;
+ reslist_buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
status = AcpiEvaluateObject(reslist_handle, NULL, NULL,
&reslist_buffer);
if (ACPI_FAILURE(status)) {
@@ -471,7 +471,7 @@
out:
if (reslist_buffer.Pointer != NULL)
- AcpiOsFree(reslist_buffer.Pointer);
+ ACPI_FREE(reslist_buffer.Pointer);
return_ACPI_STATUS(status);
}
Index: src/sys/dev/acpi/acpi_resource.c
diff -u src/sys/dev/acpi/acpi_resource.c:1.29 src/sys/dev/acpi/acpi_resource.c:1.30
--- src/sys/dev/acpi/acpi_resource.c:1.29 Mon Jul 13 12:55:21 2009
+++ src/sys/dev/acpi/acpi_resource.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.29 2009/07/13 12:55:21 kiyohara Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.30 2009/09/16 10:47:54 mlelstv Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.29 2009/07/13 12:55:21 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.30 2009/09/16 10:47:54 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -465,42 +465,42 @@
struct acpi_io *ar;
ar = SIMPLEQ_FIRST(&res->ar_io);
SIMPLEQ_REMOVE_HEAD(&res->ar_io, ar_list);
- AcpiOsFree(ar);
+ ACPI_FREE(ar);
}
while (!SIMPLEQ_EMPTY(&res->ar_iorange)) {
struct acpi_iorange *ar;
ar = SIMPLEQ_FIRST(&res->ar_iorange);
SIMPLEQ_REMOVE_HEAD(&res->ar_iorange, ar_list);
- AcpiOsFree(ar);
+ ACPI_FREE(ar);
}
while (!SIMPLEQ_EMPTY(&res->ar_mem)) {
struct acpi_mem *ar;
ar = SIMPLEQ_FIRST(&res->ar_mem);
SIMPLEQ_REMOVE_HEAD(&res->ar_mem, ar_list);
- AcpiOsFree(ar);
+ ACPI_FREE(ar);
}
while (!SIMPLEQ_EMPTY(&res->ar_memrange)) {
struct acpi_memrange *ar;
ar = SIMPLEQ_FIRST(&res->ar_memrange);
SIMPLEQ_REMOVE_HEAD(&res->ar_memrange, ar_list);
- AcpiOsFree(ar);
+ ACPI_FREE(ar);
}
while (!SIMPLEQ_EMPTY(&res->ar_irq)) {
struct acpi_irq *ar;
ar = SIMPLEQ_FIRST(&res->ar_irq);
SIMPLEQ_REMOVE_HEAD(&res->ar_irq, ar_list);
- AcpiOsFree(ar);
+ ACPI_FREE(ar);
}
while (!SIMPLEQ_EMPTY(&res->ar_drq)) {
struct acpi_drq *ar;
ar = SIMPLEQ_FIRST(&res->ar_drq);
SIMPLEQ_REMOVE_HEAD(&res->ar_drq, ar_list);
- AcpiOsFree(ar);
+ ACPI_FREE(ar);
}
res->ar_nio = res->ar_niorange = res->ar_nmem =
@@ -684,7 +684,7 @@
}
}
- ar = AcpiOsAllocate(sizeof(*ar));
+ ar = ACPI_ALLOCATE(sizeof(*ar));
if (ar == NULL) {
aprint_error_dev(dev, "ACPI: unable to allocate I/O resource %d\n",
res->ar_nio);
@@ -706,7 +706,7 @@
struct acpi_resources *res = context;
struct acpi_iorange *ar;
- ar = AcpiOsAllocate(sizeof(*ar));
+ ar = ACPI_ALLOCATE(sizeof(*ar));
if (ar == NULL) {
aprint_error_dev(dev, "ACPI: unable to allocate I/O range resource %d\n",
res->ar_niorange);
@@ -730,7 +730,7 @@
struct acpi_resources *res = context;
struct acpi_mem *ar;
- ar = AcpiOsAllocate(sizeof(*ar));
+ ar = ACPI_ALLOCATE(sizeof(*ar));
if (ar == NULL) {
aprint_error_dev(dev, "ACPI: unable to allocate Memory resource %d\n",
res->ar_nmem);
@@ -752,7 +752,7 @@
struct acpi_resources *res = context;
struct acpi_memrange *ar;
- ar = AcpiOsAllocate(sizeof(*ar));
+ ar = ACPI_ALLOCATE(sizeof(*ar));
if (ar == NULL) {
aprint_error_dev(dev, "ACPI: unable to allocate Memory range resource %d\n",
res->ar_nmemrange);
@@ -775,7 +775,7 @@
struct acpi_resources *res = context;
struct acpi_irq *ar;
- ar = AcpiOsAllocate(sizeof(*ar));
+ ar = ACPI_ALLOCATE(sizeof(*ar));
if (ar == NULL) {
aprint_error_dev(dev, "ACPI: unable to allocate IRQ resource %d\n",
res->ar_nirq);
@@ -796,7 +796,7 @@
struct acpi_resources *res = context;
struct acpi_drq *ar;
- ar = AcpiOsAllocate(sizeof(*ar));
+ ar = ACPI_ALLOCATE(sizeof(*ar));
if (ar == NULL) {
aprint_error_dev(dev, "ACPI: unable to allocate DRQ resource %d\n",
res->ar_ndrq);
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.46 src/sys/dev/acpi/acpi_tz.c:1.47
--- src/sys/dev/acpi/acpi_tz.c:1.46 Tue Aug 25 10:34:08 2009
+++ src/sys/dev/acpi/acpi_tz.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.46 2009/08/25 10:34:08 jmcneill Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.47 2009/09/16 10:47:54 mlelstv Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.46 2009/08/25 10:34:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.47 2009/09/16 10:47:54 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,9 @@
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#define _COMPONENT ACPI_TZ_COMPONENT
+ACPI_MODULE_NAME ("acpi_tz")
+
/* flags */
#define ATZ_F_VERBOSE 0x01 /* show events to console */
#define ATZ_F_CRITICAL 0x02 /* zone critical */
@@ -428,7 +431,7 @@
for (i = 0; i < ATZ_NLEVELS; i++) {
if (sc->sc_zone.al[i].Pointer != NULL)
- AcpiOsFree(sc->sc_zone.al[i].Pointer);
+ ACPI_FREE(sc->sc_zone.al[i].Pointer);
sc->sc_zone.al[i].Pointer = NULL;
}
} else
@@ -455,7 +458,7 @@
if (obj != NULL) {
if (obj->Type != ACPI_TYPE_PACKAGE) {
aprint_error("%d not package\n", i);
- AcpiOsFree(obj);
+ ACPI_FREE(obj);
sc->sc_zone.al[i].Pointer = NULL;
continue;
}
@@ -471,7 +474,7 @@
acpitz_get_integer(dv, "_TMP", &sc->sc_zone.tmp);
acpitz_get_integer(dv, "_CRT", &sc->sc_zone.crt);
acpitz_get_integer(dv, "_HOT", &sc->sc_zone.hot);
- sc->sc_zone.psl.Length = ACPI_ALLOCATE_BUFFER;
+ sc->sc_zone.psl.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
sc->sc_zone.psl.Pointer = NULL;
AcpiEvaluateObject(sc, "_PSL", NULL, &sc->sc_zone.psl);
acpitz_get_integer(dv, "_PSV", &sc->sc_zone.psv);
Index: src/sys/dev/acpi/acpireg.h
diff -u src/sys/dev/acpi/acpireg.h:1.5 src/sys/dev/acpi/acpireg.h:1.6
--- src/sys/dev/acpi/acpireg.h:1.5 Sun Dec 11 12:21:02 2005
+++ src/sys/dev/acpi/acpireg.h Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpireg.h,v 1.5 2005/12/11 12:21:02 christos Exp $ */
+/* $NetBSD: acpireg.h,v 1.6 2009/09/16 10:47:54 mlelstv Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -319,3 +319,4 @@
#define ACPI_EC_COMPONENT 0x00100000
#define ACPI_LID_COMPONENT 0x00200000
#define ACPI_RESOURCE_COMPONENT 0x00400000
+#define ACPI_TZ_COMPONENT 0x00800000
Index: src/sys/dev/acpi/aiboost.c
diff -u src/sys/dev/acpi/aiboost.c:1.26 src/sys/dev/acpi/aiboost.c:1.27
--- src/sys/dev/acpi/aiboost.c:1.26 Tue May 12 09:29:46 2009
+++ src/sys/dev/acpi/aiboost.c Wed Sep 16 10:47:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aiboost.c,v 1.26 2009/05/12 09:29:46 cegger Exp $ */
+/* $NetBSD: aiboost.c,v 1.27 2009/09/16 10:47:54 mlelstv Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.26 2009/05/12 09:29:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.27 2009/09/16 10:47:54 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,9 @@
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("aiboost")
+
#include <dev/sysmon/sysmonvar.h>
#ifdef AIBOOST_DEBUG
@@ -284,7 +287,7 @@
ACPI_OBJECT_LIST args;
ACPI_BUFFER buf;
int val;
- buf.Length = ACPI_ALLOCATE_BUFFER;
+ buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
buf.Pointer = 0;
arg1.Type = ACPI_TYPE_INTEGER;
@@ -298,7 +301,7 @@
ret = buf.Pointer;
val = (ret->Type == ACPI_TYPE_INTEGER) ? ret->Integer.Value : -1;
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
return val;
}
@@ -428,19 +431,19 @@
(void)memcpy(c->elem[i].desc, str, length);
if (buf2.Pointer)
- AcpiOsFree(buf2.Pointer);
+ ACPI_FREE(buf2.Pointer);
}
if (buf.Pointer)
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
return 0;
error:
if (buf.Pointer)
- AcpiOsFree(buf.Pointer);
+ ACPI_FREE(buf.Pointer);
if (buf2.Pointer)
- AcpiOsFree(buf2.Pointer);
+ ACPI_FREE(buf2.Pointer);
if (c)
kmem_free(c, clen);
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.10 src/sys/dev/acpi/asus_acpi.c:1.11
--- src/sys/dev/acpi/asus_acpi.c:1.10 Tue Aug 4 23:23:39 2009
+++ src/sys/dev/acpi/asus_acpi.c Wed Sep 16 10:47:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.10 2009/08/04 23:23:39 jmcneill Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.10 2009/08/04 23:23:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -39,6 +39,10 @@
#include <sys/sysctl.h>
#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpireg.h>
+
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("asus_acpi")
struct asus_softc {
device_t sc_dev;
@@ -245,7 +249,7 @@
ACPI_INTEGER cfv;
ret.Pointer = NULL;
- ret.Length = ACPI_ALLOCATE_BUFFER;
+ ret.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
param.Type = ACPI_TYPE_INTEGER;
param.Integer.Value = 0x40; /* disable ASL display switching */
params.Pointer = ¶m;
@@ -258,7 +262,7 @@
AcpiFormatException(rv));
if (ret.Pointer)
- AcpiOsFree(ret.Pointer);
+ ACPI_FREE(ret.Pointer);
rv = acpi_eval_integer(sc->sc_node->ad_handle, ASUS_METHOD_CFVG, &cfv);
if (ACPI_FAILURE(rv))
@@ -296,7 +300,7 @@
/* restore previous display brightness */
ret.Pointer = NULL;
- ret.Length = ACPI_ALLOCATE_BUFFER;
+ ret.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
param.Type = ACPI_TYPE_INTEGER;
param.Integer.Value = sc->sc_brightness;
params.Pointer = ¶m;
Index: src/sys/dev/acpi/sony_acpi.c
diff -u src/sys/dev/acpi/sony_acpi.c:1.10 src/sys/dev/acpi/sony_acpi.c:1.11
--- src/sys/dev/acpi/sony_acpi.c:1.10 Wed Aug 19 00:19:37 2009
+++ src/sys/dev/acpi/sony_acpi.c Wed Sep 16 10:47:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sony_acpi.c,v 1.10 2009/08/19 00:19:37 christos Exp $ */
+/* $NetBSD: sony_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.10 2009/08/19 00:19:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,6 +43,10 @@
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpireg.h>
+
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("sony_acpi")
#define SONY_NOTIFY_FnKeyEvent 0x92
#define SONY_NOTIFY_BrightnessDownPressed 0x85
@@ -458,7 +462,7 @@
strncmp(devinfo->HardwareId.String, "SNY6001", 7) == 0)
sc->sc_has_pic = true;
- AcpiOsFree(devinfo);
+ ACPI_FREE(devinfo);
return AE_OK;
}
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.2 src/sys/dev/acpi/dalb_acpi.c:1.3
--- src/sys/dev/acpi/dalb_acpi.c:1.2 Sun Jun 1 23:35:18 2008
+++ src/sys/dev/acpi/dalb_acpi.c Wed Sep 16 10:47:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.2 2008/06/01 23:35:18 jmcneill Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.3 2009/09/16 10:47:55 mlelstv Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <[email protected]>
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.2 2008/06/01 23:35:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.3 2009/09/16 10:47:55 mlelstv Exp $");
/*
* Direct Application Launch Button:
@@ -46,6 +46,10 @@
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpireg.h>
+
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("dalb_acpi")
#define DALB_ID_INVALID -1
@@ -121,7 +125,7 @@
ACPI_BUFFER ret;
ret.Pointer = NULL;
- ret.Length = ACPI_ALLOCATE_BUFFER;
+ ret.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "GHID", NULL, &ret);
if (ACPI_FAILURE(rv) || ret.Pointer == NULL) {
@@ -156,7 +160,7 @@
}
out:
- AcpiOsFree(ret.Pointer);
+ ACPI_FREE(ret.Pointer);
}
static void
@@ -252,7 +256,7 @@
ACPI_BUFFER ret;
ret.Pointer = NULL;
- ret.Length = ACPI_ALLOCATE_BUFFER;
+ ret.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "GHID", NULL, &ret);
if (ACPI_FAILURE(rv)) {
@@ -261,7 +265,7 @@
return false;
}
if (ret.Pointer)
- AcpiOsFree(ret.Pointer);
+ ACPI_FREE(ret.Pointer);
return true;
}
Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.35 src/sys/dev/acpi/fdc_acpi.c:1.36
--- src/sys/dev/acpi/fdc_acpi.c:1.35 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/fdc_acpi.c Wed Sep 16 10:47:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.35 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.36 2009/09/16 10:47:55 mlelstv Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.35 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.36 2009/09/16 10:47:55 mlelstv Exp $");
#include "rnd.h"
@@ -63,6 +63,9 @@
#include <dev/acpi/fdc_acpireg.h>
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("fdc_acpi")
+
static int fdc_acpi_match(device_t, cfdata_t, void *);
static void fdc_acpi_attach(device_t, device_t, void *);
@@ -283,7 +286,7 @@
*/
out:
- AcpiOsFree(abuf.Pointer);
+ ACPI_FREE(abuf.Pointer);
return drives;
}
@@ -326,7 +329,7 @@
sc->sc_present &= ~(1 << i);
out:
- AcpiOsFree(abuf.Pointer);
+ ACPI_FREE(abuf.Pointer);
}
}
