summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/DEVNAMES3
-rw-r--r--sys/dev/acpi/aiboost.c450
-rw-r--r--sys/dev/acpi/files.acpi7
3 files changed, 2 insertions, 458 deletions
diff --git a/sys/dev/DEVNAMES b/sys/dev/DEVNAMES
index ae9125f38c1..1dfd47a9339 100644
--- a/sys/dev/DEVNAMES
+++ b/sys/dev/DEVNAMES
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.258 2010/03/11 10:38:37 enami Exp $
+# $NetBSD: DEVNAMES,v 1.259 2010/03/19 04:04:27 cnst Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -61,7 +61,6 @@ ahd MI
ahsc amiga
ahsc amigappc
ai MI
-aiboost MI
aibs MI
aic MI
akbd mac68k
diff --git a/sys/dev/acpi/aiboost.c b/sys/dev/acpi/aiboost.c
deleted file mode 100644
index 9e145c13b63..00000000000
--- a/sys/dev/acpi/aiboost.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/* $NetBSD: aiboost.c,v 1.30 2010/03/05 14:00:17 jruoho Exp $ */
-
-/*-
- * Copyright (c) 2007 Juan Romero Pardines
- * Copyright (c) 2006 Takanori Watanabe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.30 2010/03/05 14:00:17 jruoho Exp $");
-
-#include <sys/param.h>
-#include <sys/device.h>
-#include <sys/mutex.h>
-#include <sys/kmem.h>
-#include <sys/systm.h>
-
-#include <dev/acpi/acpireg.h>
-#include <dev/acpi/acpivar.h>
-
-#define _COMPONENT ACPI_RESOURCE_COMPONENT
-ACPI_MODULE_NAME ("aiboost")
-
-#ifdef AIBOOST_DEBUG
-#define DPRINTF(x) do { printf x; } while (/* CONSTCOND */ 0)
-#else
-#define DPRINTF(x)
-#endif
-
-struct aiboost_elem {
- ACPI_HANDLE h;
- UINT32 id;
- char desc[256];
-};
-
-struct aiboost_comp {
- unsigned int num;
- struct aiboost_elem elem[1];
-};
-
-struct aiboost_softc {
- struct acpi_devnode *sc_node; /* ACPI devnode */
- struct aiboost_comp *sc_aitemp, *sc_aivolt, *sc_aifan;
- struct sysmon_envsys *sc_sme;
- envsys_data_t *sc_sensor;
- kmutex_t sc_mtx;
-};
-
-static ACPI_STATUS aiboost_getcomp(ACPI_HANDLE *,
- const char *,
- struct aiboost_comp **);
-static int aiboost_get_value(ACPI_HANDLE, const char *, UINT32);
-
-/* sysmon_envsys(9) glue */
-static void aiboost_setup_sensors(struct aiboost_softc *);
-static void aiboost_refresh_sensors(struct sysmon_envsys *,
- envsys_data_t *);
-
-/* autoconf(9) glue */
-static int aiboost_acpi_match(device_t, cfdata_t, void *);
-static void aiboost_acpi_attach(device_t, device_t, void *);
-
-CFATTACH_DECL_NEW(aiboost, sizeof(struct aiboost_softc), aiboost_acpi_match,
- aiboost_acpi_attach, NULL, NULL);
-
-/*
- * Supported device IDs
- */
-
-static const char * const aiboost_acpi_ids[] = {
- "ATK0110",
- NULL
-};
-
-static int
-aiboost_acpi_match(device_t parent, cfdata_t match, void *aux)
-{
- struct acpi_attach_args *aa = aux;
-
- if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
- return 0;
-
- return acpi_match_hid(aa->aa_node->ad_devinfo, aiboost_acpi_ids);
-}
-
-static void
-aiboost_acpi_attach(device_t parent, device_t self, void *aux)
-{
- struct aiboost_softc *sc = device_private(self);
- struct acpi_attach_args *aa = aux;
- ACPI_HANDLE *handl;
- int i, maxsens, error = 0;
- size_t len;
-
- sc->sc_node = aa->aa_node;
- handl = sc->sc_node->ad_handle;
-
- aprint_naive("\n");
- aprint_normal("\n");
-
- aprint_normal_dev(self, "ASUS AI Boost Hardware monitor\n");
-
- if (ACPI_FAILURE(aiboost_getcomp(handl, "TSIF", &sc->sc_aitemp)))
- return;
-
- if (ACPI_FAILURE(aiboost_getcomp(handl, "VSIF", &sc->sc_aivolt)))
- return;
-
- if (ACPI_FAILURE(aiboost_getcomp(handl, "FSIF", &sc->sc_aifan)))
- return;
-
- mutex_init(&sc->sc_mtx, MUTEX_DEFAULT, IPL_NONE);
- /* Initialize sensors */
- maxsens = sc->sc_aivolt->num + sc->sc_aitemp->num + sc->sc_aifan->num;
- DPRINTF(("%s: maxsens=%d\n", __func__, maxsens));
-
- sc->sc_sme = sysmon_envsys_create();
- len = sizeof(envsys_data_t) * maxsens;
- sc->sc_sensor = kmem_zalloc(len, KM_NOSLEEP);
- if (!sc->sc_sensor)
- goto bad2;
-
- /*
- * Set properties in sensors.
- */
- aiboost_setup_sensors(sc);
-
- /*
- * Add the sensors into the sysmon_envsys device.
- */
- for (i = 0; i < maxsens; i++) {
- if (sysmon_envsys_sensor_attach(sc->sc_sme,
- &sc->sc_sensor[i]))
- goto bad;
- }
-
- /*
- * Register the sysmon_envsys device.
- */
- sc->sc_sme->sme_name = device_xname(self);
- sc->sc_sme->sme_cookie = sc;
- sc->sc_sme->sme_refresh = aiboost_refresh_sensors;
-
- if ((error = sysmon_envsys_register(sc->sc_sme))) {
- aprint_error_dev(self, "unable to register with sysmon "
- "(error=%d)\n", error);
- goto bad;
- }
-
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
-
- return;
-
-bad:
- kmem_free(sc->sc_sensor, len);
-bad2:
- sysmon_envsys_destroy(sc->sc_sme);
- mutex_destroy(&sc->sc_mtx);
-}
-
-#define COPYDESCR(x, y) \
- do { \
- strlcpy((x), (y), sizeof(x)); \
- } while (/* CONSTCOND */ 0)
-
-static void
-aiboost_setup_sensors(struct aiboost_softc *sc)
-{
- int i, j;
-
- /* Temperatures */
- for (i = 0; i < sc->sc_aitemp->num; i++) {
- sc->sc_sensor[i].units = ENVSYS_STEMP;
- COPYDESCR(sc->sc_sensor[i].desc, sc->sc_aitemp->elem[i].desc);
- DPRINTF(("%s: data[%d].desc=%s elem[%d].desc=%s\n", __func__,
- i, sc->sc_sensor[i].desc, i, sc->sc_aitemp->elem[i].desc));
- }
-
- /* skip temperatures */
- j = sc->sc_aitemp->num;
-
- /* Voltages */
- for (i = 0; i < sc->sc_aivolt->num; i++, j++) {
- sc->sc_sensor[j].units = ENVSYS_SVOLTS_DC;
- COPYDESCR(sc->sc_sensor[j].desc, sc->sc_aivolt->elem[i].desc);
- DPRINTF(("%s: data[%d].desc=%s elem[%d].desc=%s\n", __func__,
- j, sc->sc_sensor[j].desc, i, sc->sc_aivolt->elem[i].desc));
- }
-
- /* skip voltages */
- j = sc->sc_aitemp->num + sc->sc_aivolt->num;
-
- /* Fans */
- for (i = 0; i < sc->sc_aifan->num; i++, j++) {
- sc->sc_sensor[j].units = ENVSYS_SFANRPM;
- COPYDESCR(sc->sc_sensor[j].desc, sc->sc_aifan->elem[i].desc);
- DPRINTF(("%s: data[%d].desc=%s elem[%d].desc=%s\n", __func__,
- j, sc->sc_sensor[j].desc, i, sc->sc_aifan->elem[i].desc));
-
- }
-}
-
-static void
-aiboost_refresh_sensors(struct sysmon_envsys *sme, envsys_data_t *edata)
-{
- struct aiboost_softc *sc = sme->sme_cookie;
- ACPI_HANDLE *h = sc->sc_node->ad_handle;
- int i, j, val;
-
- mutex_enter(&sc->sc_mtx);
- j = 0;
- i = edata->sensor; /* sensor number */
-
-#define AIBOOST_INVALIDATE_SENSOR() \
- do { \
- if (val == -1 || val == 0) { \
- edata->state = ENVSYS_SINVALID; \
- goto out; \
- } \
- } while (/* CONSTCOND */ 0)
-
- switch (edata->units) {
- case ENVSYS_STEMP:
- /* Temperatures */
- val = aiboost_get_value(h, "RTMP", sc->sc_aitemp->elem[i].id);
- AIBOOST_INVALIDATE_SENSOR();
- /* envsys(4) wants uK... convert from Celsius. */
- edata->value_cur = val * 100000 + 273150000;
- DPRINTF(("%s: temp[%d] value_cur=%d val=%d j=%d\n", __func__,
- i, edata->value_cur, val, j));
- break;
- case ENVSYS_SVOLTS_DC:
- /* Voltages */
- j = i - sc->sc_aitemp->num;
- val = aiboost_get_value(h, "RVLT", sc->sc_aivolt->elem[j].id);
- AIBOOST_INVALIDATE_SENSOR();
- /* envsys(4) wants mV... */
- edata->value_cur = val * 10000;
- edata->value_cur /= 10;
- DPRINTF(("%s: volt[%d] value_cur=%d val=%d j=%d\n", __func__,
- i, edata->value_cur, val, j));
- break;
- case ENVSYS_SFANRPM:
- /* Fans */
- j = i - (sc->sc_aitemp->num + sc->sc_aivolt->num);
- val = aiboost_get_value(h, "RFAN", sc->sc_aifan->elem[j].id);
- AIBOOST_INVALIDATE_SENSOR();
- edata->value_cur = val;
- DPRINTF(("%s: fan[%d] val=%d j=%d\n", __func__, i, val, j));
- break;
- }
-
- edata->state = ENVSYS_SVALID;
-out:
- mutex_exit(&sc->sc_mtx);
-}
-
-static int
-aiboost_get_value(ACPI_HANDLE handle, const char *path, UINT32 number)
-{
- ACPI_OBJECT arg1, *ret;
- ACPI_OBJECT_LIST args;
- ACPI_BUFFER buf;
- int val;
- buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
- buf.Pointer = 0;
-
- arg1.Type = ACPI_TYPE_INTEGER;
- arg1.Integer.Value = number;
- args.Count = 1;
- args.Pointer = &arg1;
-
- if (ACPI_FAILURE(AcpiEvaluateObject(handle, path, &args, &buf)))
- return -1;
-
- ret = buf.Pointer;
- val = (ret->Type == ACPI_TYPE_INTEGER) ? ret->Integer.Value : -1;
-
- ACPI_FREE(buf.Pointer);
- return val;
-
-}
-
-static ACPI_STATUS
-aiboost_getcomp(ACPI_HANDLE *h, const char *name, struct aiboost_comp **comp)
-{
- ACPI_BUFFER buf, buf2;
- ACPI_OBJECT *o, *elem, *subobj, *myobj;
- ACPI_STATUS status;
- ACPI_HANDLE h1;
- struct aiboost_comp *c = NULL;
- int i, num;
- const char *str = NULL;
- size_t length, clen = 0;
-
- status = AcpiGetHandle(h, name, &h1);
- if (ACPI_FAILURE(status)) {
- DPRINTF(("%s: AcpiGetHandle: %s\n", __func__,
- AcpiFormatException(status) ));
- return status;
- }
-
- status = acpi_eval_struct(h1, NULL, &buf);
- if (ACPI_FAILURE(status)) {
- DPRINTF(("%s: acpi_eval_struct: %s\n", __func__,
- AcpiFormatException(status) ));
- return status;
- }
-
- o = buf.Pointer;
- if (o->Type != ACPI_TYPE_PACKAGE) {
- DPRINTF(("%s: o->Type != ACPI_TYPE_PACKAGE\n", __func__));
- goto error;
- }
-
- elem = o->Package.Elements;
- if (elem->Type != ACPI_TYPE_INTEGER) {
- DPRINTF(("%s: elem->Type != ACPI_TYPE_INTEGER\n", __func__));
- goto error;
- }
- num = (int)elem[0].Integer.Value;
- if (num != o->Package.Count - 1) {
- DPRINTF(("%s: bad Package.Count/element[0].value\n", __func__));
- }
-
- clen = sizeof(struct aiboost_comp) + sizeof(struct aiboost_elem) * num;
- c = kmem_zalloc(clen, KM_NOSLEEP);
- if (!c)
- goto error;
-
- *comp = c;
- c->num = num;
-
- DPRINTF(("%s, %d subitems\n", acpi_name(h1), num));
-#ifdef AIBOOST_DEBUG
- for (i = 0; i < num; i++) {
- elem = &o->Package.Elements[i+1];
- DPRINTF(("elem[%d]->Type = %x\n", i+1, elem->Type));
- if (elem->Type == ACPI_TYPE_PACKAGE &&
- elem->Package.Elements[0].Type == ACPI_TYPE_INTEGER) {
- DPRINTF((" subelem->Type = %x, %"PRIu64"\n",
- elem->Package.Elements[0].Type,
- elem->Package.Elements[0].Integer.Value));
- }
- }
-#endif
- for (i = 0; i < num; i++) {
- elem = &o->Package.Elements[i+1];
- if (elem->Type == ACPI_TYPE_PACKAGE) {
- /* information provided directly in package */
- subobj = elem;
- buf2.Pointer = NULL;
- } else if (elem->Type == ACPI_TYPE_LOCAL_REFERENCE) {
- /* information provided indirectly. request package */
- c->elem[i].h = elem->Reference.Handle;
- status = acpi_eval_struct(c->elem[i].h, NULL, &buf2);
- if (ACPI_FAILURE(status)) {
- DPRINTF(("%s: fetching object in buf2: %s\n",
- __func__, AcpiFormatException(status) ));
- goto error;
- }
- subobj = buf2.Pointer;
- if (subobj->Type != ACPI_TYPE_PACKAGE) {
- DPRINTF(("%s: fetched type cannot processed\n",
- __func__));
- goto error;
- }
- } else {
- DPRINTF(("%s: elem->Type cannot be processed\n",
- __func__));
- goto error;
- }
-
- myobj = &subobj->Package.Elements[0];
-
- /* Get UID */
- if (myobj == NULL || myobj->Type != ACPI_TYPE_INTEGER) {
- DPRINTF(("%s: wrong type for element %d\n", __func__,
- i + 1));
- goto error;
- }
-
- c->elem[i].id = myobj->Integer.Value;
-
- /* Get string */
- myobj = &subobj->Package.Elements[1];
- if (myobj == NULL) {
- DPRINTF(("%s: myobj is NULL\n", __func__));
- goto error;
- }
-
- switch (myobj->Type) {
- case ACPI_TYPE_STRING:
- str = myobj->String.Pointer;
- length = myobj->String.Length;
- break;
- case ACPI_TYPE_BUFFER:
- str = myobj->Buffer.Pointer;
- length = myobj->Buffer.Length;
- break;
- default:
- goto error;
- }
-
- DPRINTF(("%s: id=%d str=%s\n", __func__,
- c->elem[i].id, str));
-
- (void)memcpy(c->elem[i].desc, str, length);
-
- if (buf2.Pointer)
- ACPI_FREE(buf2.Pointer);
- }
-
- if (buf.Pointer)
- ACPI_FREE(buf.Pointer);
-
- return 0;
-
-error:
- if (buf.Pointer)
- ACPI_FREE(buf.Pointer);
- if (buf2.Pointer)
- ACPI_FREE(buf2.Pointer);
- if (c)
- kmem_free(c, clen);
-
- return AE_BAD_DATA;
-}
diff --git a/sys/dev/acpi/files.acpi b/sys/dev/acpi/files.acpi
index fb8138a4254..41bb3c0ebf6 100644
--- a/sys/dev/acpi/files.acpi
+++ b/sys/dev/acpi/files.acpi
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.67 2010/02/09 03:19:51 cnst Exp $
+# $NetBSD: files.acpi,v 1.68 2010/03/19 04:04:28 cnst Exp $
include "dev/acpi/acpica/files.acpica"
@@ -109,11 +109,6 @@ file dev/acpi/ym_acpi.c ym_acpi
attach hpet at acpinodebus with hpet_acpi
file dev/acpi/hpet_acpi.c hpet_acpi
-# ASUS AI Booster Hardware monitor
-device aiboost: sysmon_envsys
-attach aiboost at acpinodebus
-file dev/acpi/aiboost.c aiboost
-
# ASUS hotkey device
device asus: sysmon_envsys, sysmon_power
attach asus at acpinodebus