frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/kdrive: Use NotifyFd interface for kdrive/linux APM monitoring 

Replace the block/wakeup handlers with a NotifyFd callback

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2015-11-11 22:02:08 -08:00 committed by Adam Jackson
parent 8c8f3567fe
commit 21c1680e83
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/kdrive/linux/linux.c
View File

@ -169,19 +169,12 @@ LinuxSetSwitchMode(int mode)
}
}
static void
LinuxApmBlock(void *blockData, OSTimePtr pTimeout, void *pReadmask)
{
}
static Bool LinuxApmRunning;
static void
LinuxApmWakeup(void *blockData, int result, void *pReadmask)
LinuxApmNotify(int fd, int mask, void *blockData)
{
fd_set *readmask = (fd_set *) pReadmask;
if (result > 0 && LinuxApmFd >= 0 && FD_ISSET(LinuxApmFd, readmask)) {
if (LinuxApmFd >= 0) {
apm_event_t event;
Bool running = LinuxApmRunning;
int cmd = APM_IOC_SUSPEND;
@ -242,8 +235,7 @@ LinuxEnable(void)
if (LinuxApmFd >= 0) {
LinuxApmRunning = TRUE;
fcntl(LinuxApmFd, F_SETFL, fcntl(LinuxApmFd, F_GETFL) | NOBLOCK);
RegisterBlockAndWakeupHandlers(LinuxApmBlock, LinuxApmWakeup, 0);
AddEnabledDevice(LinuxApmFd);
SetNotifyFd(LinuxApmFd, LinuxApmNotify, X_NOTIFY_READ, NULL);
}
/*
@ -273,8 +265,7 @@ LinuxDisable(void)
}
enabled = FALSE;
if (LinuxApmFd >= 0) {
RemoveBlockAndWakeupHandlers(LinuxApmBlock, LinuxApmWakeup, 0);
RemoveEnabledDevice(LinuxApmFd);
RemoveNotifyFd(LinuxApmFd);
close(LinuxApmFd);
LinuxApmFd = -1;
}