summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjh <jh@FreeBSD.org>2011-11-22 16:44:50 +0000
committerjh <jh@FreeBSD.org>2011-11-22 16:44:50 +0000
commit62da5e13f7b1d2be2ff47ea2b41a6b6a525e4ab4 (patch)
tree45290a17831a491ae158af362fde71b433d3df1b
parent6123cbfb2edc5d69a7cd104442dd30ccfc45be48 (diff)
downloadFreeBSD-src-62da5e13f7b1d2be2ff47ea2b41a6b6a525e4ab4.zip
FreeBSD-src-62da5e13f7b1d2be2ff47ea2b41a6b6a525e4ab4.tar.gz
Append unit number to the WMI status device name to allow attaching
multiple acpi_wmi(4) instances. PR: kern/162491 Reviewed by: avg
-rw-r--r--share/man/man4/acpi_wmi.410
-rw-r--r--sys/dev/acpi_support/acpi_wmi.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/share/man/man4/acpi_wmi.4 b/share/man/man4/acpi_wmi.4
index 6d93ff9..0825249 100644
--- a/share/man/man4/acpi_wmi.4
+++ b/share/man/man4/acpi_wmi.4
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 8, 2010
+.Dd November 22, 2011
.Dt ACPI_WMI 4
.Os
.Sh NAME
@@ -49,16 +49,16 @@ The
.Nm
driver provides an interface for vendor specific WMI implementations
(e.g. HP and Acer laptops).
-It creates /dev/wmistat, which can be read to get
+It creates /dev/wmistat%d, which can be read to get
information about GUIDs found in the system.
.Sh FILES
-.Bl -tag -width /dev/wmistat -compact
-.It Pa /dev/wmistat
+.Bl -tag -width /dev/wmistat%d -compact
+.It Pa /dev/wmistat%d
WMI status device.
.El
.Sh EXAMPLES
.Bd -literal
-# cat /dev/wmistat
+# cat /dev/wmistat0
GUID INST EXPE METH STR EVENT OID
{5FB7F034-2C63-45E9-BE91-3D44E2C707E4} 1 NO WMAA NO NO AA
{95F24279-4D7B-4334-9387-ACCDC67EF61C} 1 NO NO NO 0x80+ -
diff --git a/sys/dev/acpi_support/acpi_wmi.c b/sys/dev/acpi_support/acpi_wmi.c
index 2acc262..b0ddd6e 100644
--- a/sys/dev/acpi_support/acpi_wmi.c
+++ b/sys/dev/acpi_support/acpi_wmi.c
@@ -265,7 +265,7 @@ acpi_wmi_attach(device_t dev)
acpi_wmi_ec_handler);
} else {
sc->wmistat_dev_t = make_dev(&wmistat_cdevsw, 0, UID_ROOT,
- GID_WHEEL, 0644, "wmistat");
+ GID_WHEEL, 0644, "wmistat%d", device_get_unit(dev));
sc->wmistat_dev_t->si_drv1 = sc;
sc->wmistat_open_pid = 0;
sc->wmistat_bufptr = -1;
OpenPOWER on IntegriCloud