Both aren't called by the server.
Signed-off-by: Peter Hutterer <[email protected]>
---
src/xf86PM.c | 46 ----------------------------------------------
src/xf86PM.h | 2 --
2 files changed, 0 insertions(+), 48 deletions(-)
diff --git a/src/xf86PM.c b/src/xf86PM.c
index a45e67d..673618a 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -443,9 +443,7 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->device_control = DeviceControl;
pInfo->read_input = ReadInput;
pInfo->control_proc = ControlProc;
- pInfo->close_proc = CloseProc;
pInfo->switch_mode = SwitchMode;
- pInfo->conversion_proc = ConvertProc;
pInfo->dev = NULL;
pInfo->private = priv;
pInfo->private_flags = 0;
@@ -871,15 +869,6 @@ ControlProc (InputInfoPtr pInfo, xDeviceCtl * control)
}
/*
- * the CloseProc should not need to be tailored to your device
- */
-static void
-CloseProc (InputInfoPtr pInfo)
-{
-
-}
-
-/*
* The SwitchMode function may need to be tailored for your device
*/
static int
@@ -899,41 +888,6 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode)
}
/*
- * The ConvertProc function may need to be tailored for your device.
- * This function converts the device's valuator outputs to x and y coordinates
- * to simulate mouse events.
- */
-static Bool
-ConvertProc (InputInfoPtr pInfo,
- int first,
- int num,
- int v0,
- int v1,
- int v2,
- int v3,
- int v4,
- int v5,
- int *x,
- int *y)
-{
- PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private);
-
- if (priv->reporting_mode == TS_Raw)
- {
- *x = xf86ScaleAxis (v0, 0, priv->screen_width, priv->min_x,
- priv->max_x);
- *y = xf86ScaleAxis (v1, 0, priv->screen_height, priv->min_y,
- priv->max_y);
- }
- else
- {
- *x = v0;
- *y = v1;
- }
- return (TRUE);
-}
-
-/*
* the QueryHardware fuction should be tailored to your device to
* verify the device is attached and functional and perform any
* needed initialization.
diff --git a/src/xf86PM.h b/src/xf86PM.h
index a62903f..ee1bf47 100644
--- a/src/xf86PM.h
+++ b/src/xf86PM.h
@@ -85,9 +85,7 @@ static Bool DeviceControl (DeviceIntPtr, int);
static void ReadInput (InputInfoPtr);
static void DMC9000_ReadInput (InputInfoPtr);
static int ControlProc (InputInfoPtr, xDeviceCtl *);
-static void CloseProc (InputInfoPtr);
static int SwitchMode (ClientPtr, DeviceIntPtr, int);
-static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int,
int *, int *);
static Bool QueryHardware (PenMountPrivatePtr);
static Bool PenMountGetPacket (PenMountPrivatePtr priv);
static Bool DMC9000_PenMountGetPacket (PenMountPrivatePtr priv);
--
1.7.3.2
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
