From: Jan Steffens <jan.steff...@gmail.com>

If the BaudRate option isn't set, X will use the default, which issues2
9600. Make sure we properly set this option.

Also make sure the it is set properly before we try to query the tablet.

Signed-off-by: Jan Steffens <jan.steff...@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
 src/wcmISDV4.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c
index d65a533..682c1ff 100644
--- a/src/wcmISDV4.c
+++ b/src/wcmISDV4.c
@@ -212,6 +212,8 @@ static Bool isdv4ParseOptions(LocalDevicePtr local)
        {
                case 38400:
                case 19200:
+                       /* xf86OpenSerial() takes the baud rate from the 
options */
+                       xf86ReplaceIntOption(local->options, "BaudRate", baud);
                        break;
                default:
                        xf86Msg(X_ERROR, "%s: Illegal speed value "
@@ -335,6 +337,10 @@ static int isdv4GetRanges(LocalDevicePtr local)
        if (isdv4data->initialized++)
                return ret;
 
+       /* Initial baudrate is 38400 */
+       if (xf86SetSerialSpeed(local->fd, isdv4data->baudrate) < 0)
+               return !Success;
+
        /* Send query command to the tablet */
        ret = isdv4Query(local, ISDV4_QUERY, data);
        if (ret != Success && isdv4data->baudrate != 19200)
-- 
1.7.1


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to