diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2010-06-16 02:27:32 +0200 |
---|---|---|
committer | Henrik Rydberg <rydberg@euromail.se> | 2010-06-16 02:27:32 +0200 |
commit | ff88de5cd38b5b51bad0e63d373d66745f1f8d31 (patch) | |
tree | 3fbf4adc8c807bc79a8272c4df1623c3677a9b2f /include/hwdata.h | |
parent | ad6faf6c53bc1924986e1cc10bb42e5d157cba8f (diff) | |
download | xorg-input-kobomultitouch-ff88de5cd38b5b51bad0e63d373d66745f1f8d31.tar.gz xorg-input-kobomultitouch-ff88de5cd38b5b51bad0e63d373d66745f1f8d31.tar.bz2 xorg-input-kobomultitouch-ff88de5cd38b5b51bad0e63d373d66745f1f8d31.zip |
refactor: Move files
Move all headers into include, separate source files into modules
match, mtdev, src and driver, move some common definitions to
common.h, and include define support for the MT slot protocol.
This patch does not introduce any logical changes.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'include/hwdata.h')
-rw-r--r-- | include/hwdata.h | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/include/hwdata.h b/include/hwdata.h new file mode 100644 index 0000000..21864dc --- /dev/null +++ b/include/hwdata.h @@ -0,0 +1,75 @@ +/*************************************************************************** + * + * 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 HWDATA_H +#define HWDATA_H + +#include "common.h" +#include "button.h" + +#define BIT_MT_TOUCH_MAJOR 0 +#define BIT_MT_TOUCH_MINOR 1 +#define BIT_MT_WIDTH_MAJOR 2 +#define BIT_MT_WIDTH_MINOR 3 +#define BIT_MT_ORIENTATION 4 +#define BIT_MT_PRESSURE 5 +#define BIT_MT_POSITION_X 6 +#define BIT_MT_POSITION_Y 7 +#define BIT_MT_CNT 8 + +struct FingerData { + int touch_major, touch_minor; + int width_major, width_minor; + int orientation, pressure; + int position_x, position_y; +}; + +/** + * struct HWData - hardware reads + * + * @finger: finger data + * @mask: bits corresponding to data actually read (readonly) + * @mread: bits corresponding to data in progress (writeonly) + * @button: bitmask of buttons + * @nfinger: number of fingers actually read (readonly) + * @nread: number of fingers in progress (writeonly) + * + */ +struct HWData { + struct FingerData finger[DIM_FINGER]; + unsigned mask[DIM_FINGER], mread[DIM_FINGER]; + unsigned button; + int nfinger, mtread, nread; + mstime_t evtime; +}; + +void init_hwdata(struct HWData *hw); +int read_hwdata(struct HWData *hw, const struct input_event* ev); +void output_hwdata(const struct HWData *hw); + +static inline int finger_dist2(const struct FingerData *a, + const struct FingerData *b) +{ + return dist2(a->position_x - b->position_x, + a->position_y - b->position_y); +} + +#endif |