Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Jan 2012 15:56:34 +0000 (UTC)
From:      Jaakko Heinonen <jh@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r229858 - in stable/9: . share/man/man4 sys/dev/acpi_support
Message-ID:  <201201091556.q09FuYND047440@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jh
Date: Mon Jan  9 15:56:33 2012
New Revision: 229858
URL: http://svn.freebsd.org/changeset/base/229858

Log:
  MFC r227823, r228163:
  
  Append unit number to the WMI status device name to allow attaching
  multiple acpi_wmi(4) instances.
  
  PR:		kern/162491

Modified:
  stable/9/UPDATING   (contents, props changed)
  stable/9/share/man/man4/acpi_wmi.4
  stable/9/sys/dev/acpi_support/acpi_wmi.c
Directory Properties:
  stable/9/share/man/man4/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/UPDATING
==============================================================================
--- stable/9/UPDATING	Mon Jan  9 14:35:05 2012	(r229857)
+++ stable/9/UPDATING	Mon Jan  9 15:56:33 2012	(r229858)
@@ -9,6 +9,10 @@ handbook.
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
+20120109:
+	The acpi_wmi(4) status device /dev/wmistat has been renamed to
+	/dev/wmistat0.
+
 20120106:
 	A new VOP_ADVISE() was added to support posix_fadvise(2).  All
 	filesystem modules must be recompiled.

Modified: stable/9/share/man/man4/acpi_wmi.4
==============================================================================
--- stable/9/share/man/man4/acpi_wmi.4	Mon Jan  9 14:35:05 2012	(r229857)
+++ stable/9/share/man/man4/acpi_wmi.4	Mon Jan  9 15:56:33 2012	(r229858)
@@ -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: stable/9/sys/dev/acpi_support/acpi_wmi.c
==============================================================================
--- stable/9/sys/dev/acpi_support/acpi_wmi.c	Mon Jan  9 14:35:05 2012	(r229857)
+++ stable/9/sys/dev/acpi_support/acpi_wmi.c	Mon Jan  9 15:56:33 2012	(r229858)
@@ -264,7 +264,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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201091556.q09FuYND047440>