svn commit: r227823 - in head: share/man/man4 sys/dev/acpi_support

[Jaakko Heinonen]

Author: jh
Date: Tue Nov 22 16:44:50 2011
New Revision: 227823
URL: http://svn.freebsd.org/changeset/base/227823

Log:
  Append unit number to the WMI status device name to allow attaching
  multiple acpi_wmi(4) instances.
  
  PR:		kern/162491
  Reviewed by:	avg

Modified:
  head/share/man/man4/acpi_wmi.4
  head/sys/dev/acpi_support/acpi_wmi.c

Modified: head/share/man/man4/acpi_wmi.4
==============================================================================
--- head/share/man/man4/acpi_wmi.4	Tue Nov 22 16:18:12 2011	(r227822)
+++ head/share/man/man4/acpi_wmi.4	Tue Nov 22 16:44:50 2011	(r227823)
@@ -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+ -

Modified: head/sys/dev/acpi_support/acpi_wmi.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_wmi.c	Tue Nov 22 16:18:12 2011	(r227822)
+++ head/sys/dev/acpi_support/acpi_wmi.c	Tue Nov 22 16:44:50 2011	(r227823)
@@ -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;