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

Minor format fix. 

Added explanatory comment and debug code.
Added comment.
This commit is contained in:
Egbert Eich 2005-01-11 14:59:02 +00:00
parent 27fc6874b3
commit b6301dc410
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/ddc/edid.h
View File

@ -163,7 +163,6 @@
#define _VALID_TIMING(x) !(((x[0] == 0x01) && (x[1] == 0x01)) \ #define _VALID_TIMING(x) !(((x[0] == 0x01) && (x[1] == 0x01)) \
|| ((x[0] == 0x00) && (x[1] == 0x00)) \ || ((x[0] == 0x00) && (x[1] == 0x00)) \
|| ((x[0] == 0x20) && (x[1] == 0x20)) ) || ((x[0] == 0x20) && (x[1] == 0x20)) )
#define VALID_TIMING _VALID_TIMING(c) #define VALID_TIMING _VALID_TIMING(c)
#define _HSIZE1(x) ((x[0] + 31) * 8) #define _HSIZE1(x) ((x[0] + 31) * 8)
#define HSIZE1 _HSIZE1(c) #define HSIZE1 _HSIZE1(c)

7
hw/xfree86/os-support/linux/lnx_apm.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.13 2002/10/16 01:24:28 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */
#include "X.h" #include "X.h"
#include "os.h" #include "os.h"
@ -98,6 +98,11 @@ lnxPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_CRITICAL_SUSPEND: case XF86_APM_CRITICAL_SUSPEND:
case XF86_APM_USER_SUSPEND: case XF86_APM_USER_SUSPEND:
if (ioctl( fd, APM_IOC_SUSPEND, NULL )) { if (ioctl( fd, APM_IOC_SUSPEND, NULL )) {
/* I believe this is wrong (EE)
EBUSY is sent when a device refuses to be suspended.
In this case we still need to undo everything we have
done to suspend ourselves or we will stay in suspended
state forever. */
if (errno == EBUSY) if (errno == EBUSY)
return PM_CONTINUE; return PM_CONTINUE;
else else