Complete mtdev property mapping

Add the missing property values to the mapgen output, and insert the
result in the mtdev mapping header file.

Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>

2 files changed, 12 insertions, 6 deletions

diff --git a/include/mtdev-mapping.h b/include/mtdev-mapping.h
index 039a2d5..cb4c326 100644
--- a/include/mtdev-mapping.h
+++ b/include/mtdev-mapping.h
@@ -33,14 +33,17 @@
 
 #include <mtdev.h>
 
-#define MTDEV_TRACKING_ID       9
-#define MTDEV_POSITION_X        5
-#define MTDEV_POSITION_Y        6
 #define MTDEV_TOUCH_MAJOR       0
 #define MTDEV_TOUCH_MINOR       1
 #define MTDEV_WIDTH_MAJOR       2
 #define MTDEV_WIDTH_MINOR       3
 #define MTDEV_ORIENTATION       4
+#define MTDEV_POSITION_X        5
+#define MTDEV_POSITION_Y        6
+#define MTDEV_TOOL_TYPE         7
+#define MTDEV_BLOB_ID           8
+#define MTDEV_TRACKING_ID       9
+#define MTDEV_PRESSURE          10
 
 static const unsigned int mtdev_map_abs2mt[ABS_CNT] = {
  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/test/mtdev-mapgen.c b/test/mtdev-mapgen.c
index 0200175..8f70998 100644
--- a/test/mtdev-mapgen.c
+++ b/test/mtdev-mapgen.c
@@ -63,14 +63,17 @@ int main(int argc, char *argv[])
         for (i = 0; i < MT_ABS_SIZE; i++)
                 printf(" 0x%04x,%s", cmt2abs[i], newln(i, MT_ABS_SIZE));
         printf("};\n\n");
-        BIT_DEF(TRACKING_ID);
-        BIT_DEF(POSITION_X);
-        BIT_DEF(POSITION_Y);
         BIT_DEF(TOUCH_MAJOR);
         BIT_DEF(TOUCH_MINOR);
         BIT_DEF(WIDTH_MAJOR);
         BIT_DEF(WIDTH_MINOR);
         BIT_DEF(ORIENTATION);
+        BIT_DEF(POSITION_X);
+        BIT_DEF(POSITION_Y);
+        BIT_DEF(TOOL_TYPE);
+        BIT_DEF(BLOB_ID);
+        BIT_DEF(TRACKING_ID);
+        BIT_DEF(PRESSURE);
         printf("\n");
         return 0;
 }