Drop close_proc, conversion_proc, reverse_conversion_proc

All three are not called by the server anymore.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>                                                                                                                                                                 

1 files changed, 0 insertions, 70 deletions

diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 7b5e5e2..527ad1c 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -303,73 +303,6 @@ xf86EloGetPacket(unsigned char	*buffer,
   }
 }
 
-/*
- ***************************************************************************
- *
- * xf86EloConvert --
- *	Convert extended valuators to x and y suitable for core motion
- *	events. Return True if ok and False if the requested conversion
- *	can't be done for the specified valuators.
- *
- ***************************************************************************
- */
-static Bool
-xf86EloConvert(InputInfoPtr	pInfo,
-	       int		first,
-	       int		num,
-	       int		v0,
-	       int		v1,
-	       int		v2,
-	       int		v3,
-	       int		v4,
-	       int		v5,
-	       int		*x,
-	       int		*y)
-{
-  EloPrivatePtr	priv = (EloPrivatePtr) pInfo->private;
-  int		width = priv->max_x - priv->min_x;
-  int		height = priv->max_y - priv->min_y;
-  int		input_x, input_y;
-
-  if (first != 0 || num != 2) {
-    return FALSE;
-  }
-
-  DBG(3, ErrorF("EloConvert: Screen(%d) - v0(%d), v1(%d)\n", priv->screen_no, v0, v1));
-
-  if (width == 0) width = 1;
-  if (height == 0) height = 1;
-
-  if (priv->swap_axes) {
-    input_x = v1;
-    input_y = v0;
-  }
-  else {
-    input_x = v0;
-    input_y = v1;
-  }
-  *x = (priv->screen_width * (input_x - priv->min_x)) / width;
-  *y = (priv->screen_height -
-	(priv->screen_height * (input_y - priv->min_y)) / height);
-
-  /*
-   * MHALAS: Based on the description in xf86XInputSetScreen
-   * this code must be called from ReadInput BEFORE any events
-   * are posted but this method is called FROM xf86PostMotionEvent
-   * Therefore I have moved this method into xf86EloReadInput
-   */
-  /*
-   * Need to check if still on the correct screen.
-   * This call is here so that this work can be done after
-   * calib and before posting the event.
-   */
-/*  xf86XInputSetScreen(pInfo, priv->screen_no, *x, *y); */
-
-  DBG(3, ErrorF("EloConvert: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, *x, *y));
-
-  return TRUE;
-}
-
 
 /*
  ***************************************************************************
@@ -964,10 +897,7 @@ xf86EloAllocate(InputDriverPtr	drv, IDevPtr dev)
   pInfo->device_control = xf86EloControl;
   pInfo->read_input   = xf86EloReadInput;
   pInfo->control_proc = NULL;
-  pInfo->close_proc   = NULL;
   pInfo->switch_mode  = NULL;
-  pInfo->conversion_proc = xf86EloConvert;
-  pInfo->reverse_conversion_proc = NULL;
   pInfo->fd	      = -1;
   pInfo->atom	      = 0;
   pInfo->dev	      = NULL;