On Tue, Aug 03, 2010 at 04:29:36PM -0400, Ryan H. Lewis wrote:
> Below is a patch which adds support for many Fujitsu Tablet PC
> Buttons, and automatic screen rotation. This is my first kernel patch
> and I am not the original author of this code.
Looks like a good start, only a few minor things below:
>
> Thanks,
> rhl
> =========================================================
> Signed-off-by: Ryan H. Lewis <me at ryanlewis.net>
Needs to be a real email address.
> Patch Author: Ryan H. Lewis <me AT ryanlewis DOT net>
> Original Author of this code is Robert Gerlach at khnz AT gmx DOT de
Same with these, please use real email addresses.
> rhl is volunteering to help maintain this code with Robert Gerlach, this is rhl's first kernel patch
>
> This is a driver for the tablet buttons and the tablet mode switch of
> many Fujitsu tablet PCs. The driver is based on reverse-engineering of
> the Windows driver. I have no specification for this device.
The signed-off-by goes at the end of the changelog comment.
> --- a/drivers/input/misc/Kconfig
> +++ b/drivers/input/misc/Kconfig
> @@ -104,6 +104,19 @@ config INPUT_APANEL
> To compile this driver as a module, choose M here: the module will
> be called apanel.
>
> +config INPUT_FSC_BTNS
> + tristate "Fujitsu tablet PCs buttons"
> + depends on X86
> + help
> + Say Y here for support of the tablet buttons and the display
> + orientation switch, used on many Fujitsu tablet PCs (like
> + Stylistic ST5xxx, Lifebook P1xxx and Lifebook T-Series).
> +
> + To compile this driver as a module, choose M here: the module will
> + be called fsc_btns.
> +
> +
> +
Two extra lines that are not needed here.
> config INPUT_IXP4XX_BEEPER
> tristate "IXP4XX Beeper support"
> depends on ARCH_IXP4XX
> diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
> index 71fe57d..bc3eca2 100644
> --- a/drivers/input/misc/Makefile
> +++ b/drivers/input/misc/Makefile
> @@ -9,6 +9,7 @@ obj-$(CONFIG_INPUT_AD714X) += ad714x.o
> obj-$(CONFIG_INPUT_AD714X_I2C) += ad714x-i2c.o
> obj-$(CONFIG_INPUT_AD714X_SPI) += ad714x-spi.o
> obj-$(CONFIG_INPUT_APANEL) += apanel.o
> +obj-$(CONFIG_INPUT_FSC_BTNS) += fsc_btns.o
> obj-$(CONFIG_INPUT_ATI_REMOTE) += ati_remote.o
> obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
> obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
> diff --git a/drivers/input/misc/fsc_btns.c b/drivers/input/misc/fsc_btns.c
> new file mode 100644
> index 0000000..c26989b
> --- /dev/null
> +++ b/drivers/input/misc/fsc_btns.c
> @@ -0,0 +1,739 @@
> +/* Kernel driver for FSC Tablet PC buttons
> + *
> + * Copyright (C) 2006-2010 Robert Gerlach <khnz@xxxxxxxxxxxxxxxxxxxxx>
> + * Copyright (C) 2005-2006 Jan Rychter <jan@xxxxxxxxxxx>
> + *
> + * You can redistribute and/or modify this program under the terms of the
> + * GNU General Public License version 2 as published by the Free Software
> + * Foundation.
> + *
> + * 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.
> + */
> +
> +#ifdef HAVE_CONFIG_H
> +# include "../../config.h"
> +#endif
You can delete this.
> +
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/moduleparam.h>
> +#include <linux/version.h>
Don't need version.h either.
> +#include <linux/dmi.h>
> +#include <linux/bitops.h>
> +#include <linux/io.h>
> +#include <linux/ioport.h>
> +#include <linux/acpi.h>
> +#include <linux/device.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/input.h>
> +#include <linux/time.h>
> +#include <linux/timer.h>
> +#include <linux/delay.h>
> +#include <linux/jiffies.h>
> +
> +#define MODULENAME "fsc_btns"
> +
> +#ifndef HAVE_CONFIG_H
> +# define REPEAT_DELAY 700
> +# define REPEAT_RATE 16
> +# define STICKY_TIMEOUT 1400
> +#endif
There is no "HAVE_CONFIG_H in the code, so you can remove that.
> +
> +#undef DEBUG
Not needed.
> +#define SPLIT_INPUT_DEVICE
What is this for?
> +
> +static const struct acpi_device_id fscbtns_ids[] = {
> + { .id = "FUJ02BD" },
> + { .id = "FUJ02BF" },
> + { .id = "" }
> +};
> +
> +#if defined(STICKY_TIMEOUT) && (STICKY_TIMEOUT > 0)
> +static const unsigned long modification_mask[BITS_TO_LONGS(KEY_MAX)] = {
> + [BIT_WORD(KEY_LEFTSHIFT)] = BIT_MASK(KEY_LEFTSHIFT),
> + [BIT_WORD(KEY_RIGHTSHIFT)] = BIT_MASK(KEY_RIGHTSHIFT),
> + [BIT_WORD(KEY_LEFTCTRL)] = BIT_MASK(KEY_LEFTCTRL),
> + [BIT_WORD(KEY_RIGHTCTRL)] = BIT_MASK(KEY_RIGHTCTRL),
> + [BIT_WORD(KEY_LEFTALT)] = BIT_MASK(KEY_LEFTALT),
> + [BIT_WORD(KEY_RIGHTALT)] = BIT_MASK(KEY_RIGHTALT),
> + [BIT_WORD(KEY_LEFTMETA)] = BIT_MASK(KEY_LEFTMETA),
> + [BIT_WORD(KEY_RIGHTMETA)] = BIT_MASK(KEY_RIGHTMETA),
> + [BIT_WORD(KEY_COMPOSE)] = BIT_MASK(KEY_COMPOSE),
> + [BIT_WORD(KEY_LEFTALT)] = BIT_MASK(KEY_LEFTALT),
> + [BIT_WORD(KEY_FN)] = BIT_MASK(KEY_FN)};
> +#endif
> +
> +struct fscbtns_config {
> + int invert_orientation_bit;
> + unsigned short keymap[16];
> +};
> +
> +static struct fscbtns_config config_Lifebook_Tseries __initdata = {
> + .invert_orientation_bit = 1,
> + .keymap = {
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_SCROLLDOWN,
> + KEY_SCROLLUP,
> + KEY_DIRECTION,
> + KEY_LEFTCTRL,
> + KEY_BRIGHTNESSUP,
> + KEY_BRIGHTNESSDOWN,
> + KEY_BRIGHTNESS_ZERO,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_LEFTALT
> + }
> +};
> +
> +static struct fscbtns_config config_Lifebook_U810 __initdata = {
> + .invert_orientation_bit = 1,
> + .keymap = {
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_PROG1,
> + KEY_PROG2,
> + KEY_DIRECTION,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_UP,
> + KEY_DOWN,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_FN,
> + KEY_SLEEP
> + }
> +};
> +
> +static struct fscbtns_config config_Stylistic_Tseries __initdata = {
> + .invert_orientation_bit = 0,
> + .keymap = {
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_PRINT,
> + KEY_BACKSPACE,
> + KEY_SPACE,
> + KEY_ENTER,
> + KEY_BRIGHTNESSUP,
> + KEY_BRIGHTNESSDOWN,
> + KEY_DOWN,
> + KEY_UP,
> + KEY_SCROLLUP,
> + KEY_SCROLLDOWN,
> + KEY_FN
> + }
> +};
> +
> +static struct fscbtns_config config_Stylistic_ST5xxx __initdata = {
> + .invert_orientation_bit = 0,
> + .keymap = {
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_RESERVED,
> + KEY_MAIL,
> + KEY_DIRECTION,
> + KEY_ESC,
> + KEY_ENTER,
> + KEY_BRIGHTNESSUP,
> + KEY_BRIGHTNESSDOWN,
> + KEY_DOWN,
> + KEY_UP,
> + KEY_SCROLLUP,
> + KEY_SCROLLDOWN,
> + KEY_FN,
> + KEY_LEFTALT
> + }
> +};
> +
> +static struct { /* fscbtns_t */
> + struct platform_device *pdev;
> + struct input_dev *idev;
> +#ifdef SPLIT_INPUT_DEVICE
> + struct input_dev *idev_sw;
> +#endif
> +#if (defined(STICKY_TIMEOUT) && (STICKY_TIMEOUT > 0))
> + struct timer_list timer;
> +#endif
Don't put #ifdef in .c files. Based on the above, this can all be fixed
up without it.
> +
> + unsigned int interrupt;
> + unsigned int address;
> + struct fscbtns_config config;
> +
> + int orientation;
> +} fscbtns;
> +
> +static unsigned int user_model;
> +module_param_named(model, user_model, uint, 0);
> +MODULE_PARM_DESC(model, "model (1 = Stylistic, 2 = Lifebook T- and P-Series, 3 = Stylistic ST5xxx, 4 = Lifebook U800)");
We can't determine the model number dynamically from what is present in
the system? No one is going to want to configure this in this manner.
> +
> +/*** HELPER *******************************************************************/
> +
> +static inline u8 fscbtns_ack(void)
> +{
> + return inb(fscbtns.address+2);
Try running the patch through scripts/checkpatch.pl to fix stuff like
this up.
> +}
> +
> +static inline u8 fscbtns_status(void)
> +{
> + return inb(fscbtns.address+6);
> +}
> +
> +static inline u8 fscbtns_read_register(const u8 addr)
> +{
> + outb(addr, fscbtns.address);
> + return inb(fscbtns.address+4);
> +}
> +
> +static inline void fscbtns_use_config(struct fscbtns_config *config)
> +{
> + memcpy(&fscbtns.config, config, sizeof(struct fscbtns_config));
> +}
> +
> +
> +/*** INPUT ********************************************************************/
> +
> +static int __devinit input_fscbtns_setup(struct device *dev)
> +{
> + struct input_dev *idev;
> + int error;
> + int x;
> +
> + idev = input_allocate_device();
> + if (!idev)
> + return -ENOMEM;
> +
> + idev->dev.parent = dev;
> + idev->phys = "fsc/input0";
> + idev->name = "fsc tablet buttons";
> + idev->id.bustype = BUS_HOST;
> + idev->id.vendor = 0x1734; /* "Fujitsu Siemens Computer GmbH" from pci.ids */
> + idev->id.product = 0x0001;
> + idev->id.version = 0x0101;
> +
> + idev->keycode = fscbtns.config.keymap;
> + idev->keycodesize = sizeof(fscbtns.config.keymap[0]);
> + idev->keycodemax = ARRAY_SIZE(fscbtns.config.keymap);
> +
> +#ifdef REPEAT_RATE
> + __set_bit(EV_REP, idev->evbit);
> +#endif
Again, no #ifdef.
> + __set_bit(EV_KEY, idev->evbit);
> +
> + for(x = 0; x < ARRAY_SIZE(fscbtns.config.keymap); x++)
> + if (fscbtns.config.keymap[x])
> + __set_bit(fscbtns.config.keymap[x], idev->keybit);
> +
> + __set_bit(EV_MSC, idev->evbit);
> + __set_bit(MSC_SCAN, idev->mscbit);
> +
> +#ifndef SPLIT_INPUT_DEVICE
> + __set_bit(EV_SW, idev->evbit);
> + __set_bit(SW_TABLET_MODE, idev->swbit);
> +#endif
> +
> + error = input_register_device(idev);
> + if (error) {
> + input_free_device(idev);
> + return error;
> + }
> +
> +#ifdef REPEAT_RATE
> + idev->rep[REP_DELAY] = REPEAT_DELAY;
> + idev->rep[REP_PERIOD] = 1000 / REPEAT_RATE;
> +#endif
> +
> + fscbtns.idev = idev;
> + return 0;
> +}
> +
> +#ifdef SPLIT_INPUT_DEVICE
> +static int __devinit input_fscbtns_setup_sw(struct device *dev)
> +{
> + struct input_dev *idev;
> + int error;
> +
> + idev = input_allocate_device();
> + if (!idev)
> + return -ENOMEM;
> +
> + idev->dev.parent = dev;
> + idev->phys = "fsc/input1";
> + idev->name = "fsc tablet switch";
> + idev->id.bustype = BUS_HOST;
> + idev->id.vendor = 0x1734; /* "Fujitsu Siemens Computer GmbH" from pci.ids */
> + idev->id.product = 0x0002;
> + idev->id.version = 0x0101;
> +
> + __set_bit(EV_SW, idev->evbit);
> + __set_bit(SW_TABLET_MODE, idev->swbit);
> +
> + error = input_register_device(idev);
> + if (error) {
> + input_free_device(idev);
> + return error;
> + }
> +
> + fscbtns.idev_sw = idev;
> + return 0;
> +}
> +#endif
> +
> +static void input_fscbtns_remove(void)
> +{
> + if (fscbtns.idev)
> + input_unregister_device(fscbtns.idev);
> +#ifdef SPLIT_INPUT_DEVICE
> + if (fscbtns.idev_sw)
> + input_unregister_device(fscbtns.idev_sw);
> +#endif
> +}
> +
> +static void fscbtns_report_orientation(void)
> +{
> +#ifdef SPLIT_INPUT_DEVICE
> + struct input_dev *idev = fscbtns.idev_sw;
> +#else
> + struct input_dev *idev = fscbtns.idev;
> +#endif
> +
> + int orientation = fscbtns_read_register(0xdd);
> +
> + if (orientation & 0x02) {
> + orientation ^= fscbtns.config.invert_orientation_bit;
> + orientation &= 0x01;
> +
> + if (orientation != fscbtns.orientation) {
> + input_report_switch(idev, SW_TABLET_MODE,
> + fscbtns.orientation = orientation);
> + input_sync(idev);
> + }
> + }
> +}
> +
> +#if defined(STICKY_TIMEOUT) && (STICKY_TIMEOUT > 0)
> +static void fscbtns_sticky_timeout(unsigned long keycode)
> +{
> + input_report_key(fscbtns.idev, keycode, 0);
> + fscbtns.timer.data = 0;
> + input_sync(fscbtns.idev);
> +}
> +
> +static inline int fscbtns_sticky_report_key(unsigned int keycode, int pressed)
> +{
> + if (pressed) {
> + del_timer(&fscbtns.timer);
> + fscbtns.timer.expires = jiffies + (STICKY_TIMEOUT*HZ)/1000;
> +
> + if (fscbtns.timer.data == keycode) {
> + input_report_key(fscbtns.idev, keycode, 0);
> + input_sync(fscbtns.idev);
> + }
> +
> + return 0;
> + }
> +
> + if ((fscbtns.timer.data) && (fscbtns.timer.data != keycode)) {
> + input_report_key(fscbtns.idev, keycode, 0);
> + input_sync(fscbtns.idev);
> + input_report_key(fscbtns.idev, fscbtns.timer.data, 0);
> + fscbtns.timer.data = 0;
> + return 1;
> + }
> +
> + if (test_bit(keycode, modification_mask) && (fscbtns.timer.expires > jiffies)) {
> + fscbtns.timer.data = keycode;
> + fscbtns.timer.function = fscbtns_sticky_timeout;
> + add_timer(&fscbtns.timer);
> + return 1;
> + }
> +
> + return 0;
> +}
> +#endif
> +
> +static void fscbtns_report_key(unsigned int kmindex, int pressed)
> +{
> + unsigned int keycode = fscbtns.config.keymap[kmindex];
> + if (keycode == KEY_RESERVED)
> + return;
> +
> + if (pressed)
> + input_event(fscbtns.idev, EV_MSC, MSC_SCAN, kmindex);
> +
> +#if defined(STICKY_TIMEOUT) && (STICKY_TIMEOUT > 0)
> + if (fscbtns_sticky_report_key(keycode, pressed))
> + return;
> +#endif
> +
> + input_report_key(fscbtns.idev, keycode, pressed);
> +}
> +
> +static void fscbtns_event(void)
> +{
> + unsigned long keymask;
> + unsigned long changed;
> + static unsigned long prev_keymask = 0;
> +
> + fscbtns_report_orientation();
> +
> + keymask = fscbtns_read_register(0xde);
> + keymask |= fscbtns_read_register(0xdf) << 8;
> + keymask ^= 0xffff;
> +
> + changed = keymask ^ prev_keymask;
> +
> + if (changed) {
> + int x = 0;
> + int pressed = !!(keymask & changed);
> +
> + /* save current state and filter not changed bits */
> + prev_keymask = keymask;
> +
> + /* get number of changed bit */
> + while(!test_bit(x, &changed))
> + x++;
> +
> + fscbtns_report_key(x, pressed);
> + }
> +
> + input_sync(fscbtns.idev);
> +}
> +
> +
> +/*** INTERRUPT ****************************************************************/
> +
> +static void fscbtns_isr_do(struct work_struct *work)
> +{
> + fscbtns_event();
> + fscbtns_ack();
> +}
> +
> +static DECLARE_WORK(isr_wq, fscbtns_isr_do);
> +
> +static irqreturn_t fscbtns_isr(int irq, void *dev_id)
> +{
> + if (!(fscbtns_status() & 0x01))
> + return IRQ_NONE;
> +
> + schedule_work(&isr_wq);
> + return IRQ_HANDLED;
> +}
> +
> +
> +/*** DEVICE *******************************************************************/
> +
> +static int fscbtns_busywait(void)
> +{
> + int timeout_counter = 100;
> +
> + while(fscbtns_status() & 0x02 && --timeout_counter)
> + msleep(10);
> +
> + return !timeout_counter;
> +}
> +
> +static void fscbtns_reset(void)
> +{
> + fscbtns_ack();
> + if (fscbtns_busywait())
> + printk(KERN_WARNING MODULENAME ": timeout, real reset needed!\n");
> +}
> +
> +static int __devinit fscbtns_probe(struct platform_device *pdev)
> +{
> + int error;
> +
> + error = input_fscbtns_setup(&pdev->dev);
> + if (error)
> + goto err_input;
> +
> +#ifdef SPLIT_INPUT_DEVICE
> + error = input_fscbtns_setup_sw(&pdev->dev);
> + if (error)
> + goto err_input;
> +#endif
> +
> + if (!request_region(fscbtns.address, 8, MODULENAME)) {
> + printk(KERN_ERR MODULENAME ": region 0x%04x busy\n", fscbtns.address);
> + error = -EBUSY;
> + goto err_input;
> + }
> +
> + fscbtns_reset();
> +
> + fscbtns_report_orientation();
> + input_sync(fscbtns.idev);
> +
> + error = request_irq(fscbtns.interrupt, fscbtns_isr,
> + IRQF_SHARED, MODULENAME, fscbtns_isr);
> + if (error) {
> + printk(KERN_ERR MODULENAME ": unable to get irq %d\n", fscbtns.interrupt);
> + goto err_io;
> + }
> +
> + return 0;
> +
> +err_io:
> + release_region(fscbtns.address, 8);
> +err_input:
> + input_fscbtns_remove();
> + return error;
> +}
> +
> +static int __devexit fscbtns_remove(struct platform_device *pdev)
> +{
> + free_irq(fscbtns.interrupt, fscbtns_isr);
> + release_region(fscbtns.address, 8);
> + input_fscbtns_remove();
> + return 0;
> +}
> +
> +#ifdef CONFIG_PM
> +static int fscbtns_resume(struct platform_device *pdev)
> +{
> + fscbtns_reset();
> +#if 0 // because Xorg Bug #9623 (SEGV at resume if display was rotated)
> + fscbtns_report_orientation();
> + input_sync(fscbtns.idev);
> +#endif
> + return 0;
> +}
> +#else
> +#define fscbtns_resume NULL
> +#endif
> +
> +static struct platform_driver fscbtns_platform_driver = {
> + .driver = {
> + .name = MODULENAME,
> + .owner = THIS_MODULE,
> + },
> + .probe = fscbtns_probe,
> + .remove = __devexit_p(fscbtns_remove),
> + .resume = fscbtns_resume,
> +};
> +
> +
> +/*** ACPI *********************************************************************/
> +
> +static acpi_status fscbtns_walk_resources(struct acpi_resource *res, void *data)
> +{
> + switch(res->type) {
> + case ACPI_RESOURCE_TYPE_IRQ:
> + fscbtns.interrupt = res->data.irq.interrupts[0];
> + return AE_OK;
> +
> + case ACPI_RESOURCE_TYPE_IO:
> + fscbtns.address = res->data.io.minimum;
> + return AE_OK;
> +
> + case ACPI_RESOURCE_TYPE_END_TAG:
> + if (fscbtns.interrupt && fscbtns.address)
> + return AE_OK;
> + else
> + return AE_NOT_FOUND;
> +
> + default:
> + return AE_ERROR;
> + }
> +}
> +
> +static int acpi_fscbtns_add(struct acpi_device *adev)
> +{
> + acpi_status status;
> +
> + if (!adev)
> + return -EINVAL;
> +
> + status = acpi_walk_resources(adev->handle, METHOD_NAME__CRS,
> + fscbtns_walk_resources, NULL);
> + if (ACPI_FAILURE(status))
> + return -ENODEV;
> +
> + return 0;
> +}
> +
> +static struct acpi_driver acpi_fscbtns_driver = {
> + .name = MODULENAME,
> + .class = "hotkey",
> + .ids = fscbtns_ids,
> + .ops = {
> + .add = acpi_fscbtns_add
> + }
> +};
> +
> +
> +/*** DMI **********************************************************************/
> +
> +static int __init fscbtns_dmi_matched(const struct dmi_system_id *dmi)
> +{
> + printk(KERN_INFO MODULENAME ": found: %s\n", dmi->ident);
> + fscbtns_use_config(dmi->driver_data);
> + return 1;
> +}
> +
> +static struct dmi_system_id dmi_ids[] __initdata = {
> + {
> + .callback = fscbtns_dmi_matched,
> + .ident = "Fujitsu Siemens P/T Series",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK")
> + },
> + .driver_data = &config_Lifebook_Tseries
> + },
> + {
> + .callback = fscbtns_dmi_matched,
> + .ident = "Fujitsu Lifebook T Series",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook T")
> + },
> + .driver_data = &config_Lifebook_Tseries
> + },
> + {
> + .callback = fscbtns_dmi_matched,
> + .ident = "Fujitsu Siemens Stylistic T Series",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Stylistic T")
> + },
> + .driver_data = &config_Stylistic_Tseries
> + },
> + {
> + .callback = fscbtns_dmi_matched,
> + .ident = "Fujitsu LifeBook U810",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook U810")
> + },
> + .driver_data = &config_Lifebook_U810
> + },
> + {
> + .callback = fscbtns_dmi_matched,
> + .ident = "Fujitsu Siemens Stylistic ST5xxx Series",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "STYLISTIC ST5")
> + },
> + .driver_data = &config_Stylistic_ST5xxx
> + },
> + {
> + .callback = fscbtns_dmi_matched,
> + .ident = "Fujitsu Siemens Stylistic ST5xxx Series",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Stylistic ST5")
> + },
> + .driver_data = &config_Stylistic_ST5xxx
> + },
> + {
> + .callback = fscbtns_dmi_matched,
> + .ident = "Unknown (using defaults)",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, ""),
> + DMI_MATCH(DMI_PRODUCT_NAME, "")
> + },
> + .driver_data = &config_Lifebook_Tseries
> + },
> + { NULL }
> +};
This should have a MODULE_DEVICE_TABLE() entry afterward to match up
with the DMI values so the module is automatically loaded on these types
of systems.
> +static int __init fscbtns_module_init(void)
> +{
> + int error;
> +
> + switch(user_model) {
> + case 1:
> + fscbtns_use_config(&config_Stylistic_Tseries);
> + break;
> + case 2:
> + fscbtns_use_config(&config_Lifebook_Tseries);
> + break;
> + case 3:
> + fscbtns_use_config(&config_Stylistic_ST5xxx);
> + break;
> + case 4:
> + fscbtns_use_config(&config_Lifebook_U810);
> + break;
> + default:
> + dmi_check_system(dmi_ids);
> + }
No hard-coding of models, do everything based on what system we have
found.
> +MODULE_DEVICE_TABLE(cpi, fscbtns_ids);
Ah, that's good, but the DMI stuff is also good to have.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
