summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2007-11-20 18:49:30 -0500
committerEamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil>2007-11-20 18:49:30 -0500
commit140a4660aca1c283613d5b62f51668b44b45baf6 (patch)
tree90d02029a3fcfe59d4e2a51b1ddac74fc11c743b
parented8a39c48ab9dac085fcf58b9641364b5608f3f4 (diff)
Revert "registry: Register XTrap extension protocol names."
This reverts commit b38a91993364aa80cfd99721e319e1458d9fb760. Moving all the names into dix/registry.c
-rw-r--r--XTrap/xtrapdi.c36
1 files changed, 0 insertions, 36 deletions
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index 15a38eafc..7dd9584a0 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -62,7 +62,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "misc.h" /* Server swapping macros */
#include "dixstruct.h" /* Server ClientRec definitions */
#include "resource.h" /* Used with the MakeAtom call */
-#include "registry.h"
#ifdef PC
# include "scrintst.h" /* Screen struct */
# include "extnsist.h"
@@ -464,41 +463,6 @@ void DEC_XTRAPInit()
XETrap_avail.data.xtrap_revision);
#endif
- RegisterRequestName(extEntry->base, XETrap_Reset,
- XTrapExtName ":Reset");
- RegisterRequestName(extEntry->base, XETrap_GetAvailable,
- XTrapExtName ":GetAvailable");
- RegisterRequestName(extEntry->base, XETrap_Config,
- XTrapExtName ":Config");
- RegisterRequestName(extEntry->base, XETrap_StartTrap,
- XTrapExtName ":StartTrap");
- RegisterRequestName(extEntry->base, XETrap_StopTrap,
- XTrapExtName ":StopTrap");
- RegisterRequestName(extEntry->base, XETrap_GetCurrent,
- XTrapExtName ":GetCurrent");
- RegisterRequestName(extEntry->base, XETrap_GetStatistics,
- XTrapExtName ":GetStatistics");
-#ifndef _XINPUT
- RegisterRequestName(extEntry->base, XETrap_SimulateXEvent,
- XTrapExtName ":SimulateXEvent");
-#endif
- RegisterRequestName(extEntry->base, XETrap_GetVersion,
- XTrapExtName ":GetVersion");
- RegisterRequestName(extEntry->base, XETrap_GetLastInpTime,
- XTrapExtName ":GetLastInpTime");
-
- RegisterEventName(extEntry->eventBase, XTrapExtName ":Event");
-
- RegisterErrorName(extEntry->errorBase + BadIO,
- XTrapExtName ":BadIO");
- RegisterErrorName(extEntry->errorBase + BadStatistics,
- XTrapExtName ":BadStatistics");
- RegisterErrorName(extEntry->errorBase + BadDevices,
- XTrapExtName ":BadDevices");
- RegisterErrorName(extEntry->errorBase + BadScreen,
- XTrapExtName ":BadScreen");
- RegisterErrorName(extEntry->errorBase + BadSwapReq,
- XTrapExtName ":BadSwapReq");
return;
}