diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/jstk_axis.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 3bf90ab..bba19ca 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) XORG_DRIVER_CHECK_EXT(XKB, kbproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.2] xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18.99.2] xproto $REQUIRED_MODULES) DRIVER_NAME=joystick AC_SUBST([DRIVER_NAME]) diff --git a/src/jstk_axis.c b/src/jstk_axis.c index 3f3da6c..2f9793b 100644 --- a/src/jstk_axis.c +++ b/src/jstk_axis.c @@ -59,14 +59,14 @@ jstkAxisTimer(OsTimerPtr timer, InputInfoPtr pInfo = device->public.devicePrivate; JoystickDevPtr priv = pInfo->private; - int sigstate, i; + int i; int nexttimer; int movex,movey,movezx,movezy; nexttimer = 0; movex = movey = movezx = movezy = 0; - sigstate = xf86BlockSIGIO(); + input_lock(); for (i=0; i<MAXAXES; i++) if ((priv->axis[i].value != 0) && (priv->axis[i].type != JSTK_TYPE_NONE)) { @@ -306,7 +306,7 @@ jstkAxisTimer(OsTimerPtr timer, DBG(2, ErrorF("Stopping Axis Timer\n")); } - xf86UnblockSIGIO (sigstate); + input_unlock(); return nexttimer; } @@ -464,12 +464,12 @@ jstkPWMAxisTimer(OsTimerPtr timer, InputInfoPtr pInfo = device->public.devicePrivate; JoystickDevPtr priv = pInfo->private; - int sigstate, i; + int i; int nexttimer; nexttimer = 0; - sigstate = xf86BlockSIGIO(); + input_lock(); for (i=0; i<MAXAXES; i++) if (priv->axis[i].timer == timer) /* The timer handles only one axis! Find it. */ @@ -576,7 +576,7 @@ jstkPWMAxisTimer(OsTimerPtr timer, break; } - xf86UnblockSIGIO (sigstate); + input_unlock(); return nexttimer; } |