leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: hp6xx: Correct APM output.

Browse Source 
This patch fixes the old non-verbose hp6xx apm code and enables some
very basic apm output.  We now get percentage (battery) output
and basic time estimate.

Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Kristoffer Ericson 2008-03-04 23:09:25 -08:00 committed by Paul Mundt
parent 56546b1896
commit 8b03c040e4
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/sh/boards/hp6xx/hp6xx_apm.c
View File

@ -2,6 +2,7 @@
* bios-less APM driver for hp680 * bios-less APM driver for hp680
* *
* Copyright 2005 (c) Andriy Skulysh <askulysh@gmail.com> * Copyright 2005 (c) Andriy Skulysh <askulysh@gmail.com>
* Copyright 2008 (c) Kristoffer Ericson <kristoffer.ericson@gmail.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License. * modify it under the terms of the GNU General Public License.
@ -15,11 +16,11 @@
#include <asm/adc.h> #include <asm/adc.h>
#include <asm/hp6xx.h> #include <asm/hp6xx.h>
#define SH7709_PGDR 0xa400012c /* percentage values */
#define APM_CRITICAL 10 #define APM_CRITICAL 10
#define APM_LOW 30 #define APM_LOW 30
/* resonably sane values */
#define HP680_BATTERY_MAX 898 #define HP680_BATTERY_MAX 898
#define HP680_BATTERY_MIN 486 #define HP680_BATTERY_MIN 486
#define HP680_BATTERY_AC_ON 1023 #define HP680_BATTERY_AC_ON 1023
@ -38,17 +39,26 @@ static void hp6x0_apm_get_power_status(struct apm_power_info *info)
percentage = 100 * (battery - HP680_BATTERY_MIN) / percentage = 100 * (battery - HP680_BATTERY_MIN) /
(HP680_BATTERY_MAX - HP680_BATTERY_MIN); (HP680_BATTERY_MAX - HP680_BATTERY_MIN);
/* % of full battery */
info->battery_life = percentage;
/* We want our estimates in minutes */
info->units = 0;
/* Extremely(!!) rough estimate, we will replace this with a datalist later on */
info->time = (2 * battery);
info->ac_line_status = (battery > HP680_BATTERY_AC_ON) ? info->ac_line_status = (battery > HP680_BATTERY_AC_ON) ?
APM_AC_ONLINE : APM_AC_OFFLINE; APM_AC_ONLINE : APM_AC_OFFLINE;
pgdr = ctrl_inb(SH7709_PGDR); pgdr = ctrl_inb(PGDR);
if (pgdr & PGDR_MAIN_BATTERY_OUT) { if (pgdr & PGDR_MAIN_BATTERY_OUT) {
info->battery_status = APM_BATTERY_STATUS_NOT_PRESENT; info->battery_status = APM_BATTERY_STATUS_NOT_PRESENT;
info->battery_flag = 0x80; info->battery_flag = 0x80;
} else if (charging < 8) { } else if (charging < 8) {
info->battery_status = APM_BATTERY_STATUS_CHARGING; info->battery_status = APM_BATTERY_STATUS_CHARGING;
info->battery_flag = 0x08; info->battery_flag = 0x08;
info->ac_line_status = 0xff; info->ac_line_status = 0x01;
} else if (percentage <= APM_CRITICAL) { } else if (percentage <= APM_CRITICAL) {
info->battery_status = APM_BATTERY_STATUS_CRITICAL; info->battery_status = APM_BATTERY_STATUS_CRITICAL;
info->battery_flag = 0x04; info->battery_flag = 0x04;
@ -59,8 +69,6 @@ static void hp6x0_apm_get_power_status(struct apm_power_info *info)
info->battery_status = APM_BATTERY_STATUS_HIGH; info->battery_status = APM_BATTERY_STATUS_HIGH;
info->battery_flag = 0x01; info->battery_flag = 0x01;
} }
info->units = 0;
} }
static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev) static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev)