All of lore.kernel.org
 help / color / mirror / Atom feed
From: Corentin Chary <corentincj@iksaif.net>
To: Matthew Garrett <mjg@redhat.com>
Cc: platform-driver-x86@vger.kernel.org,
	acpi4asus-user@lists.sourceforge.net, linux-doc@vger.kernel.org,
	linux-kernel@vger.kernel.org, Randy Dunlap <rdunlap@xenotime.net>,
	Chris Bagwell <chris@cnpbagwell.com>,
	Corentin Chary <corentincj@iksaif.net>
Subject: [PATCH 10/14] eeepc-wmi: use the presence bit correctly
Date: Mon, 24 Jan 2011 17:23:54 +0100	[thread overview]
Message-ID: <1295886238-15961-11-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <1295886238-15961-1-git-send-email-corentincj@iksaif.net>

I checked some more DSDT, and it seems that I wasn't
totally right about the meaning of DSTS return value.
Bit 0 is clearly the status of the device, and I discovered
that bit 16 is set when the device is present.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 drivers/platform/x86/eeepc-wmi.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index aa9e1d1..391c32b 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -75,6 +75,9 @@ MODULE_ALIAS("wmi:"EEEPC_WMI_MGMT_GUID);
 #define EEEPC_WMI_DEVID_BACKLIGHT	0x00050012
 #define EEEPC_WMI_DEVID_TPDLED		0x00100011
 
+#define EEEPC_WMI_DSTS_STATUS_BIT	0x00000001
+#define EEEPC_WMI_DSTS_PRESENCE_BIT	0x00010000
+
 static bool hotplug_wireless;
 
 module_param(hotplug_wireless, bool, 0444);
@@ -265,16 +268,10 @@ static int eeepc_wmi_get_devstate_simple(u32 dev_id)
 	if (ACPI_FAILURE(status))
 		return -EINVAL;
 
-	/* If the device is present, DSTS will always set some bits
-	 * 0x00070000 - 1110000000000000000 - device supported
-	 * 0x00060000 - 1100000000000000000 - not supported
-	 * 0x00020000 - 0100000000000000000 - device supported
-	 * 0x00010000 - 0010000000000000000 - not supported / special mode ?
-	 */
-	if (!retval || retval == 0x00060000)
+	if (!(retval & EEEPC_WMI_DSTS_PRESENCE_BIT))
 		return -ENODEV;
 
-	return retval & 0x1;
+	return retval & EEEPC_WMI_DSTS_STATUS_BIT;
 }
 
 /*
-- 
1.7.3.4


WARNING: multiple messages have this Message-ID (diff)
From: Corentin Chary <corentincj-EjuBZuxMvz2sTnJN9+BGXg@public.gmane.org>
To: Matthew Garrett <mjg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: acpi4asus-user-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
	linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Chris Bagwell <chris-ZCD0YumhXB+iMFqZbmIluw@public.gmane.org>,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	platform-driver-x86-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
Subject: [PATCH 10/14] eeepc-wmi: use the presence bit correctly
Date: Mon, 24 Jan 2011 17:23:54 +0100	[thread overview]
Message-ID: <1295886238-15961-11-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <1295886238-15961-1-git-send-email-corentincj-EjuBZuxMvz2sTnJN9+BGXg@public.gmane.org>

I checked some more DSDT, and it seems that I wasn't
totally right about the meaning of DSTS return value.
Bit 0 is clearly the status of the device, and I discovered
that bit 16 is set when the device is present.

Signed-off-by: Corentin Chary <corentincj-EjuBZuxMvz2sTnJN9+BGXg@public.gmane.org>
---
 drivers/platform/x86/eeepc-wmi.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index aa9e1d1..391c32b 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -75,6 +75,9 @@ MODULE_ALIAS("wmi:"EEEPC_WMI_MGMT_GUID);
 #define EEEPC_WMI_DEVID_BACKLIGHT	0x00050012
 #define EEEPC_WMI_DEVID_TPDLED		0x00100011
 
+#define EEEPC_WMI_DSTS_STATUS_BIT	0x00000001
+#define EEEPC_WMI_DSTS_PRESENCE_BIT	0x00010000
+
 static bool hotplug_wireless;
 
 module_param(hotplug_wireless, bool, 0444);
@@ -265,16 +268,10 @@ static int eeepc_wmi_get_devstate_simple(u32 dev_id)
 	if (ACPI_FAILURE(status))
 		return -EINVAL;
 
-	/* If the device is present, DSTS will always set some bits
-	 * 0x00070000 - 1110000000000000000 - device supported
-	 * 0x00060000 - 1100000000000000000 - not supported
-	 * 0x00020000 - 0100000000000000000 - device supported
-	 * 0x00010000 - 0010000000000000000 - not supported / special mode ?
-	 */
-	if (!retval || retval == 0x00060000)
+	if (!(retval & EEEPC_WMI_DSTS_PRESENCE_BIT))
 		return -ENODEV;
 
-	return retval & 0x1;
+	return retval & EEEPC_WMI_DSTS_STATUS_BIT;
 }
 
 /*
-- 
1.7.3.4


------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d

  parent reply	other threads:[~2011-01-24 16:34 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-24 16:23 [PATCH 00/14] eeepc-wmi updates Corentin Chary
2011-01-24 16:23 ` [PATCH 01/14] eeepc-wmi: reorder keymap Corentin Chary
2011-01-24 16:23 ` [PATCH 02/14] eeepc-wmi: add wlan key found on 1015P Corentin Chary
2011-01-24 16:23 ` [PATCH 03/14] eeepc-wmi: add hotplug code for Eeepc 1000H Corentin Chary
2011-01-24 16:23 ` [PATCH 04/14] eeepc-wmi: serialize access to wmi method Corentin Chary
2011-01-24 16:23 ` [PATCH 05/14] eeepc-wmi: return proper error code in eeepc_rfkill_set() Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-24 16:23 ` [PATCH 06/14] eeepc-wmi: add an helper using simple return codes Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-24 16:23 ` [PATCH 07/14] eeepc-wmi: add hibernate/resume callbacks Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-24 16:23 ` [PATCH 08/14] eeepc-wmi: switch to platform_create_bundle() Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-24 16:23 ` [PATCH 09/14] eeepc-wmi: reorder defines Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-24 16:23 ` Corentin Chary [this message]
2011-01-24 16:23   ` [PATCH 10/14] eeepc-wmi: use the presence bit correctly Corentin Chary
2011-01-24 16:23 ` [PATCH 11/14] eeepc-wmi: add camera and card reader support Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-24 16:23 ` [PATCH 12/14] eeepc-wmi: add wimax support Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-24 16:23 ` [PATCH 13/14] eeepc-wmi: set the right key code for 0xe9 Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-24 16:23 ` [PATCH 14/14] eeepc-wmi: support backlight power (bl_power) attribute Corentin Chary
2011-01-24 16:23   ` Corentin Chary
2011-01-29  7:42   ` [PATCH v2 " Corentin Chary

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1295886238-15961-11-git-send-email-corentincj@iksaif.net \
    --to=corentincj@iksaif.net \
    --cc=acpi4asus-user@lists.sourceforge.net \
    --cc=chris@cnpbagwell.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mjg@redhat.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rdunlap@xenotime.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.