diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-26 17:22:21 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-05 19:23:03 -0700 |
| commit | faeebead7bfcc78535757ca7acc1faf7554c03b7 (patch) | |
| tree | 1a8f13a3b1ae968011efb9679bc3ed79a29020be /hw/kdrive/src/kdrive.c | |
| parent | c865a24401f06bcf1347d8b41f736a066ab25693 (diff) | |
Change the devPrivates API to require dixRegisterPrivateKey
This patch only changes the API, not the implementation of the
devPrivates infrastructure. This will permit a new devPrivates
implementation to be layed into the server without requiring
simultaneous changes in every devPrivates user.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Diffstat (limited to 'hw/kdrive/src/kdrive.c')
| -rw-r--r-- | hw/kdrive/src/kdrive.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 27596e467..06c3661da 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -64,8 +64,7 @@ KdDepths kdDepths[] = { #define KD_DEFAULT_BUTTONS 5 -static int kdScreenPrivateKeyIndex; -DevPrivateKey kdScreenPrivateKey = &kdScreenPrivateKeyIndex; +DevPrivateKeyRec kdScreenPrivateKeyRec; unsigned long kdGeneration; Bool kdVideoTest; @@ -699,6 +698,9 @@ KdAllocatePrivates (ScreenPtr pScreen) if (kdGeneration != serverGeneration) kdGeneration = serverGeneration; + if (!dixRegisterPrivateKey(&kdScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) + return FALSE; + pScreenPriv = calloc(1, sizeof (*pScreenPriv)); if (!pScreenPriv) return FALSE; |