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

Add facility to catch sig 4 from driver. This can be used to check for OS 

SSE support. (Part 1)
This commit is contained in:
Thomas Winischhofer 2004-10-29 02:06:17 +00:00
parent b0185a4bf7
commit 09fdfaa28d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,7 @@ int xf86RemoveInputHandler(pointer handler);
void xf86DisableInputHandler(pointer handler); void xf86DisableInputHandler(pointer handler);
void xf86EnableInputHandler(pointer handler); void xf86EnableInputHandler(pointer handler);
void xf86InterceptSignals(int *signo); void xf86InterceptSignals(int *signo);
void xf86InterceptSigIll(void (*sigillhandler)(void));
Bool xf86EnableVTSwitch(Bool new); Bool xf86EnableVTSwitch(Bool new);
Bool xf86CommonSpecialKey(int key, Bool down, int modifiers); Bool xf86CommonSpecialKey(int key, Bool down, int modifiers);
void xf86ProcessActionEvent(ActionEvent action, void *arg); void xf86ProcessActionEvent(ActionEvent action, void *arg);

17
hw/xfree86/common/xf86Events.c
View File

@ -49,7 +49,7 @@
*/ */
/* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */ /* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.3 2004/07/30 20:56:53 eich Exp $ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.4 2004/10/11 09:58:04 eich Exp $ */
/* [JCH-96/01/21] Extended std reverse map to four buttons. */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */
@ -1265,6 +1265,14 @@ xf86InterceptSignals(int *signo)
*signo = -1; *signo = -1;
} }
static void (*xf86SigIllHandler)(void) = NULL;
void
xf86InterceptSigIll(void (*sigillhandler)(void))
{
xf86SigIllHandler = sigillhandler;
}
/* /*
* xf86SigHandler -- * xf86SigHandler --
* Catch unexpected signals and exit or continue cleanly. * Catch unexpected signals and exit or continue cleanly.
@ -1272,6 +1280,13 @@ xf86InterceptSignals(int *signo)
void void
xf86SigHandler(int signo) xf86SigHandler(int signo)
{ {
if ((signo == SIGILL) && xf86SigIllHandler) {
(*xf86SigIllHandler)();
/* Re-arm handler just in case we unexpectedly return here */
(void) signal(signo, xf86SigHandler);
return;
}
if (xf86SignalIntercept && (*xf86SignalIntercept < 0)) { if (xf86SignalIntercept && (*xf86SignalIntercept < 0)) {
/* Re-arm handler just in case */ /* Re-arm handler just in case */
(void) signal(signo, xf86SigHandler); (void) signal(signo, xf86SigHandler);