From 5f286f78cb822b64e239e3fccd2c82b47227cb3e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathieu=20B=C3=A9rard?= Date: Wed, 31 Jan 2007 21:05:36 +0000 Subject: [PATCH] * Split TSM30X (ectype 12) in: -TSM70 (ectype 12) => new implementation (compal.c & acpi.c backends) -TSM30X (ectype 15) => old implementation (legacy backends) This is done by renaming TSM30X to TSM40 and restore old TSM30X This sucks but is the only way to fix bugs 1617818 and 1605278 --- ac.c | 4 ++-- acpi.c | 2 +- battery.c | 19 +++++++++++-------- blank.c | 6 +++--- bluetooth.c | 4 ++-- compal.c | 8 ++++---- display.c | 6 +++--- doc/ChangeLog | 10 ++++++++++ hotkeys.c | 6 +++--- init.c | 2 +- laptop.h | 16 ++++++++-------- lcd.c | 11 ++++++----- omnibook.h | 11 ++++++----- temperature.c | 4 ++-- touchpad.c | 4 ++-- wireless.c | 4 ++-- 16 files changed, 66 insertions(+), 51 deletions(-) diff --git a/ac.c b/ac.c index b3bebc7..3787cdc 100644 --- a/ac.c +++ b/ac.c @@ -34,7 +34,7 @@ static int omnibook_ac_read(char *buffer, struct omnibook_operation *io_op) } static struct omnibook_tbl ac_table[] __initdata = { - {XE3GF | TSP10 | TSM30X, SIMPLE_BYTE(EC, XE3GF_ADP, XE3GF_ADP_MASK)}, + {XE3GF | TSP10 | TSM30X | TSM70, SIMPLE_BYTE(EC, XE3GF_ADP, XE3GF_ADP_MASK)}, {XE3GC | AMILOD, SIMPLE_BYTE(EC, XE3GC_STA1, XE3GC_ADP_MASK)}, {OB500 | OB510 | OB6000 | OB6100 | XE4500, SIMPLE_BYTE(EC, OB500_STA2, OB500_ADP_MASK)}, {OB4150, SIMPLE_BYTE(EC, OB4150_ADP, OB4150_ADP_MASK)}, @@ -50,7 +50,7 @@ struct omnibook_feature __declared_feature ac_driver = { .enabled = 0, #endif .read = omnibook_ac_read, - .ectypes = XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | OB4150 | XE2 | AMILOD | TSP10 | TSM30X, + .ectypes = XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | OB4150 | XE2 | AMILOD | TSP10 | TSM70 | TSM30X, .tbl = ac_table, }; diff --git a/acpi.c b/acpi.c index 67e5481..5d0ae43 100644 --- a/acpi.c +++ b/acpi.c @@ -1,5 +1,5 @@ /* - * acpi.c -- ACPI methods low-level access code for TSM30X class laptops + * acpi.c -- ACPI methods low-level access code for TSM70 class laptops * * 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 diff --git a/battery.c b/battery.c index a98dfff..c9191fc 100644 --- a/battery.c +++ b/battery.c @@ -68,8 +68,9 @@ static int omnibook_battery_present(struct omnibook_operation *io_op, int num) * XE3GF * TSP10 * TSM30X + * TSM70 */ - if (omnibook_ectype & (XE3GF | TSP10 | TSM30X)) { + if (omnibook_ectype & (XE3GF | TSP10 | TSM70 | TSM30X)) { io_op->read_addr = XE3GF_BAL; io_op->read_mask = XE3GF_BAL0_MASK; for (i = 0; i < num; i++) @@ -112,9 +113,10 @@ static int omnibook_get_battery_info(struct omnibook_operation *io_op, /* * XE3GF * TSP10 - * TSM30X + * TSM70 + * TSM30X */ - if (omnibook_ectype & (XE3GF | TSP10 | TSM30X)) { + if (omnibook_ectype & (XE3GF | TSP10 | TSM70 | TSM30X)) { retval = omnibook_battery_present(io_op, num); if (retval < 0) return retval; @@ -232,9 +234,9 @@ static int omnibook_get_battery_status(struct omnibook_operation *io_op, /* * XE3GF * TSP10 - * TSM30X + * TSM70 */ - if (omnibook_ectype & (XE3GF | TSP10 | TSM30X)) { + if (omnibook_ectype & (XE3GF | TSP10 | TSM70 | TSM30X)) { retval = omnibook_battery_present(io_op, num); if (retval < 0) return retval; @@ -474,8 +476,9 @@ static int omnibook_battery_read(char *buffer, struct omnibook_operation *io_op) max = 3; /* * TSM30X + * TSM70 */ - else if (omnibook_ectype & (TSM30X)) + else if (omnibook_ectype & (TSM70 | TSM30X)) max = 1; if(mutex_lock_interruptible(&io_op->backend->mutex)) @@ -533,7 +536,7 @@ static int omnibook_battery_read(char *buffer, struct omnibook_operation *io_op) } static struct omnibook_tbl battery_table[] __initdata = { - {XE3GF | XE3GC | AMILOD | TSP10 | TSM30X, {EC,}}, + {XE3GF | XE3GC | AMILOD | TSP10 | TSM70 | TSM30X, {EC,}}, {0,} }; @@ -545,7 +548,7 @@ static struct omnibook_feature __declared_feature battery_driver = { .enabled = 0, #endif .read = omnibook_battery_read, - .ectypes = XE3GF | XE3GC | AMILOD | TSP10 | TSM30X, /* FIXME: OB500|OB6000|OB6100|XE4500 */ + .ectypes = XE3GF | XE3GC | AMILOD | TSP10 | TSM70 | TSM30X, /* FIXME: OB500|OB6000|OB6100|XE4500 */ .tbl = battery_table, }; diff --git a/blank.c b/blank.c index 23173d3..414e4c8 100644 --- a/blank.c +++ b/blank.c @@ -113,8 +113,8 @@ static void __exit omnibook_console_blank_cleanup(struct omnibook_operation *io_ } static struct omnibook_tbl blank_table[] __initdata = { - {TSM30X, {CDI, 0, TSM100_BLANK_INDEX, 0, TSM100_LCD_OFF, TSM100_LCD_ON}}, - {XE3GF | XE3GC | AMILOD | TSP10 | TSM30X, + {TSM70, {CDI, 0, TSM100_BLANK_INDEX, 0, TSM100_LCD_OFF, TSM100_LCD_ON}}, + {XE3GF | XE3GC | AMILOD | TSP10 | TSM70 | TSM30X, COMMAND(KBC, OMNIBOOK_KBC_CMD_LCD_OFF, OMNIBOOK_KBC_CMD_LCD_ON)}, {OB500 | OB6000 | XE2, {PIO, OB500_GPO1, OB500_GPO1, 0, -OB500_BKLT_MASK, OB500_BKLT_MASK}}, {OB510 | OB6100, {PIO, OB510_GPO2, OB510_GPO2, 0, -OB510_BKLT_MASK, OB510_BKLT_MASK}}, @@ -129,7 +129,7 @@ static struct omnibook_feature __declared_feature blank_driver = { .init = omnibook_console_blank_init, .exit = omnibook_console_blank_cleanup, .ectypes = - XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE2 | AMILOD | TSP10 | TSM30X, + XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE2 | AMILOD | TSP10 | TSM70 | TSM30X, .tbl = blank_table, }; diff --git a/bluetooth.c b/bluetooth.c index d839837..07f9a4d 100644 --- a/bluetooth.c +++ b/bluetooth.c @@ -85,7 +85,7 @@ static int __init omnibook_bt_init(struct omnibook_operation *io_op) } static struct omnibook_tbl wireless_table[] __initdata = { - {TSM30X | TSA105, {ACPI,}}, /* stubs to select backend */ + {TSM70 | TSA105, {ACPI,}}, /* stubs to select backend */ {TSM40, {SMI,}}, /* stubs to select backend */ {0,} }; @@ -96,7 +96,7 @@ static struct omnibook_feature __declared_feature bt_driver = { .read = omnibook_bt_read, .write = omnibook_bt_write, .init = omnibook_bt_init, - .ectypes = TSM30X | TSM40 | TSA105, + .ectypes = TSM70 | TSM40 | TSA105, .tbl = wireless_table, }; diff --git a/compal.c b/compal.c index d91593d..7162a5e 100644 --- a/compal.c +++ b/compal.c @@ -302,8 +302,8 @@ static int omnibook_cdimode_init(const struct omnibook_operation *io_op) int retval = 0; int i; - /* ectypes other than TSM30X have no business with this backend */ - if (!(omnibook_ectype & TSM30X)) + /* ectypes other than TSM70 have no business with this backend */ + if (!(omnibook_ectype & TSM70)) return -ENODEV; if (io_op->backend->already_failed) { @@ -403,8 +403,8 @@ static void cdimode_free(struct kref *ref) static void omnibook_cdimode_exit(const struct omnibook_operation *io_op) { - /* ectypes other than TSM30X have no business with this backend */ - BUG_ON(!(omnibook_ectype & TSM30X)); + /* ectypes other than TSM70 have no business with this backend */ + BUG_ON(!(omnibook_ectype & TSM70)); dprintk("Trying to dispose cdimode\n"); kref_put(&io_op->backend->kref, cdimode_free); } diff --git a/display.c b/display.c index b26af5c..9ae94a5 100644 --- a/display.c +++ b/display.c @@ -80,9 +80,9 @@ static int __init omnibook_display_init(struct omnibook_operation *io_op) } static struct omnibook_tbl display_table[] __initdata = { - {TSM30X, {ACPI,}}, + {TSM70, {ACPI,}}, {TSM40, {SMI, SMI_GET_DISPLAY_STATE, SMI_SET_DISPLAY_STATE, 0, 0, 0}}, - {XE3GF | TSP10 | TSM30X | TSM40, SIMPLE_BYTE(EC, XE3GF_STA1, XE3GF_SHDD_MASK)}, + {XE3GF | TSP10 | TSM70 | TSM30X | TSM40, SIMPLE_BYTE(EC, XE3GF_STA1, XE3GF_SHDD_MASK)}, {XE3GC, SIMPLE_BYTE(EC, XE3GC_STA1, XE3GC_CRTI_MASK)}, {OB500 | OB510 | OB6000 | OB6100 | XE4500, SIMPLE_BYTE(EC, OB500_STA1, OB500_CRTS_MASK)}, {OB4150, SIMPLE_BYTE(EC, OB4150_STA2, OB4150_CRST_MASK)}, @@ -96,7 +96,7 @@ static struct omnibook_feature __declared_feature display_driver = { .read = omnibook_display_read, .write = omnibook_display_write, .ectypes = - XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | OB4150 | TSP10 | TSM30X | + XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | OB4150 | TSP10 | TSM70 | TSM30X | TSM40, .tbl = display_table, }; diff --git a/doc/ChangeLog b/doc/ChangeLog index 609480e..c101535 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -15,6 +15,16 @@ Changelog file for omnibook package: Toshiba Satellite 1130 (ectype 1) Toshiba Satellite A75 (ectype 12) Toshiba Tecra A4 (ectype 13) +* Split TSM30X (ectype 12) : this ectype was reimplemented and if the + new implementation works with Toshiba M40X, M70, M100... it does not + (and will never, due to hardware) with Toshiba M30X, the only way + to fix this is to split TSM30X (ectype 12) in : + -TSM70 (ectype 12) => new implementation (compal.c & acpi.c backends) + -TSM30X (ectype 15) => old implementation (legacy backends) + This is done by renaming TSM30X to TSM40 and restore old TSM30X + The state of the Toshiba M35X is unknown and is assigned to TSM70, one + should send a bug report if that fail. + Fix bugs 1617818 and 1605278 2.20060921 Mathieu Bérard * The minimal required kernel version is now 2.6.9 (kref API) diff --git a/hotkeys.c b/hotkeys.c index 5e52a12..bb3ba1d 100644 --- a/hotkeys.c +++ b/hotkeys.c @@ -168,9 +168,9 @@ static void __exit omnibook_hotkeys_cleanup(struct omnibook_operation *io_op) } static struct omnibook_tbl hotkeys_table[] __initdata = { - {XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | AMILOD | TSP10, + {XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | AMILOD | TSP10 | TSM30X, COMMAND(KBC,OMNIBOOK_KBC_CMD_ONETOUCH_ENABLE,OMNIBOOK_KBC_CMD_ONETOUCH_DISABLE)}, - {TSM30X, {CDI,}}, + {TSM70, {CDI,}}, {TSM40, {SMI,}}, {0,} }; @@ -185,7 +185,7 @@ static struct omnibook_feature __declared_feature hotkeys_driver = { .suspend = omnibook_hotkeys_suspend, .resume = omnibook_hotkeys_resume, .ectypes = - XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | AMILOD | TSP10 | TSM30X | + XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | AMILOD | TSP10 | TSM70 | TSM30X | TSM40, .tbl = hotkeys_table, }; diff --git a/init.c b/init.c index ce701e8..627cdc9 100644 --- a/init.c +++ b/init.c @@ -418,7 +418,7 @@ struct omnibook_feature *omnibook_find_feature(char *name) /* * Maintain compatibility with the old ectype numbers: - * ex: The user set/get ectype=12 for TSM30X=2^(12-1) + * ex: The user set/get ectype=12 for TSM70=2^(12-1) */ static int __init set_ectype_param(const char *val, struct kernel_param *kp) { diff --git a/laptop.h b/laptop.h index 789ff6e..416bb01 100644 --- a/laptop.h +++ b/laptop.h @@ -593,7 +593,7 @@ static struct dmi_system_id omnibook_ids[] __initdata = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A70"), }, - .driver_data = (void*) TSM30X + .driver_data = (void*) TSM70 }, { .callback = dmi_matched, @@ -602,7 +602,7 @@ static struct dmi_system_id omnibook_ids[] __initdata = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A75"), }, - .driver_data = (void*) TSM30X + .driver_data = (void*) TSM70 }, { .callback = dmi_matched, @@ -656,7 +656,7 @@ static struct dmi_system_id omnibook_ids[] __initdata = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M35X"), }, - .driver_data = (void*) TSM30X + .driver_data = (void*) TSM70 }, { .callback = dmi_matched, @@ -665,7 +665,7 @@ static struct dmi_system_id omnibook_ids[] __initdata = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M70"), }, - .driver_data = (void*) TSM30X + .driver_data = (void*) TSM70 }, { .callback = dmi_matched, @@ -674,7 +674,7 @@ static struct dmi_system_id omnibook_ids[] __initdata = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE M100"), }, - .driver_data = (void*) TSM30X + .driver_data = (void*) TSM70 }, { .callback = dmi_matched, @@ -683,7 +683,7 @@ static struct dmi_system_id omnibook_ids[] __initdata = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M100"), }, - .driver_data = (void*) TSM30X + .driver_data = (void*) TSM70 }, { .callback = dmi_matched, @@ -701,7 +701,7 @@ static struct dmi_system_id omnibook_ids[] __initdata = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M40X"), }, - .driver_data = (void*) TSM30X + .driver_data = (void*) TSM70 }, { .callback = dmi_matched, @@ -737,7 +737,7 @@ static struct dmi_system_id omnibook_ids[] __initdata = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "Tecra S2"), }, - .driver_data = (void*) TSM30X + .driver_data = (void*) TSM70 }, { .callback = dmi_matched, diff --git a/lcd.c b/lcd.c index df348a8..78706b8 100644 --- a/lcd.c +++ b/lcd.c @@ -104,15 +104,16 @@ static int __init omnibook_brightness_init(struct omnibook_operation *io_op) { /* * FIXME: What is exactly the max value for each model ? - * I know that it's 7 for the TSM30X, TSM40 and TSA105 + * I know that it's 7 for the TSM30X, TSM70, TSM40 and TSA105 * and previous versions of this driver (wrongly) assumed it was 10 for * all models. * * TSM30X + * TSM70 * TSM40 * TSA105 */ - if (omnibook_ectype & (TSM30X | TSM40 | TSA105)) + if (omnibook_ectype & (TSM70 | TSM30X | TSM40 | TSA105)) omnibook_max_brightness = 7; else { omnibook_max_brightness = 10; @@ -143,9 +144,9 @@ static void __exit omnibook_brightness_cleanup(struct omnibook_operation *io_op) } static struct omnibook_tbl lcd_table[] __initdata = { - {TSM30X, {CDI, TSM70_LCD_READ, TSM70_LCD_WRITE, 0, 0, 0}}, + {TSM70, {CDI, TSM70_LCD_READ, TSM70_LCD_WRITE, 0, 0, 0}}, {TSM40, {SMI, SMI_GET_LCD_BRIGHTNESS, SMI_SET_LCD_BRIGHTNESS, 0, 0, 0}}, - {XE3GF | TSP10 | TSM30X, SIMPLE_BYTE(EC, XE3GF_BRTS, XE3GF_BRTS_MASK)}, + {XE3GF | TSP10 | TSM70 | TSM30X, SIMPLE_BYTE(EC, XE3GF_BRTS, XE3GF_BRTS_MASK)}, {XE3GC, SIMPLE_BYTE(EC, XE3GC_BTVL, XE3GC_BTVL_MASK)}, {AMILOD, SIMPLE_BYTE(EC, AMILOD_CBRG, XE3GC_BTVL_MASK)}, {TSA105, SIMPLE_BYTE(EC, A105_BNDT, A105_BNDT_MASK)}, @@ -159,7 +160,7 @@ static struct omnibook_feature __declared_feature lcd_driver = { .write = omnibook_brightness_write, .init = omnibook_brightness_init, .exit = omnibook_brightness_cleanup, - .ectypes = XE3GF | XE3GC | AMILOD | TSP10 | TSM30X | TSM40 | TSA105, + .ectypes = XE3GF | XE3GC | AMILOD | TSP10 | TSM70 | TSM30X | TSM40 | TSA105, .tbl = lcd_table, }; diff --git a/omnibook.h b/omnibook.h index ae721f9..812e18a 100644 --- a/omnibook.h +++ b/omnibook.h @@ -45,12 +45,13 @@ extern enum omnibook_ectype_t { XE2 = (1<<8), /* 9 HP OmniBook XE2 */ AMILOD = (1<<9), /* 10 Fujitsu Amilo D */ TSP10 = (1<<10), /* 11 Toshiba Satellite P10, P15, P20 and compatible */ - TSM30X = (1<<11), /* 12 Toshiba Satellite M30X, M35X, M40X, M70 and compatible */ - TSM40 = (1<<12), /* 13 Toshiba Satellite M40 M45 Tecra S1 */ - TSA105 = (1<<13) /* 14 Toshiba Satellite A105 */ + TSM70 = (1<<11), /* 12 Toshiba Satellite M40X, M70 and compatible */ + TSM40 = (1<<12), /* 13 Toshiba Satellite M40, M45 and Tecra S1 */ + TSA105 = (1<<13), /* 14 Toshiba Satellite A105 and compatible (Real support is MISSING) */ + TSM30X = (1<<14) /* 15 Toshiba Stallite M30X and compatible */ } omnibook_ectype; -#define ALL_ECTYPES XE3GF|XE3GC|OB500|OB510|OB6000|OB6100|XE4500|OB4150|XE2|AMILOD|TSP10|TSM30X|TSM40|TSA105 +#define ALL_ECTYPES XE3GF|XE3GC|OB500|OB510|OB6000|OB6100|XE4500|OB4150|XE2|AMILOD|TSP10|TSM70|TSM40|TSA105|TSM30X /* * This represent a feature provided by this module @@ -159,7 +160,7 @@ void omnibook_report_key(struct input_dev *dev, unsigned int keycode); */ #ifdef OMNIBOOK_STANDALONE -#if (defined (CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE)) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,16)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) +#if (defined (CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE)) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,16)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) #define CONFIG_OMNIBOOK_BACKLIGHT #else #undef CONFIG_OMNIBOOK_BACKLIGHT diff --git a/temperature.c b/temperature.c index d5c109e..862e9bf 100644 --- a/temperature.c +++ b/temperature.c @@ -33,7 +33,7 @@ static int omnibook_temperature_read(char *buffer, struct omnibook_operation *io } static struct omnibook_tbl temp_table[] __initdata = { - {XE3GF | TSP10 | TSM30X, SIMPLE_BYTE(EC, XE3GF_CTMP, 0)}, + {XE3GF | TSP10 | TSM70 | TSM30X, SIMPLE_BYTE(EC, XE3GF_CTMP, 0)}, {XE3GC | AMILOD, SIMPLE_BYTE(EC, XE3GC_CTMP, 0)}, {OB500 | OB510 | OB6000 | OB6100 | XE4500 | XE2, SIMPLE_BYTE(EC, OB500_CTMP, 0)}, {OB4150, SIMPLE_BYTE(EC, OB4150_TMP, 0)}, @@ -46,7 +46,7 @@ static struct omnibook_feature __declared_feature temperature_driver = { .read = omnibook_temperature_read, .ectypes = XE3GF | XE3GC | OB500 | OB510 | OB6000 | OB6100 | XE4500 | OB4150 | XE2 | AMILOD | TSP10 - | TSM30X, + | TSM70 | TSM30X, .tbl = temp_table, }; diff --git a/touchpad.c b/touchpad.c index 679d2d3..f3a7f5b 100644 --- a/touchpad.c +++ b/touchpad.c @@ -105,7 +105,7 @@ static void __exit omnibook_touchpad_cleanup(struct omnibook_operation *io_op) static struct omnibook_tbl touchpad_table[] __initdata = { {XE3GF | XE3GC | TSP10, COMMAND(KBC, OMNIBOOK_KBC_CMD_TOUCHPAD_ENABLE, OMNIBOOK_KBC_CMD_TOUCHPAD_DISABLE)}, - {TSM30X, {CDI, 0, TSM70_FN_INDEX, 0, TSM70_TOUCHPAD_ON, TSM70_TOUCHPAD_OFF}}, + {TSM70, {CDI, 0, TSM70_FN_INDEX, 0, TSM70_TOUCHPAD_ON, TSM70_TOUCHPAD_OFF}}, {0,} }; @@ -117,7 +117,7 @@ static struct omnibook_feature __declared_feature touchpad_driver = { .init = omnibook_touchpad_init, .exit = omnibook_touchpad_cleanup, .resume = omnibook_touchpad_resume, - .ectypes = XE3GF | XE3GC | TSP10 | TSM30X, + .ectypes = XE3GF | XE3GC | TSP10 | TSM70, .tbl = touchpad_table, }; diff --git a/wireless.c b/wireless.c index 2ae6eaf..81500ad 100644 --- a/wireless.c +++ b/wireless.c @@ -89,7 +89,7 @@ static int __init omnibook_wifi_init(struct omnibook_operation *io_op) } static struct omnibook_tbl wireless_table[] __initdata = { - {TSM30X, {ACPI,}}, /* stubs to select backend */ + {TSM70, {ACPI,}}, /* stubs to select backend */ {TSM40, {SMI,}}, /* stubs to select backend */ {0,} }; @@ -100,7 +100,7 @@ static struct omnibook_feature __declared_feature wifi_driver = { .read = omnibook_wifi_read, .write = omnibook_wifi_write, .init = omnibook_wifi_init, - .ectypes = TSM30X | TSM40, + .ectypes = TSM70 | TSM40, .tbl = wireless_table, }; -- 2.43.5