diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-12-13 19:51:40 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-12-13 19:51:40 -0500 |
| commit | 1c1a4bc970be061484bb8dcccf945eb08144c656 (patch) | |
| tree | f3360002d522330f7a226dd377479022515a82d5 /hw/kdrive/src/kdrive.c | |
| parent | c8feb73f5841e7812d8dfdb91f1064e2033d028c (diff) | |
devPrivates rework: more cleanup from previous merge operation.
Diffstat (limited to 'hw/kdrive/src/kdrive.c')
| -rw-r--r-- | hw/kdrive/src/kdrive.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 5376f19db..50148c49c 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -29,6 +29,7 @@ #endif #include <mivalidate.h> #include <dixstruct.h> +#include "privates.h" #ifdef RANDR #include <randrstr.h> #endif @@ -66,8 +67,8 @@ KdDepths kdDepths[] = { #define KD_DEFAULT_BUTTONS 5 -int kdScreenPrivateIndex; -unsigned long kdGeneration; +DevPrivateKey kdScreenPrivateKey = &kdScreenPrivateKey; +unsigned long kdGeneration; Bool kdVideoTest; unsigned long kdVideoTestTime; @@ -751,10 +752,8 @@ KdAllocatePrivates (ScreenPtr pScreen) KdPrivScreenPtr pScreenPriv; if (kdGeneration != serverGeneration) - { - kdScreenPrivateIndex = AllocateScreenPrivateIndex(); - kdGeneration = serverGeneration; - } + kdGeneration = serverGeneration; + pScreenPriv = (KdPrivScreenPtr) xalloc(sizeof (*pScreenPriv)); if (!pScreenPriv) return FALSE; @@ -1401,8 +1400,8 @@ KdInitOutput (ScreenInfo *pScreenInfo, } #ifdef DPMSExtension -void -DPMSSet(int level) +int +DPMSSet(ClientPtr client, int level) { } |