Hi Len, ACPI, and kernel folk,
Appended is a refresh of my patch adding an ACPI driver for Atlas
boards. I've done this patch against 2.6.17-rc4 and the only change
from the previous version is addition of input support.
Last time around, I posted a patch containing this button driver and
a patch to Luming's hotkey patch to add Atlas brightness control:
http://marc.theaimsgroup.com/?l=linux-acpi&m=114230435818457&w=2
( fyi, the brightness control part of that patch depends on Luming's
hotkey patch which I guess isn't in mainline. That patch is here at
http://bugzilla.kernel.org/show_bug.cgi?id=5749 )
That combined patch then got a sign off from Luming:
http://marc.theaimsgroup.com/?l=linux-acpi&m=114308645502914&w=2
After that I didn't do anything further and I guess nothing further
happened with that. Then I noticed Matthew Garrett's patch adding
input support to the acpi button driver.
http://marc.theaimsgroup.com/?l=linux-kernel&m=114547666722780&w=2
That looks like a good idea and I think it would work well with
evdev which makes application developers happy since they can do
XEvent->type == KeyPress then XLookupString with X. So I decided
to do something similar. That's what is in the patch below.
I've dropped the brightness portion from this patch. I think I'll
leave that for the future when Luming's hotkey stuff or Matthew's
backlight patches to asus acpi and others are in Len's tree or
mainline.
Please let me know if it looks okay and if you have any feedback
or suggestions.
Thanks,
Jaya Kumar
Signed-off-by: Jaya Kumar <[email protected]>
---
Kconfig | 11 +++
Makefile | 1
atlas_acpi.c | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 206 insertions(+)
---
diff -X linux-2.6.17-rc4/Documentation/dontdiff -X excludevid -uprN linux-2.6.17-rc4-vanilla/drivers/acpi/atlas_acpi.c linux-2.6.17-rc4/drivers/acpi/atlas_acpi.c
--- linux-2.6.17-rc4-vanilla/drivers/acpi/atlas_acpi.c 1970-01-01 07:30:00.000000000 +0730
+++ linux-2.6.17-rc4/drivers/acpi/atlas_acpi.c 2006-05-19 08:57:09.000000000 +0800
@@ -0,0 +1,194 @@
+/*
+ * atlas_acpi.c - Atlas Wallmount Touchscreen ACPI Extras
+ *
+ * Copyright (C) 2006 Jaya Kumar
+ * Based on Toshiba ACPI by John Belmonte and ASUS ACPI
+ * This work was sponsored by CIS(M) Sdn Bhd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/types.h>
+#include <linux/proc_fs.h>
+#include <asm/uaccess.h>
+#include <acpi/acpi_drivers.h>
+
+#define PROC_ATLAS "atlas"
+#define ACPI_ATLAS_NAME "Atlas ACPI"
+#define ACPI_ATLAS_CLASS "Atlas"
+#define ACPI_ATLAS_BUTTON_HID "ASIM0000"
+
+#ifdef CONFIG_INPUT
+static struct input_dev *input_dev;
+
+static void atlas_input_report(u8 address)
+{
+ int keycode;
+
+ keycode = KEY_F1 + (address & 0x0F);
+
+ if (address & 0x10)
+ input_report_key(input_dev, keycode, 0);
+ else
+ input_report_key(input_dev, keycode, 1);
+ input_sync(input_dev);
+}
+
+static int atlas_setup_input(void)
+{
+ int err;
+
+ input_dev = input_allocate_device();
+ if (!input_dev) {
+ printk(KERN_ERR "atlas: insufficient mem to allocate input device\n");
+ return -ENOMEM;
+ }
+
+ input_dev->name = "Atlas ACPI button driver";
+ input_dev->phys = "acpi/input0";
+ input_dev->id.bustype = BUS_HOST;
+ input_dev->evbit[LONG(EV_KEY)] = BIT(EV_KEY);
+ set_bit(KEY_F1 ,input_dev->keybit);
+ set_bit(KEY_F2 ,input_dev->keybit);
+ set_bit(KEY_F3 ,input_dev->keybit);
+ set_bit(KEY_F4 ,input_dev->keybit);
+ set_bit(KEY_F5 ,input_dev->keybit);
+ set_bit(KEY_F6 ,input_dev->keybit);
+ set_bit(KEY_F7 ,input_dev->keybit);
+ set_bit(KEY_F8 ,input_dev->keybit);
+ set_bit(KEY_F9 ,input_dev->keybit);
+
+ err = input_register_device(input_dev);
+ if (err) {
+ printk(KERN_ERR "atlas: couldn't register input device\n");
+ input_free_device(input_dev);
+ return err;
+ }
+
+ return 0;
+}
+
+static void atlas_free_input(void)
+{
+ if (input_dev)
+ input_unregister_device(input_dev);
+
+}
+#else
+#define atlas_free_input(...)
+#define atlas_setup_input(...) 0
+#define atlas_input_report(...)
+#endif
+
+/* button handling code */
+static acpi_status acpi_atlas_button_setup(acpi_handle region_handle,
+ u32 function, void *handler_context, void **return_context)
+{
+ *return_context =
+ (function != ACPI_REGION_DEACTIVATE) ? handler_context : NULL;
+
+ return AE_OK;
+}
+
+static acpi_status acpi_atlas_button_handler(u32 function,
+ acpi_physical_address address,
+ u32 bit_width, acpi_integer * value,
+ void *handler_context, void *region_context)
+{
+ acpi_status status;
+ struct acpi_device *dev;
+
+ dev = (struct acpi_device *) handler_context;
+ if (function == ACPI_WRITE) {
+ status = acpi_bus_generate_event(dev, 0x80, address);
+ atlas_input_report((u8) address);
+ } else {
+ printk(KERN_WARNING "atlas: shrugged on unexpected function"
+ ":function=%x,address=%x,value=%x\n",
+ function, (u32)address, (u32)*value);
+ status = -EINVAL;
+ }
+
+ return status ;
+}
+
+static int atlas_acpi_button_add(struct acpi_device *device)
+{
+ int err;
+
+ err = atlas_setup_input();
+ if (err)
+ return err;
+
+ /* hookup button handler */
+ return acpi_install_address_space_handler(device->handle,
+ 0x81, &acpi_atlas_button_handler,
+ &acpi_atlas_button_setup, device);
+}
+
+static int atlas_acpi_button_remove(struct acpi_device *device, int type)
+{
+ acpi_status status;
+
+ atlas_free_input();
+ status = acpi_remove_address_space_handler(device->handle,
+ 0x81, &acpi_atlas_button_handler);
+ if (ACPI_FAILURE(status))
+ printk(KERN_ERR "Atlas: Error removing addr spc handler\n");
+
+ return status;
+}
+
+static struct acpi_driver atlas_acpi_driver = {
+ .name = ACPI_ATLAS_NAME,
+ .class = ACPI_ATLAS_CLASS,
+ .ids = ACPI_ATLAS_BUTTON_HID,
+ .ops = {
+ .add = atlas_acpi_button_add,
+ .remove = atlas_acpi_button_remove,
+ },
+};
+
+static int atlas_acpi_init(void)
+{
+ int result;
+
+ result = acpi_bus_register_driver(&atlas_acpi_driver);
+ if (result < 0) {
+ printk(KERN_ERR "Atlas ACPI: Unable to register driver\n");
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+static void atlas_acpi_exit(void)
+{
+ acpi_bus_unregister_driver(&atlas_acpi_driver);
+}
+
+module_init(atlas_acpi_init);
+module_exit(atlas_acpi_exit);
+
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Atlas ACPI");
+MODULE_SUPPORTED_DEVICE("Atlas ACPI");
+
diff -X linux-2.6.17-rc4/Documentation/dontdiff -X excludevid -uprN linux-2.6.17-rc4-vanilla/drivers/acpi/Kconfig linux-2.6.17-rc4/drivers/acpi/Kconfig
--- linux-2.6.17-rc4-vanilla/drivers/acpi/Kconfig 2006-05-17 08:11:25.000000000 +0800
+++ linux-2.6.17-rc4/drivers/acpi/Kconfig 2006-05-19 09:00:03.000000000 +0800
@@ -192,7 +192,18 @@ config ACPI_ASUS
driver is still under development, so if your laptop is unsupported or
something works not quite as expected, please use the mailing list
available on the above page ([email protected])
+
+config ACPI_ATLAS
+ tristate "Atlas Wallmount Touchscreen Extras"
+ depends on X86
+ default n
+ ---help---
+ This driver is intended for Atlas wallmounted touchscreens.
+ The button events will show up in /proc/acpi/events and also
+ as scancodes F1 through F9, and in X if you use evdev.
+ If you have an Atlas wallmounted touchscreen, say Y or M here.
+
config ACPI_IBM
tristate "IBM ThinkPad Laptop Extras"
depends on X86
diff -X linux-2.6.17-rc4/Documentation/dontdiff -X excludevid -uprN linux-2.6.17-rc4-vanilla/drivers/acpi/Makefile linux-2.6.17-rc4/drivers/acpi/Makefile
--- linux-2.6.17-rc4-vanilla/drivers/acpi/Makefile 2006-05-17 08:11:25.000000000 +0800
+++ linux-2.6.17-rc4/drivers/acpi/Makefile 2006-05-18 13:06:05.000000000 +0800
@@ -53,6 +53,7 @@ obj-$(CONFIG_ACPI_SYSTEM) += system.o ev
obj-$(CONFIG_ACPI_DEBUG) += debug.o
obj-$(CONFIG_ACPI_NUMA) += numa.o
obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o
+obj-$(CONFIG_ACPI_ATLAS) += atlas_acpi.o
obj-$(CONFIG_ACPI_IBM) += ibm_acpi.o
obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o
obj-y += scan.o motherboard.o
Hi!
> +static int atlas_setup_input(void)
> +{
> + int err;
> +
> + input_dev = input_allocate_device();
> + if (!input_dev) {
> + printk(KERN_ERR "atlas: insufficient mem to allocate input device\n");
> + return -ENOMEM;
> + }
> +
> + input_dev->name = "Atlas ACPI button driver";
> + input_dev->phys = "acpi/input0";
> + input_dev->id.bustype = BUS_HOST;
> + input_dev->evbit[LONG(EV_KEY)] = BIT(EV_KEY);
> + set_bit(KEY_F1 ,input_dev->keybit);
", " please... and are you sure you want it as a F1..F9 keys?
> +/* button handling code */
> +static acpi_status acpi_atlas_button_setup(acpi_handle region_handle,
> + u32 function, void *handler_context, void **return_context)
> +{
> + *return_context =
> + (function != ACPI_REGION_DEACTIVATE) ? handler_context : NULL;
Too many spaces after ? I'd say.
> +static struct acpi_driver atlas_acpi_driver = {
> + .name = ACPI_ATLAS_NAME,
> + .class = ACPI_ATLAS_CLASS,
> + .ids = ACPI_ATLAS_BUTTON_HID,
> + .ops = {
> + .add = atlas_acpi_button_add,
> + .remove = atlas_acpi_button_remove,
> + },
> +};
Watch that whitespace...
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Hi!
> Hi Len, ACPI, and kernel folk,
>
> Appended is a refresh of my patch adding an ACPI driver for Atlas
> boards. I've done this patch against 2.6.17-rc4 and the only change
> from the previous version is addition of input support.
> diff -X linux-2.6.17-rc4/Documentation/dontdiff -X excludevid -uprN linux-2.6.17-rc4-vanilla/drivers/acpi/atlas_acpi.c linux-2.6.17-rc4/drivers/acpi/atlas_acpi.c
> --- linux-2.6.17-rc4-vanilla/drivers/acpi/atlas_acpi.c 1970-01-01 07:30:00.000000000 +0730
> +++ linux-2.6.17-rc4/drivers/acpi/atlas_acpi.c 2006-05-19 08:57:09.000000000 +0800
> +
> +#define PROC_ATLAS "atlas"
And this is now unused... good. (But please remove the define).
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On 5/22/06, Pavel Machek <[email protected]> wrote:
> > + set_bit(KEY_F1 ,input_dev->keybit);
>
> ", " please... and are you sure you want it as a F1..F9 keys?
Will correct the ",", it was a typo. I picked F1 through F9 because
distributors are free to label the fascia of the panel as they wish. I
figured F1 through F9 would be a sufficiently generic selection. What
do you recommend?
> > +/* button handling code */
> > +static acpi_status acpi_atlas_button_setup(acpi_handle region_handle,
> > + u32 function, void *handler_context, void **return_context)
> > +{
> > + *return_context =
> > + (function != ACPI_REGION_DEACTIVATE) ? handler_context : NULL;
>
> Too many spaces after ? I'd say.
Agreed. Will correct.
>
> > +static struct acpi_driver atlas_acpi_driver = {
> > + .name = ACPI_ATLAS_NAME,
> > + .class = ACPI_ATLAS_CLASS,
> > + .ids = ACPI_ATLAS_BUTTON_HID,
> > + .ops = {
> > + .add = atlas_acpi_button_add,
> > + .remove = atlas_acpi_button_remove,
> > + },
> > +};
>
> Watch that whitespace...
Done. And I'll remove that proc define.
Thanks,
jayakumar
> Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
>
>( fyi, the brightness control part of that patch depends on Luming's
>hotkey patch which I guess isn't in mainline. That patch is here at
>http://bugzilla.kernel.org/show_bug.cgi?id=5749 )
>
>That combined patch then got a sign off from Luming:
>
>http://marc.theaimsgroup.com/?l=linux-acpi&m=114308645502914&w=2
>
>After that I didn't do anything further and I guess nothing further
>happened with that. Then I noticed Matthew Garrett's patch adding
>input support to the acpi button driver.
Ok, I will push them into mm tree.
--Luming
On 5/23/06, Yu, Luming <[email protected]> wrote:
> >http://marc.theaimsgroup.com/?l=linux-acpi&m=114308645502914&w=2
> >
> >After that I didn't do anything further and I guess nothing further
> >happened with that. Then I noticed Matthew Garrett's patch adding
> >input support to the acpi button driver.
>
> Ok, I will push them into mm tree.
>
I assume you mean you are going to push the hotkey patch. Not the
atlas patch. Andrew applied the v4 patch of atlas acpi to -mm already.
jaya