diff options
| author | Egbert Eich <eich@suse.de> | 2005-01-11 14:59:02 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2005-01-11 14:59:02 +0000 |
| commit | b6301dc41090899b20003eab1356bc09fc5eed1a (patch) | |
| tree | 3e1a20a834f92ff72a87a81d2e04efb7f425432b | |
| parent | 27fc6874b34d70a7ddae5ed8f516f6cfaab518b8 (diff) | |
Minor format fix.
Added explanatory comment and debug code.
Added comment.
| -rw-r--r-- | hw/xfree86/ddc/edid.h | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_apm.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index 939b4d351..f7e7a76ba 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -163,7 +163,6 @@ #define _VALID_TIMING(x) !(((x[0] == 0x01) && (x[1] == 0x01)) \ || ((x[0] == 0x00) && (x[1] == 0x00)) \ || ((x[0] == 0x20) && (x[1] == 0x20)) ) - #define VALID_TIMING _VALID_TIMING(c) #define _HSIZE1(x) ((x[0] + 31) * 8) #define HSIZE1 _HSIZE1(c) diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index f2f326959..437f8adf1 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -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 "os.h" @@ -98,6 +98,11 @@ lnxPMConfirmEventToOs(int fd, pmEvent event) case XF86_APM_CRITICAL_SUSPEND: case XF86_APM_USER_SUSPEND: 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) return PM_CONTINUE; else |