Module Name: src
Committed By: jruoho
Date: Mon Jun 7 17:28:17 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_power.c acpi_power.h acpi_tz.c
Log Message:
Now that we have 1:1 mapping between handles and nodes, use the former for
all power resource operations. Eliminates the wrapper functions.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/acpi_power.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_power.h
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/acpi/acpi_tz.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_power.c
diff -u src/sys/dev/acpi/acpi_power.c:1.16 src/sys/dev/acpi/acpi_power.c:1.17
--- src/sys/dev/acpi/acpi_power.c:1.16 Mon Jun 7 14:07:25 2010
+++ src/sys/dev/acpi/acpi_power.c Mon Jun 7 17:28:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_power.c,v 1.16 2010/06/07 14:07:25 jruoho Exp $ */
+/* $NetBSD: acpi_power.c,v 1.17 2010/06/07 17:28:17 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.16 2010/06/07 14:07:25 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.17 2010/06/07 17:28:17 jruoho Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -198,10 +198,12 @@
}
bool
-acpi_power_register(struct acpi_devnode *ad)
+acpi_power_register(ACPI_HANDLE hdl)
{
+ struct acpi_devnode *ad = acpi_get_node(hdl);
- KASSERT(ad != NULL && ad->ad_root != NULL);
+ if (ad == NULL)
+ return false;
if ((ad->ad_flags & ACPI_DEVICE_POWER) == 0)
return false;
@@ -210,11 +212,13 @@
}
void
-acpi_power_deregister(struct acpi_devnode *ad)
+acpi_power_deregister(ACPI_HANDLE hdl)
{
+ struct acpi_devnode *ad = acpi_get_node(hdl);
struct acpi_power_res *res;
- KASSERT(ad != NULL && ad->ad_root != NULL);
+ if (ad == NULL)
+ return;
if ((ad->ad_flags & ACPI_DEVICE_POWER) == 0)
return;
@@ -226,25 +230,18 @@
(void)acpi_power_res_deref(res, ad->ad_handle);
}
-void
-acpi_power_deregister_from_handle(ACPI_HANDLE hdl)
-{
- struct acpi_devnode *ad = acpi_get_node(hdl);
-
- if (ad == NULL)
- return;
-
- acpi_power_deregister(ad);
-}
-
/*
* Get the D-state of an ACPI device node.
*/
bool
-acpi_power_get(struct acpi_devnode *ad, int *state)
+acpi_power_get(ACPI_HANDLE hdl, int *state)
{
+ struct acpi_devnode *ad = acpi_get_node(hdl);
ACPI_STATUS rv;
+ if (ad == NULL)
+ return false;
+
if ((ad->ad_flags & ACPI_DEVICE_POWER) == 0) {
rv = AE_SUPPORT;
goto fail;
@@ -356,13 +353,15 @@
* Set the D-state of an ACPI device node.
*/
bool
-acpi_power_set(struct acpi_devnode *ad, int state)
+acpi_power_set(ACPI_HANDLE hdl, int state)
{
+ struct acpi_devnode *ad = acpi_get_node(hdl);
ACPI_STATUS rv;
char path[5];
int old;
- KASSERT(ad != NULL && ad->ad_root != NULL);
+ if (ad == NULL)
+ return false;
if ((ad->ad_flags & ACPI_DEVICE_POWER) == 0) {
rv = AE_SUPPORT;
@@ -435,20 +434,6 @@
return false;
}
-/*
- * Set the D-state of an ACPI device node from a handle.
- */
-bool
-acpi_power_set_from_handle(ACPI_HANDLE hdl, int state)
-{
- struct acpi_devnode *ad = acpi_get_node(hdl);
-
- if (ad == NULL)
- return false;
-
- return acpi_power_set(ad, state);
-}
-
static ACPI_STATUS
acpi_power_switch(struct acpi_devnode *ad, int state, bool on)
{
Index: src/sys/dev/acpi/acpi_power.h
diff -u src/sys/dev/acpi/acpi_power.h:1.5 src/sys/dev/acpi/acpi_power.h:1.6
--- src/sys/dev/acpi/acpi_power.h:1.5 Mon Jun 7 14:07:25 2010
+++ src/sys/dev/acpi/acpi_power.h Mon Jun 7 17:28:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_power.h,v 1.5 2010/06/07 14:07:25 jruoho Exp $ */
+/* $NetBSD: acpi_power.h,v 1.6 2010/06/07 17:28:17 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -34,12 +34,10 @@
#define ACPI_STATE_ERROR -1
-bool acpi_power_register(struct acpi_devnode *);
-void acpi_power_deregister(struct acpi_devnode *);
-void acpi_power_deregister_from_handle(ACPI_HANDLE);
-bool acpi_power_get(struct acpi_devnode *, int *);
-bool acpi_power_set(struct acpi_devnode *, int);
-bool acpi_power_set_from_handle(ACPI_HANDLE, int);
+bool acpi_power_register(ACPI_HANDLE);
+void acpi_power_deregister(ACPI_HANDLE);
+bool acpi_power_get(ACPI_HANDLE, int *);
+bool acpi_power_set(ACPI_HANDLE, int);
ACPI_STATUS acpi_power_res(ACPI_HANDLE, ACPI_HANDLE, bool);
void acpi_power_add(struct acpi_devnode *);
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.73 src/sys/dev/acpi/acpi_tz.c:1.74
--- src/sys/dev/acpi/acpi_tz.c:1.73 Tue Jun 1 19:20:43 2010
+++ src/sys/dev/acpi/acpi_tz.c Mon Jun 7 17:28:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.73 2010/06/01 19:20:43 plunky Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.74 2010/06/07 17:28:17 jruoho Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.73 2010/06/01 19:20:43 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.74 2010/06/07 17:28:17 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -240,7 +240,7 @@
rv = acpi_eval_reference_handle(al.Pointer, &hdl);
if (ACPI_SUCCESS(rv))
- acpi_power_deregister_from_handle(hdl);
+ acpi_power_deregister(hdl);
ACPI_FREE(sc->sc_zone.al[i].Pointer);
}
@@ -406,7 +406,7 @@
if (ACPI_FAILURE(rv))
return rv;
- (void)acpi_power_set_from_handle(cooler, pwr_state);
+ (void)acpi_power_set(cooler, pwr_state);
return AE_OK;
}
