tslib: Sync major cleanup I made in OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@898 311d38ba-8fff-0310-9ca6-ca027cbcb966

33 files changed, 120 insertions, 113 deletions

diff --git a/meta/packages/tslib/tslib/a780/tslib.sh b/meta/packages/tslib/tslib/a780/tslib.sh
new file mode 100644
index 0000000000..51cd0f1f36
--- /dev/null
+++ b/meta/packages/tslib/tslib/a780/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/event1
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/akita/tslib.sh b/meta/packages/tslib/tslib/akita/tslib.sh
index 0c8b1a12b9..0ff219b31f 100644
--- a/meta/packages/tslib/tslib/akita/tslib.sh
+++ b/meta/packages/tslib/tslib/akita/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/ts
-        TSLIB_TSEVENTTYPE=CORGI
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=/dev/input/touchscreen0
-        TSLIB_TSEVENTTYPE=INPUT
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/c7x0/tslib.sh b/meta/packages/tslib/tslib/c7x0/tslib.sh
index 0c8b1a12b9..0ff219b31f 100644
--- a/meta/packages/tslib/tslib/c7x0/tslib.sh
+++ b/meta/packages/tslib/tslib/c7x0/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/ts
-        TSLIB_TSEVENTTYPE=CORGI
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=/dev/input/touchscreen0
-        TSLIB_TSEVENTTYPE=INPUT
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/collie/tslib.sh b/meta/packages/tslib/tslib/collie/tslib.sh
index 759d5cf091..664bda426a 100644
--- a/meta/packages/tslib/tslib/collie/tslib.sh
+++ b/meta/packages/tslib/tslib/collie/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/ts
-        TSLIB_TSEVENTTYPE=COLLIE
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=/dev/input/touchscreen0
-        TSLIB_TSEVENTTYPE=INPUT
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/e680/tslib.sh b/meta/packages/tslib/tslib/e680/tslib.sh
new file mode 100644
index 0000000000..51cd0f1f36
--- /dev/null
+++ b/meta/packages/tslib/tslib/e680/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/event1
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/h1940/tslib.sh b/meta/packages/tslib/tslib/h1940/tslib.sh
index d83673e259..7dbf4ae9f1 100644
--- a/meta/packages/tslib/tslib/h1940/tslib.sh
+++ b/meta/packages/tslib/tslib/h1940/tslib.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+TSLIB_CONFFILE=/etc/ts.conf
 QWS_MOUSE_PROTO=TPanel
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/meta/packages/tslib/tslib/h2200/tslib.sh b/meta/packages/tslib/tslib/h2200/tslib.sh
new file mode 100644
index 0000000000..b096bfb96e
--- /dev/null
+++ b/meta/packages/tslib/tslib/h2200/tslib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+case `uname -r` in
+2.4*)
+        TSLIB_TSDEVICE=/dev/touchscreen/0raw
+        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+        ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/meta/packages/tslib/tslib/h3600/tslib.sh b/meta/packages/tslib/tslib/h3600/tslib.sh
index 3c27b075f7..6c480f46af 100644
--- a/meta/packages/tslib/tslib/h3600/tslib.sh
+++ b/meta/packages/tslib/tslib/h3600/tslib.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/touchscreen/0raw
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=`detect-stylus --device`
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/h3900/tslib.sh b/meta/packages/tslib/tslib/h3900/tslib.sh
index 0de3534a51..6c480f46af 100644
--- a/meta/packages/tslib/tslib/h3900/tslib.sh
+++ b/meta/packages/tslib/tslib/h3900/tslib.sh
@@ -1,18 +1,13 @@
 #!/bin/sh
 
-module_id() {
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/etc/ts.conf
 
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/touchscreen/0raw
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=`detect-stylus --device`
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/h4000/tslib.sh b/meta/packages/tslib/tslib/h4000/tslib.sh
new file mode 100644
index 0000000000..6c480f46af
--- /dev/null
+++ b/meta/packages/tslib/tslib/h4000/tslib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/etc/ts.conf
+
+case `uname -r` in
+2.4*)
+        TSLIB_TSDEVICE=/dev/touchscreen/0raw
+        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+        ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/meta/packages/tslib/tslib/h5xxx/tslib.sh b/meta/packages/tslib/tslib/h5xxx/tslib.sh
new file mode 100644
index 0000000000..b096bfb96e
--- /dev/null
+++ b/meta/packages/tslib/tslib/h5xxx/tslib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+case `uname -r` in
+2.4*)
+        TSLIB_TSDEVICE=/dev/touchscreen/0raw
+        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+        ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/meta/packages/tslib/tslib/h6300/tslib.sh b/meta/packages/tslib/tslib/h6300/tslib.sh
index 548bc918ff..b3318fd820 100644
--- a/meta/packages/tslib/tslib/h6300/tslib.sh
+++ b/meta/packages/tslib/tslib/h6300/tslib.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+TSLIB_CONFFILE=/etc/ts.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
 
