From 0761ef3362e645088ab019e524430b4b2ec3e33b Mon Sep 17 00:00:00 2001
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Wed, 17 Mar 2010 20:39:21 +0000
Subject: Merge r203622 from head:

  Add support for a few more Sony-specific ACPI features (default display
  brightness, wired LAN power and bass gain), and update the description of
  one previously unknown feature (display contrast).  While here, expand on
  a comment and remove two defines left over from an old version of the code.

  Also update man page to document the above changes, and correct grammar.

PR:		kern/127581
---
 share/man/man4/acpi_sony.4       | 13 +++++++++++--
 sys/dev/acpi_support/acpi_sony.c | 20 +++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/share/man/man4/acpi_sony.4 b/share/man/man4/acpi_sony.4
index 52a7fbe2fd9b..3a0607009bdf 100644
--- a/share/man/man4/acpi_sony.4
+++ b/share/man/man4/acpi_sony.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 14, 2005
+.Dd February 7, 2010
 .Dt ACPI_SONY 4 i386
 .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 dev.acpi_sony.0.brightness
 Current brightness level of the display.
+.It Va dev.acpi_sony.0.brightness_default
+Default brightness level of the display (survives reboot).
+.It Va dev.acpi_sony.0.contrast
+Current contrast level of the display.
+.It Va dev.acpi_sony.0.bass_gain
+Enable or disable the Bass Gain feature.
 .It Va dev.acpi_sony.0.cdp
 Turns the CD power on or off.
 .It Va dev.acpi_sony.0.azp
 Turns the audio power on or off.
+.It Va dev.acpi_sony.0.lnp
+Turns the wired network interface power on or off.
 .El
 .Sh SEE ALSO
 .Xr acpi 4 ,
diff --git a/sys/dev/acpi_support/acpi_sony.c b/sys/dev/acpi_support/acpi_sony.c
index 905461d1e121..2a0d40e52669 100644
--- a/sys/dev/acpi_support/acpi_sony.c
+++ b/sys/dev/acpi_support/acpi_sony.c
@@ -42,14 +42,21 @@ __FBSDID("$FreeBSD$");
 #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 {
@@ -63,14 +70,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 }
 };
 
-- 
cgit v1.3