Only in ../linux-2.6-2.6.25-patched/arch/x86/kernel: asm-offsets.s Only in ../linux-2.6-2.6.25-patched/arch/x86/kernel: .asm-offsets.s.cmd Only in ../linux-2.6-2.6.25-patched: .config Only in ../linux-2.6-2.6.25-patched: .config.old Only in ../linux-2.6-2.6.25-patched/drivers/md: mktables Only in ../linux-2.6-2.6.25-patched/drivers/md: .mktables.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6altivec1.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6altivec1.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6altivec2.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6altivec2.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6altivec4.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6altivec4.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6altivec8.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6altivec8.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6int16.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6int16.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6int1.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6int1.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6int2.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6int2.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6int32.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6int32.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6int4.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6int4.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6int8.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6int8.c.cmd Only in ../linux-2.6-2.6.25-patched/drivers/md: raid6tables.c Only in ../linux-2.6-2.6.25-patched/drivers/md: .raid6tables.c.cmd diff -urp -x '*.mod.c' -x '*.o' -x '*.o.cmd' -x '*.ko' -x '*.ko.cmd' -x modules.order linux-2.6-2.6.25/drivers/misc/fujitsu-laptop.c ../linux-2.6-2.6.25-patched/drivers/misc/fujitsu-laptop.c --- linux-2.6-2.6.25/drivers/misc/fujitsu-laptop.c 2008-04-17 03:49:44.000000000 +0100 +++ ../linux-2.6-2.6.25-patched/drivers/misc/fujitsu-laptop.c 2008-06-04 22:36:22.000000000 +0100 @@ -49,9 +49,10 @@ #include #include #include +#include #include -#define FUJITSU_DRIVER_VERSION "0.3" +#define FUJITSU_DRIVER_VERSION "0.3E" #define FUJITSU_LCD_N_LEVELS 8 @@ -60,6 +61,10 @@ #define ACPI_FUJITSU_DRIVER_NAME "Fujitsu laptop FUJ02B1 ACPI extras driver" #define ACPI_FUJITSU_DEVICE_NAME "Fujitsu FUJ02B1" +#define ACPI_FUJITSU_EXT_HID "FUJ02E3" +#define ACPI_FUJITSU_EXT_DRIVER_NAME "Fujitsu laptop FUJ02E3 ACPI extras driver" +#define ACPI_FUJITSU_EXT_DEVICE_NAME "Fujitsu FUJ02E3" + struct fujitsu_t { acpi_handle acpi_handle; struct backlight_device *bl_device; @@ -68,6 +73,10 @@ struct fujitsu_t { unsigned long fuj02b1_state; unsigned int brightness_changed; unsigned int brightness_level; + + acpi_handle acpi_ext_handle; + unsigned long fuj02e3_state; + int using_fuj02e3; }; static struct fujitsu_t *fujitsu; @@ -141,6 +150,72 @@ static struct backlight_ops fujitsubl_op .update_status = bl_update_status, }; +/* Keyboard illumination stuff. */ + +static int call_fuj02e3_func(int cmd, int a0, int a1, int a2) +{ + acpi_status status = AE_OK; + union acpi_object params[4] = { + { .type = ACPI_TYPE_INTEGER }, + { .type = ACPI_TYPE_INTEGER }, + { .type = ACPI_TYPE_INTEGER }, + { .type = ACPI_TYPE_INTEGER } + }; + struct acpi_object_list arg_list = { 4, ¶ms[0] }; + struct acpi_buffer output; + union acpi_object out_obj; + acpi_handle handle = NULL; + + if (!fujitsu->acpi_ext_handle) + return -ENODEV; + + status = acpi_get_handle(fujitsu->acpi_ext_handle, "FUNC", &handle); + if (ACPI_FAILURE(status)) { + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "FUNC not present\n")); + return -ENODEV; + } + + params[0].integer.value = cmd; + params[1].integer.value = a0; + params[2].integer.value = a1; + params[3].integer.value = a2; + + output.length = sizeof(out_obj); + output.pointer = &out_obj; + + status = acpi_evaluate_object(handle, NULL, &arg_list, &output); + if (ACPI_FAILURE(status)) + return -ENODEV; + + if (out_obj.type != ACPI_TYPE_INTEGER) + return -ENODEV; + + return out_obj.integer.value; +} + +static int set_kbd_light(int level) +{ + int led_info = call_fuj02e3_func(0x1001, 0, 0, 0); + return call_fuj02e3_func(0x1001, 1, led_info, (level << 16) | 3); +} + +static int get_kbd_light(void) +{ + int led_info = call_fuj02e3_func(0x1001, 0, 0, 0); + return (call_fuj02e3_func(0x1001, 2, led_info, 0) >> 16) & 3; +} + +static void kbd_brightness_set(struct led_classdev *cdev, + enum led_brightness brightness) +{ + set_kbd_light((brightness > 127) ? 3 : 0); +} + +struct led_classdev led_device = { + .name = "kbd_light", + .brightness_set = kbd_brightness_set +}; + /* Platform device */ static ssize_t show_lcd_level(struct device *dev, @@ -174,10 +249,39 @@ static ssize_t store_lcd_level(struct de return count; } +static ssize_t show_kbd_light(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int ret; + ret = get_kbd_light(); + if (ret < 0) + return ret; + + return sprintf(buf, "%i\n", ret); +} + +static ssize_t store_kbd_light(struct device *dev, + struct device_attribute *attr, const char *buf, + size_t count) +{ + int level, ret; + + if (sscanf(buf, "%i", &level) != 1) + return -EINVAL; + + ret = set_kbd_light(level); + if (ret < 0) + return ret; + + return count; +} + static DEVICE_ATTR(lcd_level, 0644, show_lcd_level, store_lcd_level); +static DEVICE_ATTR(kbd_light, 0644, show_kbd_light, store_kbd_light); static struct attribute *fujitsupf_attributes[] = { &dev_attr_lcd_level.attr, + &dev_attr_kbd_light.attr, NULL }; @@ -236,6 +340,48 @@ static int acpi_fujitsu_remove(struct ac return 0; } +static int acpi_fujitsu_ext_add(struct acpi_device *device) +{ + int result = 0; + int state = 0; + + ACPI_FUNCTION_TRACE("acpi_fujitsu_ext_add"); + + if (!device) + return -EINVAL; + + fujitsu->acpi_ext_handle = device->handle; + sprintf(acpi_device_name(device), "%s", ACPI_FUJITSU_EXT_DEVICE_NAME); + sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS); + acpi_driver_data(device) = fujitsu; + + result = acpi_bus_get_power(fujitsu->acpi_ext_handle, &state); + if (result) { + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "Error reading power state\n")); + goto end; + } + + printk(KERN_INFO PREFIX "%s [%s] (%s)\n", + acpi_device_name(device), acpi_device_bid(device), + !device->power.state ? "on" : "off"); + + end: + + return result; +} + +static int acpi_fujitsu_ext_remove(struct acpi_device *device, int type) +{ + ACPI_FUNCTION_TRACE("acpi_fujitsu_ext_remove"); + + if (!device || !acpi_driver_data(device)) + return -EINVAL; + fujitsu->acpi_ext_handle = NULL; + + return 0; +} + static const struct acpi_device_id fujitsu_device_ids[] = { {ACPI_FUJITSU_HID, 0}, {"", 0}, @@ -251,6 +397,21 @@ static struct acpi_driver acpi_fujitsu_d }, }; +static const struct acpi_device_id fujitsu_ext_device_ids[] = { + {ACPI_FUJITSU_EXT_HID, 0}, + {"", 0}, +}; + +static struct acpi_driver acpi_fujitsu_ext_driver = { + .name = ACPI_FUJITSU_EXT_DRIVER_NAME, + .class = ACPI_FUJITSU_CLASS, + .ids = fujitsu_ext_device_ids, + .ops = { + .add = acpi_fujitsu_ext_add, + .remove = acpi_fujitsu_ext_remove + } +}; + /* Initialization */ static int __init fujitsu_init(void) @@ -271,6 +432,18 @@ static int __init fujitsu_init(void) goto fail_acpi; } + result = acpi_bus_register_driver(&acpi_fujitsu_ext_driver); + if (result < 0) { + /* We want the FUJ02B1 driver to work by itself, so don't + fail here. */ + printk(KERN_INFO "fujitsu-laptop: not using FUJ02E3 " + "extensions\n"); + fujitsu->using_fuj02e3 = 0; + } + else { + fujitsu->using_fuj02e3 = 1; + } + /* Register backlight stuff */ fujitsu->bl_device = @@ -296,6 +469,12 @@ static int __init fujitsu_init(void) if (ret) goto fail_platform_device1; + /* Register keyboard illumination stuff. */ + ret = led_classdev_register(&fujitsu->pf_device->dev, &led_device); + if (ret) + printk(KERN_INFO "fujitsu-laptop: no keyboard illumination " + "registered\n"); + ret = sysfs_create_group(&fujitsu->pf_device->dev.kobj, &fujitsupf_attribute_group); @@ -338,6 +517,12 @@ static void __exit fujitsu_cleanup(void) platform_driver_unregister(&fujitsupf_driver); backlight_device_unregister(fujitsu->bl_device); + if (fujitsu->using_fuj02e3) { + led_classdev_unregister(&led_device); + acpi_bus_unregister_driver(&acpi_fujitsu_ext_driver); + fujitsu->using_fuj02e3 = 0; + } + acpi_bus_unregister_driver(&acpi_fujitsu_driver); kfree(fujitsu); Only in ../linux-2.6-2.6.25-patched/drivers/net/wan: wanxlfw.inc Only in ../linux-2.6-2.6.25-patched/drivers/scsi/aic7xxx: aic79xx_reg.h Only in ../linux-2.6-2.6.25-patched/drivers/scsi/aic7xxx: aic79xx_reg_print.c Only in ../linux-2.6-2.6.25-patched/drivers/scsi/aic7xxx: aic79xx_seq.h Only in ../linux-2.6-2.6.25-patched/drivers/scsi/aic7xxx: aic7xxx_reg.h Only in ../linux-2.6-2.6.25-patched/drivers/scsi/aic7xxx: aic7xxx_reg_print.c Only in ../linux-2.6-2.6.25-patched/drivers/scsi/aic7xxx: aic7xxx_seq.h Only in ../linux-2.6-2.6.25-patched/include: asm Only in ../linux-2.6-2.6.25-patched/include/asm-x86: asm-offsets.h Only in ../linux-2.6-2.6.25-patched/include: config Only in ../linux-2.6-2.6.25-patched/include/linux: autoconf.h Only in ../linux-2.6-2.6.25-patched/include/linux: utsrelease.h Only in ../linux-2.6-2.6.25-patched/include/linux: version.h Only in ../linux-2.6-2.6.25-patched: .missing-syscalls.d Only in ../linux-2.6-2.6.25-patched: Module.symvers Only in ../linux-2.6-2.6.25-patched/scripts/basic: docproc Only in ../linux-2.6-2.6.25-patched/scripts/basic: .docproc.cmd Only in ../linux-2.6-2.6.25-patched/scripts/basic: fixdep Only in ../linux-2.6-2.6.25-patched/scripts/basic: .fixdep.cmd Only in ../linux-2.6-2.6.25-patched/scripts: conmakehash Only in ../linux-2.6-2.6.25-patched/scripts: .conmakehash.cmd Only in ../linux-2.6-2.6.25-patched/scripts/genksyms: genksyms Only in ../linux-2.6-2.6.25-patched/scripts/genksyms: .genksyms.cmd Only in ../linux-2.6-2.6.25-patched/scripts/genksyms: keywords.c Only in ../linux-2.6-2.6.25-patched/scripts/genksyms: lex.c Only in ../linux-2.6-2.6.25-patched/scripts/genksyms: parse.c Only in ../linux-2.6-2.6.25-patched/scripts/genksyms: parse.h Only in ../linux-2.6-2.6.25-patched/scripts: kallsyms Only in ../linux-2.6-2.6.25-patched/scripts: .kallsyms.cmd Only in ../linux-2.6-2.6.25-patched/scripts/kconfig: conf Only in ../linux-2.6-2.6.25-patched/scripts/kconfig: .conf.cmd Only in ../linux-2.6-2.6.25-patched/scripts/kconfig: lex.zconf.c Only in ../linux-2.6-2.6.25-patched/scripts/kconfig: mconf Only in ../linux-2.6-2.6.25-patched/scripts/kconfig: .mconf.cmd Only in ../linux-2.6-2.6.25-patched/scripts/kconfig: zconf.hash.c Only in ../linux-2.6-2.6.25-patched/scripts/kconfig: zconf.tab.c Only in ../linux-2.6-2.6.25-patched/scripts/mod: elfconfig.h Only in ../linux-2.6-2.6.25-patched/scripts/mod: .elfconfig.h.cmd Only in ../linux-2.6-2.6.25-patched/scripts/mod: mk_elfconfig Only in ../linux-2.6-2.6.25-patched/scripts/mod: .mk_elfconfig.cmd Only in ../linux-2.6-2.6.25-patched/scripts/mod: modpost Only in ../linux-2.6-2.6.25-patched/scripts/mod: .modpost.cmd Only in ../linux-2.6-2.6.25-patched/sound/oss: pss_boot.h Only in ../linux-2.6-2.6.25-patched/sound/oss: trix_boot.h Only in ../linux-2.6-2.6.25-patched: .tmp_versions