diff --git a/meta/packages/tslib/tslib/nokia770/ts.conf b/meta/packages/tslib/tslib/htcuniversal/ts.conf
index 09309719f2..09309719f2 100644
--- a/meta/packages/tslib/tslib/nokia770/ts.conf
+++ b/meta/packages/tslib/tslib/htcuniversal/ts.conf
diff --git a/meta/packages/tslib/tslib/htcuniversal/tslib.sh b/meta/packages/tslib/tslib/htcuniversal/tslib.sh
new file mode 100644
index 0000000000..cc7e6b724a
--- /dev/null
+++ b/meta/packages/tslib/tslib/htcuniversal/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/hx2000/tslib.sh b/meta/packages/tslib/tslib/hx2000/tslib.sh
new file mode 100644
index 0000000000..586d5c7deb
--- /dev/null
+++ b/meta/packages/tslib/tslib/hx2000/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/hx4700/tslib.sh b/meta/packages/tslib/tslib/hx4700/tslib.sh
new file mode 100644
index 0000000000..586d5c7deb
--- /dev/null
+++ b/meta/packages/tslib/tslib/hx4700/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
index 3a6ba78c50..586d5c7deb 100644
--- a/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+TSLIB_CONFFILE=/etc/ts.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/jornada56x/tslib.sh b/meta/packages/tslib/tslib/jornada56x/tslib.sh
index a93d2d3ef0..8f907b0755 100644
--- a/meta/packages/tslib/tslib/jornada56x/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada56x/tslib.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/tsraw0
-TSLIB_TSEVENTTYPE=H3600
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/jornada6xx/tslib.sh b/meta/packages/tslib/tslib/jornada6xx/tslib.sh
index e64f644b74..1b5db781c1 100644
--- a/meta/packages/tslib/tslib/jornada6xx/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada6xx/tslib.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/ts0
-TSLIB_TSEVENTTYPE=H3600
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/jornada7xx/tslib.sh b/meta/packages/tslib/tslib/jornada7xx/tslib.sh
index a93d2d3ef0..1b5db781c1 100644
--- a/meta/packages/tslib/tslib/jornada7xx/tslib.sh
+++ b/meta/packages/tslib/tslib/jornada7xx/tslib.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=/dev/input/tsraw0
-TSLIB_TSEVENTTYPE=H3600
+TSLIB_TSDEVICE=/dev/input/ts0
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/netbook-pro/ts.conf b/meta/packages/tslib/tslib/netbook-pro/ts.conf
new file mode 100644
index 0000000000..6d94a8f468
--- /dev/null
+++ b/meta/packages/tslib/tslib/netbook-pro/ts.conf
@@ -0,0 +1,5 @@
+module_raw input
+module variance delta=80
+#module dejitter delta=2
+module linear
+
diff --git a/meta/packages/tslib/tslib/netbook-pro/tslib.sh b/meta/packages/tslib/tslib/netbook-pro/tslib.sh
new file mode 100644
index 0000000000..d31bc76368
--- /dev/null
+++ b/meta/packages/tslib/tslib/netbook-pro/tslib.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+
+export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/nokia770/tslib.sh b/meta/packages/tslib/tslib/nokia770/tslib.sh
index bcfe94a6b8..b7acc274c0 100644
--- a/meta/packages/tslib/tslib/nokia770/tslib.sh
+++ b/meta/packages/tslib/tslib/nokia770/tslib.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_TSEVENTTYPE=INPUT
-TSLIB_CONFFILE=/etc/ts.conf
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/omap1610h2/ts.conf b/meta/packages/tslib/tslib/omap1610h2/ts.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/meta/packages/tslib/tslib/omap1610h2/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/meta/packages/tslib/tslib/omap5912osk/ts.conf b/meta/packages/tslib/tslib/omap5912osk/ts.conf
deleted file mode 100644
index dc377cf86e..0000000000
--- a/meta/packages/tslib/tslib/omap5912osk/ts.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-module_raw input
-
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/meta/packages/tslib/tslib/poodle/tslib.sh b/meta/packages/tslib/tslib/poodle/tslib.sh
index 759d5cf091..664bda426a 100644
--- a/meta/packages/tslib/tslib/poodle/tslib.sh
+++ b/meta/packages/tslib/tslib/poodle/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/ts
-        TSLIB_TSEVENTTYPE=COLLIE
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=/dev/input/touchscreen0
-        TSLIB_TSEVENTTYPE=INPUT
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/qemuarm/ts.conf b/meta/packages/tslib/tslib/qemuarm/ts.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/meta/packages/tslib/tslib/qemuarm/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/meta/packages/tslib/tslib/qemuarm/tslib.sh b/meta/packages/tslib/tslib/qemuarm/tslib.sh
index 0bc0d454e7..b7acc274c0 100644
--- a/meta/packages/tslib/tslib/qemuarm/tslib.sh
+++ b/meta/packages/tslib/tslib/qemuarm/tslib.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_TSEVENTTYPE=INPUT
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
+export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/simpad/tslib.sh b/meta/packages/tslib/tslib/simpad/tslib.sh
index 39b1c4ba58..9c4eb1e0f9 100644
--- a/meta/packages/tslib/tslib/simpad/tslib.sh
+++ b/meta/packages/tslib/tslib/simpad/tslib.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=/dev/input/touchscreen0
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/tosa/tslib.sh b/meta/packages/tslib/tslib/tosa/tslib.sh
index 0c8b1a12b9..0ff219b31f 100644
--- a/meta/packages/tslib/tslib/tosa/tslib.sh
+++ b/meta/packages/tslib/tslib/tosa/tslib.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+TSLIB_CONFFILE=/etc/ts.conf
+
 case `uname -r` in
 2.4*)
         TSLIB_TSDEVICE=/dev/ts
