From 1804e594abb7a795ea2cb223780d36e8e5dcd291 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Mon, 18 Mar 2002 08:08:04 +0000 Subject: - Corrected entries in machineinfo - Adapted plpftp and plpprops to new machineinfo - Translations. --- lib/rpcs.h | 2 +- lib/rpcs32.cc | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/rpcs.h b/lib/rpcs.h index 9d1e736..9c77656 100644 --- a/lib/rpcs.h +++ b/lib/rpcs.h @@ -155,8 +155,8 @@ public: Enum backupBatteryStatus; unsigned long backupBatteryVoltage; unsigned long backupBatteryMaxVoltage; - psi_timeval backupBatteryUsedTime; + psi_timeval externalPowerUsedTime; bool externalPower; } machineInfo; diff --git a/lib/rpcs32.cc b/lib/rpcs32.cc index 92132af..64ac5b4 100644 --- a/lib/rpcs32.cc +++ b/lib/rpcs32.cc @@ -117,9 +117,8 @@ getMachineInfo(machineInfo &mi) mi.backupBatteryStatus = (enum rpcs::batterystates)a.getDWord(108); mi.backupBatteryVoltage = a.getDWord(112); mi.backupBatteryMaxVoltage = a.getDWord(116); - mi.backupBatteryUsedTime.tv_low = a.getDWord(124); - mi.backupBatteryUsedTime.tv_high = a.getDWord(128); - + mi.externalPowerUsedTime.tv_low = a.getDWord(124); + mi.externalPowerUsedTime.tv_high = a.getDWord(128); mi.externalPower = (a.getDWord(120) != 0); mtCacheS5mx |= 8; -- cgit v1.2.3