From 1c73d171b2814bf2809aa48c2d4b683a064a4f7e Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Tue, 15 Jun 2010 21:05:52 +0200 Subject: refactor: Introduce mtdev With the addition of the kernel MT slots, the MT event protocol is capable of efficiently propagating changes to a set of tracked contacts. At the same time, the need to treat a variety of different kernel drivers is increased. This patch introduces the mtdev, an abstract MT device which converts all valid MT event formats into a uniform, slotted type B event stream. A command-line test program is included. Signed-off-by: Henrik Rydberg --- include/mtdev-evbuf.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/mtdev.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 include/mtdev-evbuf.h create mode 100644 include/mtdev.h (limited to 'include') diff --git a/include/mtdev-evbuf.h b/include/mtdev-evbuf.h new file mode 100644 index 0000000..6a63d6d --- /dev/null +++ b/include/mtdev-evbuf.h @@ -0,0 +1,57 @@ +/*************************************************************************** + * + * Multitouch X driver + * Copyright (C) 2008 Henrik Rydberg + * + * 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 MTDEV_EVBUF_H +#define MTDEV_EVBUF_H + +#include "common.h" + +struct EventBuffer { + int head; + int tail; + struct input_event buffer[DIM_EVENTS]; +}; + +static inline void evbuf_init(struct EventBuffer *evbuf) +{ + memset(evbuf, 0, sizeof(*evbuf)); +} + +static inline int evbuf_empty(const struct EventBuffer *evbuf) +{ + return evbuf->head == evbuf->tail; +} + +static inline void evbuf_push(struct EventBuffer *evbuf, + const struct input_event *ev) +{ + evbuf->buffer[evbuf->head++] = *ev; + evbuf->head &= DIM_EVENTS - 1; +} + +static inline void evbuf_pop(struct EventBuffer *evbuf, + struct input_event *ev) +{ + *ev = evbuf->buffer[evbuf->tail++]; + evbuf->tail &= DIM_EVENTS - 1; +} + +#endif diff --git a/include/mtdev.h b/include/mtdev.h new file mode 100644 index 0000000..ab2d044 --- /dev/null +++ b/include/mtdev.h @@ -0,0 +1,57 @@ +/*************************************************************************** + * + * Multitouch X driver + * Copyright (C) 2008 Henrik Rydberg + * + * 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 MTDEV_H +#define MTDEV_H + +#include "mtdev-caps.h" +#include "mtdev-evbuf.h" + +/** + * struct MTDev - represents an input MT device + * @inbuf: input event buffer + * @outbuf: output event buffer + * @priv: structure of private data + */ +struct MTDev { + struct EventBuffer inbuf; + struct EventBuffer outbuf; + struct MTDevState *priv; +}; + +int mtdev_init(struct MTDev *mtdev, const struct Capabilities *caps); + +static inline int mtdev_empty(struct MTDev *mtdev) +{ + return evbuf_empty(&mtdev->outbuf); +} + +void mtdev_push(struct MTDev *dev, const struct Capabilities *caps, + const struct input_event *ev); + +static inline void mtdev_pop(struct MTDev *mtdev, struct input_event* ev) +{ + evbuf_pop(&mtdev->outbuf, ev); +} + +void mtdev_destroy(struct MTDev *mtdev); + +#endif -- cgit v1.2.3