|
 |
13ddb2e |
From 3fd969f08e4f550ac28fee3bbdbe55e9db872091 Mon Sep 17 00:00:00 2001
|
|
|
d9126b1 |
From: Adam Jackson <ajax@redhat.com>
|
|
|
d9126b1 |
Date: Mon, 3 Dec 2007 14:00:25 -0500
|
|
|
d9126b1 |
Subject: [PATCH] apm_event_t workaround
|
|
|
d9126b1 |
|
|
|
d9126b1 |
---
|
|
|
13ddb2e |
hw/kdrive/linux/linux.c | 2 ++
|
|
|
d9126b1 |
hw/xfree86/os-support/linux/lnx_apm.c | 3 +++
|
|
|
13ddb2e |
2 files changed, 5 insertions(+), 0 deletions(-)
|
|
|
d9126b1 |
|
|
|
13ddb2e |
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
|
|
|
13ddb2e |
index 23cd8f5..2f9cb62 100644
|
|
|
13ddb2e |
--- a/hw/kdrive/linux/linux.c
|
|
|
13ddb2e |
+++ b/hw/kdrive/linux/linux.c
|
|
|
13ddb2e |
@@ -275,6 +275,8 @@ LinuxApmBlock (pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
|
|
|
13ddb2e |
|
|
|
13ddb2e |
static Bool LinuxApmRunning;
|
|
|
13ddb2e |
|
|
|
13ddb2e |
+#define apm_event_t unsigned short
|
|
|
13ddb2e |
+
|
|
|
13ddb2e |
static void
|
|
|
13ddb2e |
LinuxApmWakeup (pointer blockData, int result, pointer pReadmask)
|
|
|
13ddb2e |
{
|
|
|
d9126b1 |
diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
|
|
|
d9126b1 |
index 16ac80d..6bcae47 100644
|
|
|
d9126b1 |
--- a/hw/xfree86/os-support/linux/lnx_apm.c
|
|
|
d9126b1 |
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
|
|
|
d9126b1 |
@@ -39,6 +39,9 @@ static PMClose lnxAPMOpen(void);
|
|
|
d9126b1 |
static void lnxCloseAPM(void);
|
|
|
d9126b1 |
static pointer APMihPtr = NULL;
|
|
|
d9126b1 |
|
|
|
d9126b1 |
+/* XXX this is wrong, do not ever commit me upstream */
|
|
|
d9126b1 |
+#define apm_event_t unsigned short
|
|
|
d9126b1 |
+
|
|
|
d9126b1 |
static struct {
|
|
|
d9126b1 |
apm_event_t apmLinux;
|
|
|
d9126b1 |
pmEvent xf86;
|
|
|
d9126b1 |
--
|
|
|
d9126b1 |
1.5.2.4
|
|
|
d9126b1 |
|