From 5e8efe122ee1008dc0da61d8d9e52db64bf558ba Mon Sep 17 00:00:00 2001 From: Ivan Afonichev Date: Mon, 19 Oct 2009 17:36:56 +0400 Subject: [PATCH] Signed-off-by: Ivan Afonichev Added support for GeneralTouch serial touchscreens --- src/xf86Elo.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/xf86Elo.c b/src/xf86Elo.c index ad88621..afc9604 100644 --- a/src/xf86Elo.c +++ b/src/xf86Elo.c @@ -904,8 +904,8 @@ xf86EloControl(DeviceIntPtr dev, xf86EloPrintIdent(reply, priv); } else { - ErrorF("Unable to ask Elographics touchscreen identification\n"); - goto not_success; + DBG(2, ErrorF("Unable to ask Elographics touchscreen identification... Maybe it's GeneralTouch touchscreen...\n")); +// goto not_success; } /* @@ -917,8 +917,8 @@ xf86EloControl(DeviceIntPtr dev, req[3] = ELO_TOUCH_MODE | ELO_STREAM_MODE | ELO_UNTOUCH_MODE; req[4] = ELO_TRACKING_MODE; if (xf86EloSendControl(req, local->fd) != Success) { - ErrorF("Unable to change Elographics touchscreen operating mode\n"); - goto not_success; + DBG(2, ErrorF("Unable to change Elographics touchscreen operating mode... Maybe it's GeneralTouch touchscreen...\n")); +// goto not_success; } /* @@ -929,12 +929,13 @@ xf86EloControl(DeviceIntPtr dev, req[2] = priv->untouch_delay; req[3] = priv->report_delay; if (xf86EloSendControl(req, local->fd) != Success) { - ErrorF("Unable to change Elographics touchscreen reports timings\n"); - + DBG(2, ErrorF("Unable to change Elographics touchscreen reports timings... Maybe it's GeneralTouch touchscreen...\n")); +/* not_success: SYSCALL(close(local->fd)); local->fd = -1; return !Success; +*/ } } xf86AddEnabledDevice(local); -- 1.6.2.5