@ -948,7 +948,7 @@ EvdevAddKeyClass(DeviceIntPtr device)
}
static int
EvdevAddAbsClass ( DeviceIntPtr device )
EvdevAddAbsValuator Class ( DeviceIntPtr device )
{
InputInfoPtr pInfo ;
EvdevPtr pEvdev ;
@ -1072,7 +1072,7 @@ out:
}
static int
EvdevAddRelClass ( DeviceIntPtr device )
EvdevAddRelValuator Class ( DeviceIntPtr device )
{
InputInfoPtr pInfo ;
EvdevPtr pEvdev ;
@ -1234,24 +1234,24 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
}
static void
EvdevInitAnyClas s ( DeviceIntPtr device , EvdevPtr pEvdev )
EvdevInitAnyValuator s ( DeviceIntPtr device , EvdevPtr pEvdev )
{
InputInfoPtr pInfo = device - > public . devicePrivate ;
if ( pEvdev - > flags & EVDEV_RELATIVE_EVENTS & &
EvdevAddRelClass ( device ) = = Success )
EvdevAddRelValuator Class ( device ) = = Success )
xf86IDrvMsg ( pInfo , X_INFO , " initialized for relative axes. \n " ) ;
if ( pEvdev - > flags & EVDEV_ABSOLUTE_EVENTS & &
EvdevAddAbsClass ( device ) = = Success )
EvdevAddAbsValuator Class ( device ) = = Success )
xf86IDrvMsg ( pInfo , X_INFO , " initialized for absolute axes. \n " ) ;
}
static void
EvdevInitAbsClas s ( DeviceIntPtr device , EvdevPtr pEvdev )
EvdevInitAbsValuator s ( DeviceIntPtr device , EvdevPtr pEvdev )
{
InputInfoPtr pInfo = device - > public . devicePrivate ;
if ( EvdevAddAbsClass ( device ) = = Success ) {
if ( EvdevAddAbsValuator Class ( device ) = = Success ) {
xf86IDrvMsg ( pInfo , X_INFO , " initialized for absolute axes. \n " ) ;
} else {
xf86IDrvMsg ( pInfo , X_ERROR , " failed to initialize for absolute axes. \n " ) ;
@ -1260,12 +1260,12 @@ EvdevInitAbsClass(DeviceIntPtr device, EvdevPtr pEvdev)
}
static void
EvdevInitRelClas s ( DeviceIntPtr device , EvdevPtr pEvdev )
EvdevInitRelValuator s ( DeviceIntPtr device , EvdevPtr pEvdev )
{
InputInfoPtr pInfo = device - > public . devicePrivate ;
int has_abs_axes = pEvdev - > flags & EVDEV_ABSOLUTE_EVENTS ;
if ( EvdevAddRelClass ( device ) = = Success ) {
if ( EvdevAddRelValuator Class ( device ) = = Success ) {
xf86IDrvMsg ( pInfo , X_INFO , " initialized for relative axes. \n " ) ;
@ -1280,7 +1280,7 @@ EvdevInitRelClass(DeviceIntPtr device, EvdevPtr pEvdev)
pEvdev - > flags & = ~ EVDEV_RELATIVE_EVENTS ;
if ( has_abs_axes )
EvdevInitAbsClas s ( device , pEvdev ) ;
EvdevInitAbsValuator s ( device , pEvdev ) ;
}
}
@ -1295,7 +1295,7 @@ EvdevInitTouchDevice(DeviceIntPtr device, EvdevPtr pEvdev)
pEvdev - > flags & = ~ EVDEV_RELATIVE_EVENTS ;
}
EvdevInitAbsClas s ( device , pEvdev ) ;
EvdevInitAbsValuator s ( device , pEvdev ) ;
}
static int
@ -1332,13 +1332,13 @@ EvdevInit(DeviceIntPtr device)
*/
if ( pEvdev - > flags & ( EVDEV_UNIGNORE_RELATIVE | EVDEV_UNIGNORE_ABSOLUTE ) )
EvdevInitAnyClas s ( device , pEvdev ) ;
EvdevInitAnyValuator s ( device , pEvdev ) ;
else if ( pEvdev - > flags & ( EVDEV_TOUCHPAD | EVDEV_TOUCHSCREEN | EVDEV_TABLET ) )
EvdevInitTouchDevice ( device , pEvdev ) ;
else if ( pEvdev - > flags & EVDEV_RELATIVE_EVENTS )
EvdevInitRelClas s ( device , pEvdev ) ;
EvdevInitRelValuator s ( device , pEvdev ) ;
else if ( pEvdev - > flags & EVDEV_ABSOLUTE_EVENTS )
EvdevInitAbsClas s ( device , pEvdev ) ;
EvdevInitAbsValuator s ( device , pEvdev ) ;
/* We drop the return value, the only time we ever want the handlers to
* unregister is when the device dies . In which case we don ' t have to