-        TSLIB_TSEVENTTYPE=CORGI
         TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
         ;;
-*)
-        TSLIB_TSDEVICE=/dev/input/touchscreen0
-        TSLIB_TSEVENTTYPE=INPUT
-        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
-        ;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/ts-2.6.conf b/meta/packages/tslib/tslib/ts-2.6.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/meta/packages/tslib/tslib/ts-2.6.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/meta/packages/tslib/tslib/ts.conf b/meta/packages/tslib/tslib/ts.conf
index dc5c4ded09..1b0da937e8 100644
--- a/meta/packages/tslib/tslib/ts.conf
+++ b/meta/packages/tslib/tslib/ts.conf
@@ -1,5 +1,5 @@
 # Uncomment if you wish to use the linux input layer event interface
-# module_raw input
+module_raw input
 
 # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
 # module_raw collie
diff --git a/meta/packages/tslib/tslib/usec_fix.patch b/meta/packages/tslib/tslib/usec_fix.patch
deleted file mode 100644
index a791b39a3c..0000000000
--- a/meta/packages/tslib/tslib/usec_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/collie-raw.c
-===================================================================
---- tslib.orig/plugins/collie-raw.c     2005-12-04 10:09:33.000000000 +0100
-+++ tslib/plugins/collie-raw.c  2005-12-04 10:16:05.000000000 +0100
-@@ -29,7 +29,7 @@
- #ifdef DEBUG
-         fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
- #endif /*DEBUG*/
--                       samp->tv.tv_usec = collie_evt->millisecs % 1000;
-+                       samp->tv.tv_usec = (collie_evt->millisecs % 1000) * 1000;
-                        samp->tv.tv_sec = collie_evt->millisecs / 1000;
-                        samp++;
-                        collie_evt++;
-Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/corgi-raw.c
-===================================================================
---- tslib.orig/plugins/corgi-raw.c      2005-12-04 10:10:19.000000000 +0100
-+++ tslib/plugins/corgi-raw.c   2005-12-04 10:16:15.000000000 +0100
-@@ -29,7 +29,7 @@
- #ifdef DEBUG
-         fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
- #endif /*DEBUG*/
--                       samp->tv.tv_usec = corgi_evt->millisecs % 1000;
-+                       samp->tv.tv_usec = (corgi_evt->millisecs % 1000) * 1000;
-                        samp->tv.tv_sec = corgi_evt->millisecs / 1000;
-                        samp++;
-                        corgi_evt++;