static markup, more dead code.
This commit is contained in:
parent
1c4f90b1d0
commit
7c1b2ee7a8
|
@ -52,7 +52,6 @@ extern Bool xf86DoConfigurePass1;
|
|||
extern int xf86ScreenIndex; /* Index into pScreen.devPrivates */
|
||||
extern int xf86CreateRootWindowIndex; /* Index into pScreen.devPrivates */
|
||||
extern int xf86PixmapIndex;
|
||||
extern Bool xf86ResAccessEnter;
|
||||
extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */
|
||||
extern const unsigned char byte_reversed[256];
|
||||
extern ScrnInfoPtr xf86CurrentScreen;
|
||||
|
|
|
@ -65,7 +65,7 @@ xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL};
|
|||
|
||||
BusRec primaryBus = { BUS_NONE, {{0}}};
|
||||
|
||||
Bool xf86ResAccessEnter = FALSE;
|
||||
static Bool xf86ResAccessEnter = FALSE;
|
||||
|
||||
#ifdef REDUCER
|
||||
/* Resources that temporarily conflict with estimated resources */
|
||||
|
@ -664,32 +664,6 @@ xf86AccessRestoreState(void)
|
|||
* Otherwise resources needed for access control might be shadowed
|
||||
* by other resources!
|
||||
*/
|
||||
#ifdef async
|
||||
|
||||
static AsyncQPtr *AsyncQ = NULL;
|
||||
_X_EXPORT ScrnInfoPtr xf86CurrentScreen = NULL;
|
||||
|
||||
#define SETUP_Q org = AsyncQ; \
|
||||
AsyncQ = &new;
|
||||
|
||||
#define PROCESS_Q xf86CurrentScreen = pScrn;
|
||||
if (!new) AsyncQ = org; \
|
||||
else { \
|
||||
AsyncQPtr tmp_Q; \
|
||||
while (1) {\
|
||||
new->func(new->arg);\
|
||||
if (!(new->next)) {\
|
||||
AsyncQ = org; xfree(new); break; \
|
||||
} \
|
||||
tmp_Q = new->next; \
|
||||
xfree(new); \
|
||||
new = tmp_Q; \
|
||||
} \
|
||||
}
|
||||
#else
|
||||
#define SETUP_Q
|
||||
#define PROCESS_Q
|
||||
#endif
|
||||
|
||||
_X_EXPORT void
|
||||
xf86EnableAccess(ScrnInfoPtr pScrn)
|
||||
|
@ -698,9 +672,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
register EntityAccessPtr pceAcc;
|
||||
register xf86AccessPtr pAcc;
|
||||
EntityAccessPtr tmp;
|
||||
#ifdef async
|
||||
AsyncQPtr *org, new = NULL;
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
ErrorF("Enable access %i\n",pScrn->scrnIndex);
|
||||
|
@ -709,9 +680,7 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
/* Entity is not under access control or currently enabled */
|
||||
if (!pScrn->access) {
|
||||
if (pScrn->busAccess) {
|
||||
SETUP_Q;
|
||||
((BusAccPtr)pScrn->busAccess)->set_f(pScrn->busAccess);
|
||||
PROCESS_Q;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
@ -722,7 +691,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
if (peAcc == pceAcc) {
|
||||
return;
|
||||
}
|
||||
SETUP_Q;
|
||||
if (pScrn->CurrentAccess->pMemAccess == pceAcc)
|
||||
pScrn->CurrentAccess->pMemAccess = NULL;
|
||||
while (pceAcc) {
|
||||
|
@ -740,13 +708,11 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
peAcc = peAcc->next;
|
||||
}
|
||||
pScrn->CurrentAccess->pIoAccess = (EntityAccessPtr) pScrn->access;
|
||||
PROCESS_Q;
|
||||
return;
|
||||
|
||||
case MEM_IO:
|
||||
pceAcc = pScrn->CurrentAccess->pIoAccess;
|
||||
if (peAcc != pceAcc) { /* current Io != pAccess */
|
||||
SETUP_Q;
|
||||
tmp = pceAcc;
|
||||
while (pceAcc) {
|
||||
pAcc = pceAcc->pAccess;
|
||||
|
@ -769,7 +735,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
if (pceAcc == peAcc) { /* current Mem == pAccess */
|
||||
return;
|
||||
}
|
||||
SETUP_Q;
|
||||
while (pceAcc) { /* current Mem != pAccess */
|
||||
pAcc = pceAcc->pAccess;
|
||||
if (pAcc && pAcc->AccessDisable)
|
||||
|
@ -787,7 +752,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
}
|
||||
pScrn->CurrentAccess->pMemAccess =
|
||||
pScrn->CurrentAccess->pIoAccess = (EntityAccessPtr) pScrn->access;
|
||||
PROCESS_Q;
|
||||
return;
|
||||
|
||||
case MEM:
|
||||
|
@ -795,7 +759,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
if (peAcc == pceAcc) {
|
||||
return;
|
||||
}
|
||||
SETUP_Q;
|
||||
if (pScrn->CurrentAccess->pIoAccess == pceAcc)
|
||||
pScrn->CurrentAccess->pIoAccess = NULL;
|
||||
while (pceAcc) {
|
||||
|
@ -813,14 +776,11 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
peAcc = peAcc->next;
|
||||
}
|
||||
pScrn->CurrentAccess->pMemAccess = (EntityAccessPtr) pScrn->access;
|
||||
PROCESS_Q;
|
||||
return;
|
||||
|
||||
case NONE:
|
||||
if (pScrn->busAccess) {
|
||||
SETUP_Q;
|
||||
((BusAccPtr)pScrn->busAccess)->set_f(pScrn->busAccess);
|
||||
PROCESS_Q;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user