diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-06-21 13:44:14 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-06-21 13:44:14 +0000 |
| commit | ed7f92e791f052d64cffef4b44eae5160fb24689 (patch) | |
| tree | 2cd30e8701517534f52740236f0528ca4ed64025 | |
| parent | 68d92cca1a696521599db6a826d2187ec0c15f01 (diff) | |
Bug 778: add ddxBeforeReset
| -rw-r--r-- | Xprint/ddxInit.c | 5 | ||||
| -rw-r--r-- | dix/dispatch.c | 5 | ||||
| -rw-r--r-- | hw/vfb/InitOutput.c | 5 | ||||
| -rw-r--r-- | hw/xnest/Init.c | 5 | ||||
| -rw-r--r-- | include/dix.h | 4 |
5 files changed, 23 insertions, 1 deletions
diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index 55b73ea0b..3ed864b1a 100644 --- a/Xprint/ddxInit.c +++ b/Xprint/ddxInit.c @@ -217,6 +217,11 @@ OsVendorFatalError(void) } #endif +void +ddxBeforeReset(void) +{ + return; +} #ifdef DDXTIME CARD32 diff --git a/dix/dispatch.c b/dix/dispatch.c index d07b631e7..811e39274 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.4.2.3.6.2 2004/04/20 03:27:08 gisburn Exp $ */ +/* $XdotOrg$ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ @@ -474,6 +474,9 @@ Dispatch(void) } dispatchException &= ~DE_PRIORITYCHANGE; } +#if defined(DDXBEFORERESET) + ddxBeforeReset (); +#endif KillAllClients(); DEALLOCATE_LOCAL(clientReady); dispatchException &= ~DE_RESET; diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 562dd611e..a6aae2941 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -251,6 +251,11 @@ OsVendorFatalError() { } +void ddxBeforeReset(void) +{ + return; +} + void ddxUseMsg() { diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 7a43b62b4..53c9f73f4 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -150,6 +150,11 @@ void OsVendorFatalError() return; } +void ddxBeforeReset(void) +{ + return; +} + /* this is just to get the server to link on AIX */ #ifdef AIXV3 int SelectWaitTime = 10000; /* usec */ diff --git a/include/dix.h b/include/dix.h index 0ca157ad4..20a182d2e 100644 --- a/include/dix.h +++ b/include/dix.h @@ -372,6 +372,10 @@ extern int DoGetImage( extern void IncrementClientCount(void); #endif /* LBX */ +#if defined(DDXBEFORERESET) +extern void ddxBeforeReset (void); +#endif + /* dixutils.c */ extern void CopyISOLatin1Lowered( |