From: Sascha Wildner <saw@online.de>
Date: Sun, 4 Jul 2010 18:43:09 +0000 (+0200)
Subject: acpi_sony(4): Sync with FreeBSD.
X-Git-Tag: v2.9.0~795
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/b31d849399e9c669ef449054c14742d4f31b928e?hp=91a31b27a3fb4dd09c1b60af885f3d9cc921d6e0

acpi_sony(4): Sync with FreeBSD.
---

diff --git a/share/man/man4/acpi_sony.4 b/share/man/man4/acpi_sony.4
index 68d9ebb3cd..b5b210a9f5 100644
--- a/share/man/man4/acpi_sony.4
+++ b/share/man/man4/acpi_sony.4
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/acpi_sony.4,v 1.1 2008/08/21 00:40:55 rpaulo Exp $
+.\" $FreeBSD: src/share/man/man4/acpi_sony.4,v 1.3 2010/02/08 21:01:41 gavin Exp $
 .\"
-.Dd November 11, 2009
+.Dd July 4, 2010
 .Dt ACPI_SONY 4
 .Os
 .Sh NAME
@@ -48,15 +48,24 @@ acpi_sony_load="YES"
 The
 .Nm
 driver provides support for the notebook controller in Sony laptops.
+Note that not all features will work on all laptop models.
 .Sh SYSCTLS
-The following sysctl is currently implemented:
+The following sysctl nodes are currently implemented:
 .Bl -tag -width indent
 .It Va hw.acpi.sony.brightness
 Current brightness level of the display.
+.It Va hw.acpi.sony.brightness_default
+Default brightness level of the display (survives reboot).
+.It Va hw.acpi.sony.contrast
+Current contrast level of the display.
+.It Va hw.acpi.sony.bass_gain
+Enable or disable the Bass Gain feature.
 .It Va hw.acpi.sony.cdp
 Turns the CD power on or off.
 .It Va hw.acpi.sony.azp
 Turns the audio power on or off.
+.It Va hw.acpi.sony.lnp
+Turns the wired network interface power on or off.
 .El
 .Sh SEE ALSO
 .Xr acpi 4 ,
diff --git a/sys/dev/acpica5/acpi_sony/Makefile b/sys/dev/acpica5/acpi_sony/Makefile
index 3260f58ef3..72706cb677 100644
--- a/sys/dev/acpica5/acpi_sony/Makefile
+++ b/sys/dev/acpica5/acpi_sony/Makefile
@@ -1,5 +1,4 @@
 KMOD=		acpi_sony
-CFLAGS+=	-I${.OBJDIR}/.. -I${.CURDIR}/..
-SRCS=		acpi_sony.c opt_acpi.h device_if.h bus_if.h
+SRCS=		acpi_sony.c opt_acpi.h device_if.h bus_if.h acpi_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/dev/acpica5/acpi_sony/acpi_sony.c b/sys/dev/acpica5/acpi_sony/acpi_sony.c
index 135b682ccd..df2bf8d2d5 100644
--- a/sys/dev/acpica5/acpi_sony/acpi_sony.c
+++ b/sys/dev/acpica5/acpi_sony/acpi_sony.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.13 2009/06/05 18:44:36 jkim
+ * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.14 2010/02/07 18:36:30 gavin Exp $
  */
 
 #include "opt_acpi.h"
@@ -41,14 +41,21 @@
 #define _COMPONENT	ACPI_OEM
 ACPI_MODULE_NAME("Sony")
 
-#define ACPI_SONY_GET_BRIGHTNESS "GBRT"
-#define ACPI_SONY_SET_BRIGHTNESS "SBRT"
 #define ACPI_SONY_GET_PID "GPID"
 
 /*
  * SNY5001
+ *   This is the ACPI handle for the "Sony Notebook Control" driver under
+ *   Windows.
+ *   It provides several methods within the ACPI namespace, including:
  *  [GS]BRT [GS]PBR [GS]CTR [GS]PCR [GS]CMI [CDPW GCDP]? GWDP PWAK PWRN 
  *
+ * SNY6001
+ *   This is the ACPI handle for the "Sony Programmable I/O" driver under
+ *   Windows.
+ *   It is not yet supported by this driver, but provides control over the
+ *   power to the bluetooth, built-in camera and HSDPA modem devices in some
+ *   laptops, and also allows some control of the fan speed.
  */
 
 struct acpi_sony_softc {
@@ -64,14 +71,17 @@ static struct acpi_sony_name_list
 	char *comment;
 } acpi_sony_oids[] = {
 	{ "brightness", "GBRT", "SBRT", "Display Brightness"},
-	{ "ctr", "GCTR", "SCTR", "??"},
+	{ "brightness_default", "GPBR", "SPBR", "Default Display Brightness"},
+	{ "contrast", "GCTR", "SCTR", "Display Contrast"},
+	{ "bass_gain", "GMGB", "SMGB", "Multimedia Bass Gain"},
 	{ "pcr", "GPCR", "SPCR", "???"},
 #if 0
-	{ "cmi", "GCMI", "SCMI", "????"},
+	{ "cmi", "GCMI", "SCMI", "???"},
 #endif
-	{ "wdp", "GWDP", NULL, "?????"},
+	{ "wdp", "GWDP", NULL, "???"},
 	{ "cdp", "GCDP", "CDPW", "CD Power"},  /*shares [\GL03]&0x8 flag*/
 	{ "azp", "GAZP", "AZPW", "Audio Power"}, 
+	{ "lnp", "GLNP", "LNPW", "LAN Power"},
 	{ NULL, NULL, NULL }
 };