From: Stelian Pop <stelian@popies.net>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Linus Torvalds <torvalds@transmeta.com>
Subject: [PATCH 2.5.50+BK] sonypi driver update
Date: Mon, 2 Dec 2002 11:58:10 +0100 [thread overview]
Message-ID: <20021202115810.A17187@deep-space-9.dsnet> (raw)
Hi,
This patch corrects a small typo in the previous patch (in the ZOOM
button definition) and adds events generated by the Memory Stick
reader on VAIO U3 laptops (thanks to Kunihiko IMAI).
Linus, please apply.
Stelian.
===== Documentation/sonypi.txt 1.9 vs edited =====
--- 1.9/Documentation/sonypi.txt Fri Nov 22 14:48:03 2002
+++ edited/Documentation/sonypi.txt Mon Dec 2 11:18:17 2002
@@ -95,6 +95,7 @@
SONYPI_ZOOM_MASK 0x0100
SONYPI_THUMBPHRASE_MASK 0x0200
SONYPI_MEYE_MASK 0x0400
+ SONYPI_MEMORYSTICK_MASK 0x0800
Module use:
-----------
===== drivers/char/sonypi.h 1.12 vs edited =====
--- 1.12/drivers/char/sonypi.h Fri Nov 22 14:56:48 2002
+++ edited/drivers/char/sonypi.h Mon Dec 2 11:16:40 2002
@@ -37,7 +37,7 @@
#ifdef __KERNEL__
#define SONYPI_DRIVER_MAJORVERSION 1
-#define SONYPI_DRIVER_MINORVERSION 15
+#define SONYPI_DRIVER_MINORVERSION 16
#define SONYPI_DEVICE_MODEL_TYPE1 1
#define SONYPI_DEVICE_MODEL_TYPE2 2
@@ -165,6 +165,7 @@
#define SONYPI_ZOOM_MASK 0x00000100
#define SONYPI_THUMBPHRASE_MASK 0x00000200
#define SONYPI_MEYE_MASK 0x00000400
+#define SONYPI_MEMORYSTICK_MASK 0x00000800
struct sonypi_event {
u8 data;
@@ -262,7 +263,7 @@
/* The set of possible zoom events */
static struct sonypi_event sonypi_zoomev[] = {
- { 0x3a, SONYPI_EVENT_ZOOM_PRESSED },
+ { 0x39, SONYPI_EVENT_ZOOM_PRESSED },
{ 0, 0 }
};
@@ -279,6 +280,13 @@
{ 0, 0 }
};
+/* The set of possible memorystick events */
+static struct sonypi_event sonypi_memorystickev[] = {
+ { 0x53, SONYPI_EVENT_MEMORYSTICK_INSERT },
+ { 0x54, SONYPI_EVENT_MEMORYSTICK_EJECT },
+ { 0, 0 }
+};
+
struct sonypi_eventtypes {
int model;
u8 data;
@@ -303,6 +311,7 @@
{ SONYPI_DEVICE_MODEL_TYPE2, 0x08, SONYPI_HELP_MASK, sonypi_helpev },
{ SONYPI_DEVICE_MODEL_TYPE2, 0x08, SONYPI_ZOOM_MASK, sonypi_zoomev },
{ SONYPI_DEVICE_MODEL_TYPE2, 0x08, SONYPI_THUMBPHRASE_MASK, sonypi_thumbphraseev },
+ { SONYPI_DEVICE_MODEL_TYPE2, 0x08, SONYPI_MEMORYSTICK_MASK, sonypi_memorystickev },
{ 0, 0, 0, 0 }
};
===== include/linux/sonypi.h 1.6 vs edited =====
--- 1.6/include/linux/sonypi.h Fri Nov 22 00:45:49 2002
+++ edited/include/linux/sonypi.h Mon Dec 2 11:14:30 2002
@@ -91,6 +91,9 @@
#define SONYPI_EVENT_THUMBPHRASE_PRESSED 51
#define SONYPI_EVENT_MEYE_FACE 52
#define SONYPI_EVENT_MEYE_OPPOSITE 53
+#define SONYPI_EVENT_MEMORYSTICK_INSERT 54
+#define SONYPI_EVENT_MEMORYSTICK_EJECT 55
+
/* get/set brightness */
#define SONYPI_IOCGBRT _IOR('v', 0, __u8)
--
Stelian Pop <stelian@popies.net>
reply other threads:[~2002-12-02 10:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20021202115810.A17187@deep-space-9.dsnet \
--to=stelian@popies.net \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox