Skip to content

xfree86: vgaarbiter: drop VGAarbiterScreenKey and VGAarbiterGCKey macros #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xfree86: vgaarbiter: drop VGAarbiterScreenKey and VGAarbiterGCKey macros #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions hw/xfree86/common/xf86VGAarbiter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,8 @@ static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {
};

static DevPrivateKeyRec VGAarbiterScreenKeyRec;

#define VGAarbiterScreenKey (&VGAarbiterScreenKeyRec)
static DevPrivateKeyRec VGAarbiterGCKeyRec;

#define VGAarbiterGCKey (&VGAarbiterGCKeyRec)

static int vga_no_arb = 0;
void
xf86VGAarbiterInit(void)
Expand Down Expand Up @@ -180,7 +176,7 @@ xf86VGAarbiterWrapFunctions(void)
if (!(pScreenPriv = calloc(1, sizeof(VGAarbiterScreenRec))))
return FALSE;

dixSetPrivate(&pScreen->devPrivates, VGAarbiterScreenKey, pScreenPriv);
dixSetPrivate(&pScreen->devPrivates, &VGAarbiterScreenKeyRec, pScreenPriv);

WRAP_SCREEN(CloseScreen, VGAarbiterCloseScreen);
WRAP_SCREEN(SaveScreen, VGAarbiterSaveScreen);
Expand Down Expand Up @@ -221,7 +217,7 @@ VGAarbiterCloseScreen(ScreenPtr pScreen)
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VGAarbiterScreenPtr pScreenPriv =
(VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
VGAarbiterScreenKey);
&VGAarbiterScreenKeyRec);
miPointerScreenPtr PointPriv =
(miPointerScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
miPointerScreenKey);
Expand Down Expand Up @@ -458,7 +454,7 @@ VGAarbiterAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
VGAarbiterScreenPtr pScreenPriv =
(VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
VGAarbiterScreenKey);
&VGAarbiterScreenKeyRec);

VGAGet(pScreen);
(*pScreenPriv->AdjustFrame) (pScrn, x, y);
Expand All @@ -472,7 +468,7 @@ VGAarbiterSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
VGAarbiterScreenPtr pScreenPriv =
(VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
VGAarbiterScreenKey);
&VGAarbiterScreenKeyRec);

VGAGet(pScreen);
val = (*pScreenPriv->SwitchMode) (pScrn, mode);
Expand All @@ -487,7 +483,7 @@ VGAarbiterEnterVT(ScrnInfoPtr pScrn)
ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
VGAarbiterScreenPtr pScreenPriv =
(VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
VGAarbiterScreenKey);
&VGAarbiterScreenKeyRec);

VGAGet(pScreen);
pScrn->EnterVT = pScreenPriv->EnterVT;
Expand All @@ -504,7 +500,7 @@ VGAarbiterLeaveVT(ScrnInfoPtr pScrn)
ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
VGAarbiterScreenPtr pScreenPriv =
(VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
VGAarbiterScreenKey);
&VGAarbiterScreenKeyRec);

VGAGet(pScreen);
pScrn->LeaveVT = pScreenPriv->LeaveVT;
Expand All @@ -520,7 +516,7 @@ VGAarbiterFreeScreen(ScrnInfoPtr pScrn)
ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
VGAarbiterScreenPtr pScreenPriv =
(VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
VGAarbiterScreenKey);
&VGAarbiterScreenKeyRec);

VGAGet(pScreen);
(*pScreenPriv->FreeScreen) (pScrn);
Expand All @@ -532,7 +528,7 @@ VGAarbiterCreateGC(GCPtr pGC)
{
ScreenPtr pScreen = pGC->pScreen;
VGAarbiterGCPtr pGCPriv =
(VGAarbiterGCPtr) dixLookupPrivate(&pGC->devPrivates, VGAarbiterGCKey);
(VGAarbiterGCPtr) dixLookupPrivate(&pGC->devPrivates, &VGAarbiterGCKeyRec);
Bool ret;

SCREEN_PROLOG(CreateGC);
Expand Down
8 changes: 4 additions & 4 deletions hw/xfree86/common/xf86VGAarbiterPriv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

#define UNWRAP_SCREEN(x) pScreen->x = pScreenPriv->x

#define SCREEN_PRIV() ((VGAarbiterScreenPtr) dixLookupPrivate(&(pScreen)->devPrivates, VGAarbiterScreenKey))
#define SCREEN_PRIV() ((VGAarbiterScreenPtr) dixLookupPrivate(&(pScreen)->devPrivates, &VGAarbiterScreenKeyRec))

#define SCREEN_PROLOG(x) (pScreen->x = SCREEN_PRIV()->x)

Expand All @@ -67,7 +67,7 @@

#define PICTURE_PROLOGUE(field) ps->field = \
((VGAarbiterScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \
VGAarbiterScreenKey))->field
&VGAarbiterScreenKeyRec))->field

#define PICTURE_EPILOGUE(field, wrap) ps->field = wrap

Expand All @@ -82,7 +82,7 @@
PointPriv = dixLookupPrivate(&pScreen->devPrivates, \
miPointerScreenKey); \
pScreenPriv = dixLookupPrivate(&(pScreen)->devPrivates, \
VGAarbiterScreenKey); \
&VGAarbiterScreenKeyRec); \
PointPriv->spriteFuncs = pScreenPriv->miSprite; \

#define SPRITE_EPILOG \
Expand All @@ -101,7 +101,7 @@
(x)->funcs = &VGAarbiterGCFuncs;

#define GC_UNWRAP(x) VGAarbiterGCPtr pGCPriv = \
(VGAarbiterGCPtr)dixLookupPrivate(&(x)->devPrivates, VGAarbiterGCKey);\
(VGAarbiterGCPtr)dixLookupPrivate(&(x)->devPrivates, &VGAarbiterGCKeyRec);\
(x)->ops = pGCPriv->wrapOps; (x)->funcs = pGCPriv->wrapFuncs;

static inline void
Expand Down