frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused server state change callbackery.

This commit is contained in:
Adam Jackson 2008-10-03 15:06:42 -04:00
parent 9ada146a16
commit d7c0ba2e9e
5 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86.h
View File

@ -138,8 +138,6 @@ memType xf86ChkConflict(resRange *rgp, int entityIndex);
ScrnInfoPtr xf86FindScreenForEntity(int entityIndex); ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
Bool xf86NoSharedResources(int screenIndex, resType res); Bool xf86NoSharedResources(int screenIndex, resType res);
resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2); resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2);
void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg);
Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func);
int xf86GetLastScrnFlag(int entityIndex); int xf86GetLastScrnFlag(int entityIndex);
void xf86SetLastScrnFlag(int entityIndex, int scrnIndex); void xf86SetLastScrnFlag(int entityIndex, int scrnIndex);

57
hw/xfree86/common/xf86Bus.c
View File

@ -95,10 +95,6 @@ _X_EXPORT resRange res8514Shared[] = {_8514_SHARED, _END};
static Bool needRAC = FALSE; static Bool needRAC = FALSE;
static Bool doFramebufferMode = FALSE; static Bool doFramebufferMode = FALSE;
/* state change notification callback list */
static StateChangeNotificationPtr StateChangeNotificationList;
static void notifyStateChange(xf86NotifyState state);
#undef MIN #undef MIN
#define MIN(x,y) ((x<y)?x:y) #define MIN(x,y) ((x<y)?x:y)
@ -595,7 +591,6 @@ xf86AccessEnter(void)
PciStateEnter(); PciStateEnter();
disableAccess(); disableAccess();
EntityEnter(); EntityEnter();
notifyStateChange(NOTIFY_ENTER);
xf86EnterServerState(SETUP); xf86EnterServerState(SETUP);
xf86ResAccessEnter = TRUE; xf86ResAccessEnter = TRUE;
} }
@ -614,7 +609,6 @@ xf86AccessLeave(void)
{ {
if (!xf86ResAccessEnter) if (!xf86ResAccessEnter)
return; return;
notifyStateChange(NOTIFY_LEAVE);
disableAccess(); disableAccess();
DisablePciBusAccess(); DisablePciBusAccess();
EntityLeave(); EntityLeave();
@ -1766,15 +1760,9 @@ xf86EnterServerState(xf86State state)
*/ */
if (!needRAC) { if (!needRAC) {
xf86EnableAccess(xf86Screens[0]); xf86EnableAccess(xf86Screens[0]);
notifyStateChange(NOTIFY_ENABLE);
return; return;
} }
if (state == SETUP)
notifyStateChange(NOTIFY_SETUP_TRANSITION);
else
notifyStateChange(NOTIFY_OPERATING_TRANSITION);
clearAccess(); clearAccess();
for (i=0; i<xf86NumScreens;i++) { for (i=0; i<xf86NumScreens;i++) {
@ -1817,10 +1805,6 @@ xf86EnterServerState(xf86State state)
break; break;
} }
} }
if (state == SETUP)
notifyStateChange(NOTIFY_SETUP);
else
notifyStateChange(NOTIFY_OPERATING);
} }
/* /*
@ -2070,7 +2054,6 @@ xf86PostProbe(void)
} else { } else {
xf86Msg(X_INFO,"Running in FRAMEBUFFER Mode\n"); xf86Msg(X_INFO,"Running in FRAMEBUFFER Mode\n");
xf86AccessRestoreState(); xf86AccessRestoreState();
notifyStateChange(NOTIFY_ENABLE);
doFramebufferMode = TRUE; doFramebufferMode = TRUE;
return; return;
@ -2729,46 +2712,6 @@ xf86NoSharedResources(int screenIndex,resType res)
return TRUE; return TRUE;
} }
_X_EXPORT void
xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg)
{
StateChangeNotificationPtr ptr =
(StateChangeNotificationPtr)xnfalloc(sizeof(StateChangeNotificationRec));
ptr->func = func;
ptr->arg = arg;
ptr->next = StateChangeNotificationList;
StateChangeNotificationList = ptr;
}
_X_EXPORT Bool
xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func)
{
StateChangeNotificationPtr *ptr = &StateChangeNotificationList;
StateChangeNotificationPtr tmp;
while (*ptr) {
if ((*ptr)->func == func) {
tmp = (*ptr);
(*ptr) = (*ptr)->next;
xfree(tmp);
return TRUE;
}
ptr = &((*ptr)->next);
}
return FALSE;
}
static void
notifyStateChange(xf86NotifyState state)
{
StateChangeNotificationPtr ptr = StateChangeNotificationList;
while (ptr) {
ptr->func(state,ptr->arg);
ptr = ptr->next;
}
}
/* Multihead accel sharing accessor functions and entity Private handling */ /* Multihead accel sharing accessor functions and entity Private handling */
_X_EXPORT int _X_EXPORT int

8
hw/xfree86/common/xf86Bus.h
View File

@ -119,14 +119,6 @@ typedef struct x_BusAccRec {
} busdep; } busdep;
} BusAccRec, *BusAccPtr; } BusAccRec, *BusAccPtr;
/* state change notification callback */
typedef struct _stateChange {
xf86StateChangeNotificationCallbackFunc func;
pointer arg;
struct _stateChange *next;
} StateChangeNotificationRec, *StateChangeNotificationPtr;
extern EntityPtr *xf86Entities; extern EntityPtr *xf86Entities;
extern int xf86NumEntities; extern int xf86NumEntities;
extern xf86AccessRec AccessNULL; extern xf86AccessRec AccessNULL;

12
hw/xfree86/common/xf86str.h
View File

@ -778,18 +778,6 @@ typedef enum {
OPERATING OPERATING
} xf86State; } xf86State;
typedef enum {
NOTIFY_SETUP_TRANSITION,
NOTIFY_SETUP,
NOTIFY_OPERATING,
NOTIFY_OPERATING_TRANSITION,
NOTIFY_ENABLE,
NOTIFY_ENTER,
NOTIFY_LEAVE
} xf86NotifyState;
typedef void (*xf86StateChangeNotificationCallbackFunc)(xf86NotifyState state,pointer);
/* DGA */ /* DGA */
typedef struct { typedef struct {

2
hw/xfree86/loader/xf86sym.c
View File

@ -324,8 +324,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86SetOperatingState) SYMFUNC(xf86SetOperatingState)
SYMFUNC(xf86ChkConflict) SYMFUNC(xf86ChkConflict)
SYMFUNC(xf86FindScreenForEntity) SYMFUNC(xf86FindScreenForEntity)
SYMFUNC(xf86RegisterStateChangeNotificationCallback)
SYMFUNC(xf86DeregisterStateChangeNotificationCallback)
SYMFUNC(xf86NoSharedResources) SYMFUNC(xf86NoSharedResources)
/* Shared Accel Accessor Functions */ /* Shared Accel Accessor Functions */
SYMFUNC(xf86GetLastScrnFlag) SYMFUNC(xf86GetLastScrnFlag)