Alistair Leslie-Hughes : winejoystick.drv: Remove support for linux kernels older than 2.2.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 59b08c3af371dbafd90b08e034c2674cefec5d92
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=59b08c3af371dbafd90b08e03...

Author: Alistair Leslie-Hughes 
Date:   Wed Apr 10 04:33:55 2019 +0000

winejoystick.drv: Remove support for linux kernels older than 2.2.

Signed-off-by: Alistair Leslie-Hughes 
Signed-off-by: Alexandre Julliard

---

dlls/winejoystick.drv/joystick_linux.c | 62 ++--------------------------------
 1 file changed, 2 insertions(+), 60 deletions(-)

diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c
index 287f4be..85ad2fe 100644
--- a/dlls/winejoystick.drv/joystick_linux.c
+++ b/dlls/winejoystick.drv/joystick_linux.c
@@ -38,7 +38,7 @@
 #include "config.h"
 #include "wine/port.h"

-#ifdef HAVE_LINUX_JOYSTICK_H
+#ifdef HAVE_LINUX_22_JOYSTICK_API

#ifdef HAVE_UNISTD_H
 # include <unistd.h>
@@ -174,11 +174,7 @@ static	int	JSTCK_OpenDevice(WINE_JSTCK* jstick)
       return -1;
     last_attempt = now;

-#ifdef HAVE_LINUX_22_JOYSTICK_API
     flags = O_RDONLY | O_NONBLOCK;
-#else
-    flags = O_RDONLY;
-#endif

/* The first joystick may not be at /dev/input/js0, find the correct
      * first or second device. For example the driver for XBOX 360 wireless
@@ -203,10 +199,9 @@ static	int	JSTCK_OpenDevice(WINE_JSTCK* jstick)
         close(fd);
     }

-#ifdef HAVE_LINUX_22_JOYSTICK_API
     if (jstick->dev > 0)
         ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap);
-#endif
+
     return jstick->dev;
 }

@@ -217,21 +212,16 @@ static	int	JSTCK_OpenDevice(WINE_JSTCK* jstick)
 LRESULT driver_joyGetDevCaps(DWORD_PTR dwDevID, LPJOYCAPSW lpCaps, DWORD dwSize)
 {
     WINE_JSTCK*	jstck;
-#ifdef HAVE_LINUX_22_JOYSTICK_API
     int		dev;
     char	nrOfAxes;
     char	nrOfButtons;
     char	identString[MAXPNAMELEN];
     int		i;
     int		driverVersion;
-#else
-static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k',' ','D','r','i','v','e','r',0};
-#endif

if ((jstck = JSTCK_drvGet(dwDevID)) == NULL)
    return MMSYSERR_NODRIVER;

-#ifdef HAVE_LINUX_22_JOYSTICK_API
     if ((dev = JSTCK_OpenDevice(jstck)) < 0) return JOYERR_PARMS;
     ioctl(dev, JSIOCGAXES, &nrOfAxes);
     ioctl(dev, JSIOCGBUTTONS, &nrOfButtons);
@@ -310,33 +300,6 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k',
        }
    }
     }
-#else
-    lpCaps->wMid = MM_MICROSOFT;
-    lpCaps->wPid = MM_PC_JOYSTICK;
-    strcpyW(lpCaps->szPname, ini); /* joystick product name */
-    lpCaps->wXmin = 0;
-    lpCaps->wXmax = 0xFFFF;
-    lpCaps->wYmin = 0;
-    lpCaps->wYmax = 0xFFFF;
-    lpCaps->wZmin = 0;
-    lpCaps->wZmax = 0;
-    lpCaps->wNumButtons = 2;
-    if (dwSize == sizeof(JOYCAPSW)) {
-	/* complete 95 structure */
-	lpCaps->wRmin = 0;
-	lpCaps->wRmax = 0;
-	lpCaps->wUmin = 0;
-	lpCaps->wUmax = 0;
-	lpCaps->wVmin = 0;
-	lpCaps->wVmax = 0;
-	lpCaps->wCaps = 0;
-	lpCaps->wMaxAxes = 2;
-	lpCaps->wNumAxes = 2;
-	lpCaps->wMaxButtons = 4;
-	lpCaps->szRegKey[0] = 0;
-	lpCaps->szOEMVxD[0] = 0;
-    }
-#endif

return JOYERR_NOERROR;
 }
@@ -348,19 +311,13 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo)
 {
     WINE_JSTCK*		jstck;
     int			dev;
-#ifdef HAVE_LINUX_22_JOYSTICK_API
     struct js_event 	ev;
-#else
-    struct js_status 	js;
-    int    		dev_stat;
-#endif

if ((jstck = JSTCK_drvGet(dwDevID)) == NULL)
    return MMSYSERR_NODRIVER;

if ((dev = JSTCK_OpenDevice(jstck)) < 0) return JOYERR_PARMS;

-#ifdef HAVE_LINUX_22_JOYSTICK_API
     while ((read(dev, &ev, sizeof(struct js_event))) > 0) {
    if (ev.type == (JS_EVENT_AXIS)) {
        switch (jstck->axesMap[ev.number]) {
@@ -467,21 +424,6 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo)
        lpInfo->dwPOV = JOY_POVCENTERED; /* Center */
     }

-#else
-    dev_stat = read(dev, &js, sizeof(js));
-    if (dev_stat != sizeof(js)) {
-	return JOYERR_UNPLUGGED; /* FIXME: perhaps wrong, but what should I return else ? */
-    }
-    js.x = js.x<<8;
-    js.y = js.y<<8;
-    if (lpInfo->dwFlags & JOY_RETURNX)
-	lpInfo->dwXpos = js.x;   /* FIXME: perhaps multiply it somehow ? */
-    if (lpInfo->dwFlags & JOY_RETURNY)
-	lpInfo->dwYpos = js.y;
-    if (lpInfo->dwFlags & JOY_RETURNBUTTONS)
-	lpInfo->dwButtons = js.buttons;
-#endif
-
     TRACE("x: %d, y: %d, z: %d, r: %d, u: %d, v: %d, buttons: 0x%04x, flags: 0x%04x (fd %d)\n",
      lpInfo->dwXpos, lpInfo->dwYpos, lpInfo->dwZpos,
      lpInfo->dwRpos, lpInfo->dwUpos, lpInfo->dwVpos,