From 8eab2223b35024e56fd8868626b2fc1958eada47 Mon Sep 17 00:00:00 2001
From: Akihiro MAEDA sola.1980.a@gmail.com Date: Sat, 19 Feb 2011 02:44:31 +0900 Subject: [PATCH 2/2] virtual battery driver changed for linux kernel 2.6.37 or later
This patch is virtual battery driver changed for linux kernel 2.6.37 or later. This is based on git://git.linaro.org/people/jstultz/linux.git dev/linaro.android
Signed-off-by: Akihiro MAEDA sola.1980.a@gmail.com --- drivers/power/virtual_battery.c | 53 ++++++++++++++++++++++++++++++-------- 1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/drivers/power/virtual_battery.c b/drivers/power/virtual_battery.c index 9e455ad..e4fa9e5 100644 --- a/drivers/power/virtual_battery.c +++ b/drivers/power/virtual_battery.c @@ -5,6 +5,7 @@ * * Copyright (C) 2008 Pylone, Inc. * Author: Masashi YOKOTA yokota@pylone.jp + * Modified by: Akihiro MAEDA sola.1980.a@gmail.com * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -190,7 +191,7 @@ static const char * map_get_key(struct battery_property_map * map, int value, co return def_key; }
-static int param_set_ac_status(const char *key, struct kernel_param *kp) +static int param_set_ac_status(const char *key, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s, key=%s\n", __func__, kp->name, key); ac_status = map_get_value( map_ac_online, key, ac_status); @@ -198,14 +199,14 @@ static int param_set_ac_status(const char *key, struct kernel_param *kp) return 0; }
-static int param_get_ac_status(char *buffer, struct kernel_param *kp) +static int param_get_ac_status(char *buffer, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s\n", __func__, kp->name); strcpy(buffer, map_get_key( map_ac_online, ac_status, "unknown")); return strlen(buffer); }
-static int param_set_battery_status(const char *key, struct kernel_param *kp) +static int param_set_battery_status(const char *key, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s, key=%s.\n", __func__, kp->name, key); battery_status = map_get_value( map_status, key, battery_status); @@ -213,14 +214,14 @@ static int param_set_battery_status(const char *key, struct kernel_param *kp) return 0; }
-static int param_get_battery_status(char *buffer, struct kernel_param *kp) +static int param_get_battery_status(char *buffer, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s\n", __func__, kp->name); strcpy(buffer, map_get_key( map_status, battery_status, "unknown")); return strlen(buffer); }
-static int param_set_battery_health(const char *key, struct kernel_param *kp) +static int param_set_battery_health(const char *key, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s, key=%s\n", __func__, kp->name, key); battery_health = map_get_value( map_health, key, battery_health); @@ -228,14 +229,14 @@ static int param_set_battery_health(const char *key, struct kernel_param *kp) return 0; }
-static int param_get_battery_health(char *buffer, struct kernel_param *kp) +static int param_get_battery_health(char *buffer, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s\n", __func__, kp->name); strcpy(buffer, map_get_key( map_health, battery_health, "unknown")); return strlen(buffer); }
-static int param_set_battery_present(const char *key, struct kernel_param *kp) +static int param_set_battery_present(const char *key, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s, key=%s\n", __func__, kp->name, key); battery_present = map_get_value( map_present, key, battery_present); @@ -243,14 +244,14 @@ static int param_set_battery_present(const char *key, struct kernel_param *kp) return 0; }
-static int param_get_battery_present(char *buffer, struct kernel_param *kp) +static int param_get_battery_present(char *buffer, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s\n", __func__, kp->name); strcpy(buffer, map_get_key( map_present, battery_present, "unknown")); return strlen(buffer); }
-static int param_set_battery_technology(const char *key, struct kernel_param *kp) +static int param_set_battery_technology(const char *key, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s, key=%s\n", __func__, kp->name, key); battery_technology = map_get_value( map_technology, key, battery_technology); @@ -258,14 +259,14 @@ static int param_set_battery_technology(const char *key, struct kernel_param *kp return 0; }
-static int param_get_battery_technology(char *buffer, struct kernel_param *kp) +static int param_get_battery_technology(char *buffer, const struct kernel_param *kp) { dev_dbg(&bat_pdev->dev, "%s: name=%s\n", __func__, kp->name); strcpy(buffer, map_get_key( map_technology, battery_technology, "unknown")); return strlen(buffer); }
-static int param_set_battery_capacity(const char *key, struct kernel_param *kp) +static int param_set_battery_capacity(const char *key, const struct kernel_param *kp) { int tmp;
@@ -314,6 +315,36 @@ static void __exit virtual_battery_exit(void) printk(KERN_INFO KBUILD_BASENAME": unregistered \n"); }
+static struct kernel_param_ops param_ops_ac_status = { + .set = param_set_ac_status, + .get = param_get_ac_status, +}; + +static struct kernel_param_ops param_ops_battery_status = { + .set = param_set_battery_status, + .get = param_get_battery_status, +}; + +static struct kernel_param_ops param_ops_battery_present = { + .set = param_set_battery_present, + .get = param_get_battery_present, +}; + +static struct kernel_param_ops param_ops_battery_technology = { + .set = param_set_battery_technology, + .get = param_get_battery_technology, +}; + +static struct kernel_param_ops param_ops_battery_health = { + .set = param_set_battery_health, + .get = param_get_battery_health, +}; + +static struct kernel_param_ops param_ops_battery_capacity = { + .set = param_set_battery_capacity, + .get = param_get_battery_capacity, +}; + module_init(virtual_battery_init); module_exit(virtual_battery_exit);