diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-23 18:32:25 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-23 18:32:25 +0000 |
commit | 2a7a4a04e123e0d6fc03078478c11f011c53b4f6 (patch) | |
tree | 5008f81e9d769e6d7d800fe62e56d47f33b99fcd /linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch | |
parent | 4a6b2f2688f8a177a6dbfb379eb8993987f33a51 (diff) |
Helps to actually make the tosa power key patch apply..
BKrev: 41a38239hH10ro4Xi5Xjb6JhYYD9Cg
Diffstat (limited to 'linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch')
-rw-r--r-- | linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch | 127 |
1 files changed, 127 insertions, 0 deletions
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch index e69de29bb2..94fdbe4ded 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch @@ -0,0 +1,127 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- linux/drivers/char/tosa_ts.c~tosa-power-key-off ++++ linux/drivers/char/tosa_ts.c +@@ -203,10 +203,53 @@ + write: tosa_ts_write_params, + }; + ++#if defined(CONFIG_TOSA_POWER_KEY_OFF) ++extern unsigned int power_key_off_mode; ++ ++static ssize_t power_key_off_read_params(struct file *file, char *buf, ++ size_t nbytes, loff_t *ppos) ++{ ++ char outputbuf[32]; ++ int count; ++ ++ if (*ppos>0) /* Assume reading completed in previous read*/ ++ return 0; ++ count = sprintf(outputbuf, "%d\n", (unsigned int)power_key_off_mode); ++ count++; ++ *ppos += count; ++ if (count>nbytes) /* Assume output can be read at one time */ ++ return -EINVAL; ++ if (copy_to_user(buf, outputbuf, count+1)) ++ return -EFAULT; ++ return count; ++} ++ ++static ssize_t power_key_off_write_params(struct file *file, const char *buf, ++ size_t nbytes, loff_t *ppos) ++{ ++ unsigned int param=0; ++ ++ sscanf(buf,"%d",¶m); ++ if (power_key_off_mode != param) { ++ power_key_off_mode = param; ++ printk("power_key_off = %d\n", power_key_off_mode); ++ } ++ return nbytes; ++} ++ ++static struct file_operations proc_power_key_off_operations = { ++ read: power_key_off_read_params, ++ write: power_key_off_write_params, ++}; ++#endif ++ + static int init_procinfo(void) + { + int i; + struct proc_dir_entry *entry; ++#if defined(CONFIG_TOSA_POWER_KEY_OFF) ++ struct proc_dir_entry *power_key_off_proc; ++#endif + + proc_ts = proc_mkdir("driver/ts", NULL); + if (proc_ts == NULL) { +@@ -232,6 +275,12 @@ + } + } + ++#if defined(CONFIG_TOSA_POWER_KEY_OFF) ++ power_key_off_proc = create_proc_entry("power_key_off", 0, NULL); ++ if (power_key_off_proc) ++ power_key_off_proc->proc_fops = &proc_power_key_off_operations; ++#endif ++ + return 0; + } + +--- linux/drivers/char/Config.in~tosa-power-key-off ++++ linux/drivers/char/Config.in +@@ -35,6 +35,8 @@ + if [ "$CONFIG_SERIAL_SL_SERIES" = "y" ]; then + bool ' SL-series Bluetooth support' CONFIG_BLUETOOTH_SL + fi ++ dep_bool ' Tosa power key suspend (EXPERIMENTAL)' CONFIG_TOSA_POWER_KEY_OFF $CONFIG_ARCH_PXA_TOSA ++ dep_bool ' Tosa Boot On power key suspend' CONFIG_BOOT_TOSA_POWER_KEY_OFF $CONFIG_TOSA_POWER_KEY_OFF + fi + bool 'Use Keyboard device file (EXPERIMENTAL)' CONFIG_KBD_DEV_FILE + if [ "$CONFIG_SA1100_COLLIE" = "y" ]; then +--- linux/drivers/char/keyboard.c~tosa-power-key-off ++++ linux/drivers/char/keyboard.c +@@ -119,8 +119,8 @@ + static struct kbd_struct * kbd = kbd_table; + static struct tty_struct * tty; + +-#if defined(CONFIG_SL7X0_POWER_KEY_OFF) +-#if defined(CONFIG_BOOT_POWER_KEY_OFF) ++#if defined(CONFIG_SL7X0_POWER_KEY_OFF) || defined(CONFIG_TOSA_POWER_KEY_OFF) ++#if defined(CONFIG_BOOT_POWER_KEY_OFF) || defined(CONFIG_BOOT_TOSA_POWER_KEY_OFF) + unsigned int power_key_off_mode = 1; + #else + unsigned int power_key_off_mode = 0; +@@ -245,7 +245,7 @@ + void handle_scancode(unsigned char scancode, int down) + { + +-#if defined(CONFIG_SL7X0_POWER_KEY_OFF) ++#if defined(CONFIG_SL7X0_POWER_KEY_OFF) || defined(CONFIG_TOSA_POWER_KEY_OFF) + /* printk("scancode = %x down = %x \n",scancode,down); */ + /* SL-C700 side power 0x6d */ + if ( power_key_off_mode && ( scancode == 0x6d ) && ( down == 0x01 ) ){ +@@ -282,7 +282,7 @@ + handle_scancode_main ( scancode, down ); + } else + #endif +-#if defined(CONFIG_SL7X0_POWER_KEY_OFF) || defined(CONFIG_SL_3BUTTON_PATCH) ++#if defined(CONFIG_SL7X0_POWER_KEY_OFF) || defined(CONFIG_SL_3BUTTON_PATCH) || defined(CONFIG_TOSA_POWER_KEY_OFF) + { + + handle_scancode_main ( scancode, down ); +--- linux/arch/arm/mach-pxa/sharpsl_power.c~tosa-power-key-off ++++ linux/arch/arm/mach-pxa/sharpsl_power.c +@@ -1725,7 +1725,7 @@ + return 0; + } + +-#if defined(CONFIG_SL7X0_POWER_KEY_OFF) ++#if defined(CONFIG_SL7X0_POWER_KEY_OFF) || defined(CONFIG_TOSA_POWER_KEY_OFF) + static int key_suspend_thread(void* unused) + { + int time_cnt = 0; |