David Lawrie : winejoystick.drv: Remove ignore axis input type.
Alexandre Julliard
julliard at winehq.org
Thu Jun 16 10:20:55 CDT 2016
Module: wine
Branch: master
Commit: 9dcfb97515b894d229a707c8374fd0391379e6b3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcfb97515b894d229a707c8374fd0391379e6b3
Author: David Lawrie <david.dljunk at gmail.com>
Date: Tue Jun 14 20:33:51 2016 -0700
winejoystick.drv: Remove ignore axis input type.
In case Sim page Throttle, Brake, etc ... are type Axis not Misc, no
longer ignoring Axis type.
Signed-off-by: David Lawrie <david.dljunk at gmail.com>
Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winejoystick.drv/joystick_osx.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c
index 4a89a45..ad82dd7 100644
--- a/dlls/winejoystick.drv/joystick_osx.c
+++ b/dlls/winejoystick.drv/joystick_osx.c
@@ -417,10 +417,6 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll
break;
}
case kIOHIDElementTypeInput_Axis:
- {
- TRACE("kIOHIDElementTypeInput_Axis; ignoring\n");
- break;
- }
case kIOHIDElementTypeInput_Misc:
{
uint32_t usage = IOHIDElementGetUsage( child );
@@ -432,7 +428,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll
{
case kHIDUsage_GD_Hatswitch:
{
- TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Hatswitch\n");
+ TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_Hatswitch\n");
if (joystick->hatswitch)
TRACE(" ignoring additional hatswitch\n");
else
@@ -447,7 +443,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll
case kHIDUsage_GD_Rz:
{
int axis = axis_for_usage_GD(usage);
- TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, axis);
+ TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, axis);
if (axis < 0 || joystick->axes[axis].element)
TRACE(" ignoring\n");
else
@@ -468,10 +464,10 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll
while(axis < 3 && joystick->axes[possible_axes[axis]].element)
axis++;
if (axis == 3)
- TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d)\n ignoring\n", usage);
+ TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d)\n ignoring\n", usage);
else
{
- TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, possible_axes[axis]);
+ TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, possible_axes[axis]);
joystick->axes[possible_axes[axis]].element = (IOHIDElementRef)CFRetain(child);
joystick->axes[possible_axes[axis]].min_value = IOHIDElementGetLogicalMin(child);
joystick->axes[possible_axes[axis]].max_value = IOHIDElementGetLogicalMax(child);
@@ -479,7 +475,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll
break;
}
default:
- FIXME("kIOHIDElementTypeInput_Misc / Unhandled GD Page usage %d\n", usage);
+ FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled GD Page usage %d\n", usage);
break;
}
break;
@@ -495,7 +491,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll
case kHIDUsage_Sim_Brake:
{
int axis = axis_for_usage_Sim(usage);
- TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_Sim_<axis> (%d) axis %d\n", usage, axis);
+ TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_Sim_<axis> (%d) axis %d\n", usage, axis);
if (axis < 0 || joystick->axes[axis].element)
TRACE(" ignoring\n");
else
@@ -507,13 +503,13 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll
break;
}
default:
- FIXME("kIOHIDElementTypeInput_Misc / Unhandled Sim Page usage %d\n", usage);
+ FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled Sim Page usage %d\n", usage);
break;
}
break;
}
default:
- FIXME("kIOHIDElementTypeInput_Misc / Unhandled Usage Page %d\n", usage_page);
+ FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled Usage Page %d\n", usage_page);
break;
}
break;
More information about the wine-cvs
mailing list