summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/power.cpp61
1 files changed, 2 insertions, 59 deletions
diff --git a/library/power.cpp b/library/power.cpp
index ec5b309..21c8960 100644
--- a/library/power.cpp
+++ b/library/power.cpp
@@ -117,78 +117,24 @@ bool PowerStatusManager::getProcApmStatus( int &ac, int &bs, int &bf, int &pc, i
break;
case 0x02:
ps->ac = PowerStatus::Backup;
break;
}
- if ( pc > 100 )
- pc = -1;
+ if ( pc > 100 ) pc = 100;
+ if ( pc < 0 ) pc = 0;
ps->percentRemain = pc;
ps->secsRemain = sec;
ok = true;
}
return ok;
}
-#ifdef QT_QWS_SHARP
-
-void PowerStatusManager::getStatus()
-{
- int ac, bs, bf, pc, sec;
- ps->percentAccurate = TRUE; // not for long...
-
- if ( haveProcApm && getProcApmStatus( ac, bs, bf, pc, sec ) ) {
- // special case
- if ( bs == 0x7f )
- ps->bs = PowerStatus::VeryLow;
- pc = -1; // fake percentage
- if ( pc < 0 ) {
- switch ( bs ) {
- case 0x00: ps->percentRemain = 100; break; // High
- case 0x01: ps->percentRemain = 30; break; // Low
- case 0x7f: ps->percentRemain = 10; break; // Very Low
- case 0x02: ps->percentRemain = 5; break; // Critical
- case 0x03: ps->percentRemain = -1; break; // Charging
- }
- ps->percentAccurate = FALSE;
- }
- }
-
- char *device = "/dev/apm_bios";
- int fd = ::open (device, O_WRONLY);
- if ( fd >= 0 ) {
- int bbat_status = ioctl( fd, APM_IOC_BATTERY_BACK_CHK, 0 );
- switch ( bbat_status ) {
- case 0x00:
- ps->bbs = PowerStatus::High;
- break;
- case 0x01:
- ps->bbs = PowerStatus::Low;
- break;
- case 0x7f:
- ps->bbs = PowerStatus::VeryLow;
- break;
- case 0x02:
- ps->bbs = PowerStatus::Critical;
- break;
- case 0x03:
- ps->bbs = PowerStatus::Charging;
- break;
- case 0x04:
- ps->bbs = PowerStatus::NotPresent;
- break;
- }
- ::close(fd);
- }
-}
-
-#else
-
void PowerStatusManager::getStatus()
{
bool usedApm = FALSE;
ps->percentAccurate = TRUE;
@@ -220,9 +166,6 @@ void PowerStatusManager::getStatus()
ps->percentRemain = 100;
ps->secsRemain = -1;
ps->percentAccurate = FALSE;
#endif
}
}
-
-#endif
-