Module Name: src
Committed By: jruoho
Date: Tue Jan 5 13:39:49 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_powerres.c dalb_acpi.c
Log Message:
Use acpi_eval_struct() to simplify code.
ok pgoyette@, jmcneill@
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_powerres.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/dalb_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/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.139 src/sys/dev/acpi/acpi.c:1.140
--- src/sys/dev/acpi/acpi.c:1.139 Thu Dec 31 10:07:13 2009
+++ src/sys/dev/acpi/acpi.c Tue Jan 5 13:39:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.139 2009/12/31 10:07:13 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.140 2010/01/05 13:39:49 jruoho 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.139 2009/12/31 10:07:13 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.140 2010/01/05 13:39:49 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -966,10 +966,8 @@
aprint_normal("%s (%s) ", aa->aa_node->ad_name,
pnpstr);
- buf.Pointer = NULL;
- buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
- rv = AcpiEvaluateObject(aa->aa_node->ad_handle,
- "_STR", NULL, &buf);
+ rv = acpi_eval_struct(aa->aa_node->ad_handle,
+ "_STR", &buf);
if (ACPI_SUCCESS(rv)) {
ACPI_OBJECT *obj = buf.Pointer;
switch (obj->Type) {
Index: src/sys/dev/acpi/acpi_powerres.c
diff -u src/sys/dev/acpi/acpi_powerres.c:1.7 src/sys/dev/acpi/acpi_powerres.c:1.8
--- src/sys/dev/acpi/acpi_powerres.c:1.7 Wed Sep 16 10:47:54 2009
+++ src/sys/dev/acpi/acpi_powerres.c Tue Jan 5 13:39:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_powerres.c,v 1.7 2009/09/16 10:47:54 mlelstv Exp $ */
+/* $NetBSD: acpi_powerres.c,v 1.8 2010/01/05 13:39:49 jruoho Exp $ */
/*-
* Copyright (c) 2001 Michael Smith
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.7 2009/09/16 10:47:54 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.8 2010/01/05 13:39:49 jruoho Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -147,8 +147,7 @@
rp->ap_resource = res;
/* get the Power Resource object */
- buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
- status = AcpiEvaluateObject(res, NULL, NULL, &buf);
+ status = acpi_eval_struct(res, NULL, &buf);
if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS,
"no power resource object\n"));
@@ -370,8 +369,7 @@
if (ACPI_FAILURE(AcpiGetHandle(consumer, "_PR0", &pr0_handle))) {
goto bad;
}
- reslist_buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
- status = AcpiEvaluateObject(pr0_handle, NULL, NULL, &reslist_buffer);
+ status = acpi_eval_struct(pr0_handle, NULL, &reslist_buffer);
if (ACPI_FAILURE(status))
goto bad;
reslist_object = (ACPI_OBJECT *)reslist_buffer.Pointer;
@@ -388,9 +386,8 @@
* Check that we can actually fetch the list of power resources
*/
if (reslist_handle != NULL) {
- reslist_buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
- status = AcpiEvaluateObject(reslist_handle, NULL, NULL,
- &reslist_buffer);
+ status = acpi_eval_struct(reslist_handle,
+ NULL, &reslist_buffer);
if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "can't evaluate resource list %s\n",
acpi_name(reslist_handle)));
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.3 src/sys/dev/acpi/dalb_acpi.c:1.4
--- src/sys/dev/acpi/dalb_acpi.c:1.3 Wed Sep 16 10:47:55 2009
+++ src/sys/dev/acpi/dalb_acpi.c Tue Jan 5 13:39:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.3 2009/09/16 10:47:55 mlelstv Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.4 2010/01/05 13:39:49 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.3 2009/09/16 10:47:55 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.4 2010/01/05 13:39:49 jruoho Exp $");
/*
* Direct Application Launch Button:
@@ -124,10 +124,7 @@
ACPI_STATUS rv;
ACPI_BUFFER ret;
- ret.Pointer = NULL;
- ret.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
-
- rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "GHID", NULL, &ret);
+ rv = acpi_eval_struct(sc->sc_node->ad_handle, "GHID", &ret);
if (ACPI_FAILURE(rv) || ret.Pointer == NULL) {
aprint_error_dev(dev,
"couldn't enable notify handler: (%s)\n",
@@ -255,10 +252,7 @@
ACPI_STATUS rv;
ACPI_BUFFER ret;
- ret.Pointer = NULL;
- ret.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
-
- rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "GHID", NULL, &ret);
+ rv = acpi_eval_struct(sc->sc_node->ad_handle, "GHID", &ret);
if (ACPI_FAILURE(rv)) {
aprint_error_dev(dev, "couldn't evaluate GHID: %s\n",
AcpiFormatException(rv));
