aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2010-04-10 23:11:59 +0200
committerHenrik Rydberg <rydberg@euromail.se>2010-04-15 06:10:07 +0200
commit223ba8b1b753e12a4826bacab282ab8dc7ba8689 (patch)
tree4e169a4c36b24fee41fe2f20a6039aa88e82e15f
parent2cf55b491c571d49b0ce22549c08f47ffc451a69 (diff)
downloadxorg-input-kobomultitouch-223ba8b1b753e12a4826bacab282ab8dc7ba8689.tar.gz
xorg-input-kobomultitouch-223ba8b1b753e12a4826bacab282ab8dc7ba8689.tar.bz2
xorg-input-kobomultitouch-223ba8b1b753e12a4826bacab282ab8dc7ba8689.zip
Introduce Memory
Add the Memory structure to hold the multitouch parsing state. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--Makefile1
-rw-r--r--src/memory.c26
-rw-r--r--src/memory.h32
-rw-r--r--src/mtouch.c1
-rw-r--r--src/mtouch.h2
5 files changed, 62 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a00d246..08eb385 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ o_src = capabilities \
hwdata \
hwstate \
mtstate \
+ memory \
mtouch \
gestures \
multitouch
diff --git a/src/memory.c b/src/memory.c
new file mode 100644
index 0000000..6b502d8
--- /dev/null
+++ b/src/memory.c
@@ -0,0 +1,26 @@
+/***************************************************************************
+ *
+ * Multitouch X driver
+ * Copyright (C) 2008 Henrik Rydberg <rydberg@euromail.se>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ **************************************************************************/
+
+#include "memory.h"
+
+void init_memory(struct Memory *mem)
+{
+}
diff --git a/src/memory.h b/src/memory.h
new file mode 100644
index 0000000..46dd312
--- /dev/null
+++ b/src/memory.h
@@ -0,0 +1,32 @@
+/***************************************************************************
+ *
+ * Multitouch X driver
+ * Copyright (C) 2008 Henrik Rydberg <rydberg@euromail.se>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ **************************************************************************/
+
+#ifndef MEMORY_H
+#define MEMORY_H
+
+#include "mtstate.h"
+
+struct Memory {
+};
+
+void init_memory(struct Memory *mem);
+
+#endif
diff --git a/src/mtouch.c b/src/mtouch.c
index f5acd71..44b4376 100644
--- a/src/mtouch.c
+++ b/src/mtouch.c
@@ -38,6 +38,7 @@ int open_mtouch(struct MTouch *mt, int fd)
init_hwstate(&mt->hs);
init_mtstate(&mt->prev_state);
init_mtstate(&mt->state);
+ init_memory(&mt->mem);
SYSCALL(rc = ioctl(fd, EVIOCGRAB, (pointer)1));
return rc;
}
diff --git a/src/mtouch.h b/src/mtouch.h
index 28a637b..4004b4d 100644
--- a/src/mtouch.h
+++ b/src/mtouch.h
@@ -27,6 +27,7 @@
#include "hwdata.h"
#include "hwstate.h"
#include "mtstate.h"
+#include "memory.h"
struct MTouch {
struct Capabilities caps;
@@ -34,6 +35,7 @@ struct MTouch {
struct HWData hw;
struct HWState hs;
struct MTState prev_state, state;
+ struct Memory mem;
};
int configure_mtouch(struct MTouch *mt, int fd);