i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PowerStatus: improved API, minor fixes.

Browse Source 
* ioctl() does not return a status_t; fixed its usage.
* Do not overwrite the cached battery info with bogus data (this is
  quite strict, though).
* Improved DriverInterface API with a more "natural" argument order.
* Simplified some code.
This commit is contained in:
Axel Dörfler
2015-01-08 15:36:55 +01:00
parent 90169e6310
commit b19e9d5b71
7 changed files with 114 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/powerstatus/ACPIDriverInterface.cpp
+50 -56
View File
@@ -1,15 +1,18 @@
/* /*
* Copyright 2009, Haiku, Inc. All Rights Reserved. * Copyright 2009-2015, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Axel Dörfler, [email protected]
* Clemens Zeidler, [email protected] * Clemens Zeidler, [email protected]
*/ */
#include "ACPIDriverInterface.h" #include "ACPIDriverInterface.h"
#include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <Autolock.h> #include <Autolock.h>
#include <Directory.h> #include <Directory.h>
@@ -82,15 +85,19 @@ Battery::InitCheck()
status_t status_t
Battery::ReadBatteryInfo() Battery::UpdateBatteryInfo()
{ {
status_t status; acpi_battery_info info;
status = ioctl(fDriverHandler, GET_BATTERY_INFO, &fCachedAcpiInfo, if (ioctl(fDriverHandler, GET_BATTERY_INFO, &info,
sizeof(acpi_battery_info)); sizeof(acpi_battery_info)) != 0)
return errno;
if (status != B_OK) if ((fExtendedBatteryInfo.last_full_charge > 0
return status; && info.capacity > fExtendedBatteryInfo.last_full_charge)
|| info.capacity < 0)
return B_BAD_DATA;
fCachedInfo = info;
return B_OK; return B_OK;
} }
@@ -98,15 +105,16 @@ Battery::ReadBatteryInfo()
status_t status_t
Battery::GetBatteryInfoCached(battery_info* info) Battery::GetBatteryInfoCached(battery_info* info)
{ {
info->state = fCachedAcpiInfo.state; info->state = fCachedInfo.state;
info->current_rate = fCachedAcpiInfo.current_rate; info->current_rate = fCachedInfo.current_rate;
info->capacity = fCachedAcpiInfo.capacity; info->capacity = fCachedInfo.capacity;
info->full_capacity = fExtendedBatteryInfo.last_full_charge; info->full_capacity = fExtendedBatteryInfo.last_full_charge;
fRateBuffer.AddRate(fCachedAcpiInfo.current_rate);
if (fCachedAcpiInfo.current_rate > 0 && fRateBuffer.GetMeanRate() != 0) fRateBuffer.AddRate(fCachedInfo.current_rate);
info->time_left = 3600 * fCachedAcpiInfo.capacity if (fCachedInfo.current_rate > 0 && fRateBuffer.GetMeanRate() != 0) {
info->time_left = 3600 * fCachedInfo.capacity
/ fRateBuffer.GetMeanRate(); / fRateBuffer.GetMeanRate();
else } else
info->time_left = -1; info->time_left = -1;
return B_OK; return B_OK;
@@ -116,11 +124,11 @@ Battery::GetBatteryInfoCached(battery_info* info)
status_t status_t
Battery::GetExtendedBatteryInfo(acpi_extended_battery_info* info) Battery::GetExtendedBatteryInfo(acpi_extended_battery_info* info)
{ {
status_t status; if (ioctl(fDriverHandler, GET_EXTENDED_BATTERY_INFO, info,
status = ioctl(fDriverHandler, GET_EXTENDED_BATTERY_INFO, info, sizeof(acpi_extended_battery_info)) != 0)
sizeof(acpi_extended_battery_info)); return errno;
return status; return B_OK;
} }
@@ -128,30 +136,21 @@ void
Battery::_Init() Battery::_Init()
{ {
uint32 magicId = 0; uint32 magicId = 0;
fInitStatus = ioctl(fDriverHandler, IDENTIFY_DEVICE, &magicId, if (ioctl(fDriverHandler, IDENTIFY_DEVICE, &magicId, sizeof(uint32)) != 0) {
sizeof(uint32)); fInitStatus = errno;
if (fInitStatus != B_OK)
return; return;
}
fInitStatus = ioctl(fDriverHandler, GET_EXTENDED_BATTERY_INFO, fInitStatus = GetExtendedBatteryInfo(&fExtendedBatteryInfo);
&fExtendedBatteryInfo, sizeof(acpi_extended_battery_info));
if (fInitStatus != B_OK)
return;
fInitStatus = ioctl(fDriverHandler, GET_BATTERY_INFO, &fCachedAcpiInfo,
sizeof(acpi_battery_info));
if (fInitStatus != B_OK) if (fInitStatus != B_OK)
return; return;
printf("ACPI driver found\n"); printf("ACPI driver found\n");
UpdateBatteryInfo();
} }
ACPIDriverInterface::~ACPIDriverInterface() // #pragma mark - ACPIDriverInterface
{
for (int i = 0; i < fDriverList.CountItems(); i++)
delete fDriverList.ItemAt(i);
ACPIDriverInterface::ACPIDriverInterface() ACPIDriverInterface::ACPIDriverInterface()
: :
@@ -160,42 +159,40 @@ ACPIDriverInterface::ACPIDriverInterface()
} }
const char* kDriverDir = "/dev/power"; ACPIDriverInterface::~ACPIDriverInterface()
{
for (int i = 0; i < fDriverList.CountItems(); i++)
delete fDriverList.ItemAt(i);
}
status_t status_t
ACPIDriverInterface::Connect() ACPIDriverInterface::Connect()
{ {
printf("ACPI connect\n");
return _FindDrivers(kDriverDir); return _FindDrivers(kDriverDir);
} }
status_t status_t
ACPIDriverInterface::GetBatteryInfo(battery_info* info, int32 index) ACPIDriverInterface::GetBatteryInfo(int32 index, battery_info* info)
{ {
BAutolock autolock(fInterfaceLocker); BAutolock autolock(fInterfaceLocker);
if (index < 0 || index >= fDriverList.CountItems()) if (index < 0 || index >= fDriverList.CountItems())
return B_ERROR; return B_ERROR;
status_t status; return fDriverList.ItemAt(index)->GetBatteryInfoCached(info);
status = fDriverList.ItemAt(index)->GetBatteryInfoCached(info);
return status;
} }
status_t status_t
ACPIDriverInterface::GetExtendedBatteryInfo(acpi_extended_battery_info* info, ACPIDriverInterface::GetExtendedBatteryInfo(int32 index,
int32 index) acpi_extended_battery_info* info)
{ {
BAutolock autolock(fInterfaceLocker); BAutolock autolock(fInterfaceLocker);
if (index < 0 || index >= fDriverList.CountItems()) if (index < 0 || index >= fDriverList.CountItems())
return B_ERROR; return B_ERROR;
status_t status; return fDriverList.ItemAt(index)->GetExtendedBatteryInfo(info);
status = fDriverList.ItemAt(index)->GetExtendedBatteryInfo(info);
return status;
} }
@@ -207,10 +204,10 @@ ACPIDriverInterface::GetBatteryCount()
status_t status_t
ACPIDriverInterface::_ReadBatteryInfo() ACPIDriverInterface::_UpdateBatteryInfo()
{ {
for (int i = 0; i < fDriverList.CountItems(); i++) for (int i = 0; i < fDriverList.CountItems(); i++)
fDriverList.ItemAt(i)->ReadBatteryInfo(); fDriverList.ItemAt(i)->UpdateBatteryInfo();
return B_OK; return B_OK;
} }
@@ -223,7 +220,7 @@ ACPIDriverInterface::_WatchPowerStatus()
// every two seconds // every two seconds
while (atomic_get(&fIsWatching) > 0) { while (atomic_get(&fIsWatching) > 0) {
_ReadBatteryInfo(); _UpdateBatteryInfo();
Broadcast(kMsgUpdate); Broadcast(kMsgUpdate);
acquire_sem_etc(fWaitSem, 1, B_RELATIVE_TIMEOUT, kUpdateInterval); acquire_sem_etc(fWaitSem, 1, B_RELATIVE_TIMEOUT, kUpdateInterval);
} }
@@ -245,21 +242,18 @@ ACPIDriverInterface::_FindDrivers(const char* dirpath)
if (entry.IsDirectory()) { if (entry.IsDirectory()) {
if (_FindDrivers(path.Path()) == B_OK) if (_FindDrivers(path.Path()) == B_OK)
return B_OK; return B_OK;
} } else {
else {
int32 handler = open(path.Path(), O_RDWR); int32 handler = open(path.Path(), O_RDWR);
if (handler >= 0) { if (handler >= 0) {
printf("try %s\n", path.Path()); printf("try %s\n", path.Path());
Battery* battery = new Battery(handler); Battery* battery = new Battery(handler);
if (battery->InitCheck() == B_OK) { if (battery->InitCheck() == B_OK
fDriverList.AddItem(battery); && fDriverList.AddItem(battery)) {
status = B_OK; status = B_OK;
} } else
else
delete battery; delete battery;
} }
} }
} }
return status; return status;
} }
src/apps/powerstatus/ACPIDriverInterface.h
+13 -13
View File
@@ -39,7 +39,7 @@ public:
status_t InitCheck(); status_t InitCheck();
// Read battery info and update the cache. // Read battery info and update the cache.
status_t ReadBatteryInfo(); status_t UpdateBatteryInfo();
status_t GetBatteryInfoCached(battery_info* info); status_t GetBatteryInfoCached(battery_info* info);
status_t GetExtendedBatteryInfo( status_t GetExtendedBatteryInfo(
acpi_extended_battery_info* info); acpi_extended_battery_info* info);
@@ -54,7 +54,7 @@ private:
acpi_extended_battery_info fExtendedBatteryInfo; acpi_extended_battery_info fExtendedBatteryInfo;
RateBuffer fRateBuffer; RateBuffer fRateBuffer;
acpi_battery_info fCachedAcpiInfo; acpi_battery_info fCachedInfo;
}; };
@@ -63,23 +63,23 @@ public:
ACPIDriverInterface(); ACPIDriverInterface();
virtual ~ACPIDriverInterface(); virtual ~ACPIDriverInterface();
virtual status_t Connect(); virtual status_t Connect();
virtual status_t GetBatteryInfo(battery_info* info, int32 index); virtual status_t GetBatteryInfo(int32 index, battery_info* info);
virtual status_t GetExtendedBatteryInfo( virtual status_t GetExtendedBatteryInfo(int32 index,
acpi_extended_battery_info* info, int32 index); acpi_extended_battery_info* info);
virtual int32 GetBatteryCount(); virtual int32 GetBatteryCount();
protected: protected:
// Read the battery info from the hardware. // Read the battery info from the hardware.
virtual status_t _ReadBatteryInfo(); virtual status_t _UpdateBatteryInfo();
virtual void _WatchPowerStatus(); virtual void _WatchPowerStatus();
virtual status_t _FindDrivers(const char* dirpath); virtual status_t _FindDrivers(const char* dirpath);
BObjectList<Battery> fDriverList; private:
BLocker fInterfaceLocker;
BLocker fInterfaceLocker; BObjectList<Battery> fDriverList;
}; };
#endif // ACPI_DRIVER_INTERFACE_H #endif // ACPI_DRIVER_INTERFACE_H
src/apps/powerstatus/APMDriverInterface.cpp
+8 -63
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2009, Haiku, Inc. All Rights Reserved. * Copyright 2009-2015, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -9,43 +9,23 @@
#include "APMDriverInterface.h" #include "APMDriverInterface.h"
#ifdef HAIKU_TARGET_PLATFORM_HAIKU #include <arch/x86/apm_defs.h>
# include <arch/x86/apm_defs.h> #include <generic_syscall_defs.h>
# include <generic_syscall_defs.h> #include <syscalls.h>
# include <syscalls.h>
// temporary, as long as there is no real power state API
#endif
const bigtime_t kUpdateInterval = 2000000; const bigtime_t kUpdateInterval = 2000000;
// every two seconds // every two seconds
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
// definitions for the APM driver available for BeOS
enum {
APM_CONTROL = B_DEVICE_OP_CODES_END + 1,
APM_DUMP_POWER_STATUS,
APM_BIOS_CALL,
APM_SET_SAFETY
};
#define BIOS_APM_GET_POWER_STATUS 0x530a
#endif
APMDriverInterface::~APMDriverInterface() APMDriverInterface::~APMDriverInterface()
{ {
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
close(fDevice);
#endif
} }
status_t status_t
APMDriverInterface::Connect() APMDriverInterface::Connect()
{ {
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
uint32 version = 0; uint32 version = 0;
status_t status = _kern_generic_syscall(APM_SYSCALLS, B_SYSCALL_INFO, status_t status = _kern_generic_syscall(APM_SYSCALLS, B_SYSCALL_INFO,
&version, sizeof(version)); &version, sizeof(version));
@@ -56,28 +36,17 @@ APMDriverInterface::Connect()
} }
return status; return status;
#else
fDevice = open("/dev/misc/apm", O_RDONLY);
if (fDevice < 0) {
return B_ERROR;
}
return B_OK;
#endif
} }
status_t status_t
APMDriverInterface::GetBatteryInfo(battery_info* info, int32 index) APMDriverInterface::GetBatteryInfo(int32 index, battery_info* info)
{ {
if (index != 0) if (index != 0)
return B_BAD_VALUE; return B_BAD_VALUE;
info->current_rate = -1; info->current_rate = -1;
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
// TODO: retrieve data from APM kernel interface
apm_battery_info apmInfo; apm_battery_info apmInfo;
status_t status = _kern_generic_syscall(APM_SYSCALLS, APM_GET_BATTERY_INFO, status_t status = _kern_generic_syscall(APM_SYSCALLS, APM_GET_BATTERY_INFO,
&apmInfo, sizeof(apm_battery_info)); &apmInfo, sizeof(apm_battery_info));
@@ -89,37 +58,14 @@ APMDriverInterface::GetBatteryInfo(battery_info* info, int32 index)
} }
return status; return status;
#else
if (fDevice < 0)
return B_ERROR;
uint16 regs[6] = {0, 0, 0, 0, 0, 0};
regs[0] = BIOS_APM_GET_POWER_STATUS;
regs[1] = 0x1;
if (ioctl(fDevice, APM_BIOS_CALL, regs) == 0) {
bool online = (regs[1] >> 8) != 0 && (regs[1] >> 8) != 2;
info->state = online ? BATTERY_CHARGING : BATTERY_DISCHARGING;
info->capacity = regs[2] & 255;
if (info->capacity > 100)
info->capacity = -1;
info->full_capacity = 100;
info->time_left = info->capacity >= 0 ? regs[3] : -1;
if (info->time_left > 0xffff)
info->time_left = -1;
else if (info->time_left & 0x8000)
info->time_left = (info->time_left & 0x7fff) * 60;
}
return B_OK;
#endif
} }
status_t status_t
APMDriverInterface::GetExtendedBatteryInfo(acpi_extended_battery_info* info, APMDriverInterface::GetExtendedBatteryInfo(int32 index,
int32 index) acpi_extended_battery_info* info)
{ {
return B_ERROR; return B_NOT_SUPPORTED;
} }
@@ -138,4 +84,3 @@ APMDriverInterface::_WatchPowerStatus()
acquire_sem_etc(fWaitSem, 1, B_RELATIVE_TIMEOUT, kUpdateInterval); acquire_sem_etc(fWaitSem, 1, B_RELATIVE_TIMEOUT, kUpdateInterval);
} }
} }
src/apps/powerstatus/APMDriverInterface.h
+9 -13
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2009, Haiku, Inc. All Rights Reserved. * Copyright 2009-2015, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -14,21 +14,17 @@
class APMDriverInterface : public PowerStatusDriverInterface { class APMDriverInterface : public PowerStatusDriverInterface {
public: public:
virtual ~APMDriverInterface(); virtual ~APMDriverInterface();
virtual status_t Connect(); virtual status_t Connect();
virtual status_t GetBatteryInfo(battery_info* info, int32 index); virtual status_t GetBatteryInfo(int32 index, battery_info* info);
virtual status_t GetExtendedBatteryInfo(acpi_extended_battery_info* info, virtual status_t GetExtendedBatteryInfo(int32 index,
int32 index); acpi_extended_battery_info* info);
virtual int32 GetBatteryCount(); virtual int32 GetBatteryCount();
protected: protected:
virtual void _WatchPowerStatus(); virtual void _WatchPowerStatus();
private:
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
int fDevice;
#endif
}; };
#endif // APM_DRIVER_INTERFACE_H #endif // APM_DRIVER_INTERFACE_H
src/apps/powerstatus/DriverInterface.h
+25 -23
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2009, Haiku, Inc. All Rights Reserved. * Copyright 2009-2015, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -34,47 +34,49 @@ struct battery_info {
/*! Handle a list of watcher and broadcast a messages to them. */ /*! Handle a list of watcher and broadcast a messages to them. */
class Monitor { class Monitor {
public: public:
virtual ~Monitor(); virtual ~Monitor();
virtual status_t StartWatching(BHandler* target); virtual status_t StartWatching(BHandler* target);
virtual status_t StopWatching(BHandler* target); virtual status_t StopWatching(BHandler* target);
virtual void Broadcast(uint32 message); virtual void Broadcast(uint32 message);
protected: protected:
WatcherList fWatcherList; WatcherList fWatcherList;
}; };
class PowerStatusDriverInterface : public Monitor, public BReferenceable { class PowerStatusDriverInterface : public Monitor, public BReferenceable {
public: public:
PowerStatusDriverInterface(); PowerStatusDriverInterface();
~PowerStatusDriverInterface(); ~PowerStatusDriverInterface();
virtual status_t StartWatching(BHandler* target); virtual status_t StartWatching(BHandler* target);
virtual status_t StopWatching(BHandler* target); virtual status_t StopWatching(BHandler* target);
virtual void Broadcast(uint32 message); virtual void Broadcast(uint32 message);
virtual status_t Connect() = 0; virtual status_t Connect() = 0;
virtual void Disconnect(); virtual void Disconnect();
virtual status_t GetBatteryInfo(battery_info* status, int32 index) = 0; virtual status_t GetBatteryInfo(int32 index,
virtual status_t GetExtendedBatteryInfo(acpi_extended_battery_info* info, battery_info* status) = 0;
int32 index) = 0; virtual status_t GetExtendedBatteryInfo(int32 index,
acpi_extended_battery_info* info) = 0;
virtual int32 GetBatteryCount() = 0; virtual int32 GetBatteryCount() = 0;
protected: protected:
virtual void _WatchPowerStatus() = 0; virtual void _WatchPowerStatus() = 0;
int32 fIsWatching; protected:
sem_id fWaitSem; int32 fIsWatching;
sem_id fWaitSem;
private: private:
static int32 _ThreadWatchPowerFunction(void* data); static int32 _ThreadWatchPowerFunction(void* data);
thread_id fThread; thread_id fThread;
BLocker fListLocker; BLocker fListLocker;
}; };
src/apps/powerstatus/ExtendedInfoWindow.cpp
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2009, Haiku, Inc. All Rights Reserved. * Copyright 2009-2015, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -324,7 +324,7 @@ ExtPowerStatusView::Update(bool force)
return; return;
acpi_extended_battery_info extInfo; acpi_extended_battery_info extInfo;
fDriverInterface->GetExtendedBatteryInfo(&extInfo, fBatteryID); fDriverInterface->GetExtendedBatteryInfo(fBatteryID, &extInfo);
fBatteryInfoView->Update(fBatteryInfo, extInfo); fBatteryInfoView->Update(fBatteryInfo, extInfo);
fBatteryInfoView->Invalidate(); fBatteryInfoView->Invalidate();
@@ -338,8 +338,8 @@ ExtendedInfoWindow::ExtendedInfoWindow(PowerStatusDriverInterface* interface)
: :
BWindow(BRect(100, 150, 500, 500), B_TRANSLATE("Extended battery info"), BWindow(BRect(100, 150, 500, 500), B_TRANSLATE("Extended battery info"),
B_TITLED_WINDOW, B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AVOID_FRONT | B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AVOID_FRONT
B_ASYNCHRONOUS_CONTROLS), | B_ASYNCHRONOUS_CONTROLS),
fDriverInterface(interface), fDriverInterface(interface),
fSelectedView(NULL) fSelectedView(NULL)
{ {
src/apps/powerstatus/PowerStatusView.cpp
+5 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006-2014, Haiku, Inc. All Rights Reserved. * Copyright 2006-2015, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -62,7 +62,8 @@ const int32 kLowBatteryPercentage = 15;
PowerStatusView::PowerStatusView(PowerStatusDriverInterface* interface, PowerStatusView::PowerStatusView(PowerStatusDriverInterface* interface,
BRect frame, int32 resizingMode, int batteryID, bool inDeskbar) BRect frame, int32 resizingMode, int batteryID, bool inDeskbar)
: BView(frame, kDeskbarItemName, resizingMode, :
BView(frame, kDeskbarItemName, resizingMode,
B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE), B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE),
fDriverInterface(interface), fDriverInterface(interface),
fBatteryID(batteryID), fBatteryID(batteryID),
@@ -464,11 +465,11 @@ void
PowerStatusView::_GetBatteryInfo(battery_info* batteryInfo, int batteryID) PowerStatusView::_GetBatteryInfo(battery_info* batteryInfo, int batteryID)
{ {
if (batteryID >= 0) { if (batteryID >= 0) {
fDriverInterface->GetBatteryInfo(batteryInfo, batteryID); fDriverInterface->GetBatteryInfo(batteryID, batteryInfo);
} else { } else {
for (int i = 0; i < fDriverInterface->GetBatteryCount(); i++) { for (int i = 0; i < fDriverInterface->GetBatteryCount(); i++) {
battery_info info; battery_info info;
fDriverInterface->GetBatteryInfo(&info, i); fDriverInterface->GetBatteryInfo(i, &info);
if (i == 0) if (i == 0)
*batteryInfo = info; *batteryInfo = info;