summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-05-30 12:38:35 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-05-30 12:38:35 +0000
commit8cd143bfc5594e4f796a079de6d1c47b6281925e (patch)
tree4f15653ea5a80b876a8bf02d88e7debb02fbb958 /sys/dev
parentf9c554d6ecb0f6d522980d606641b3d88eb0522a (diff)
Do not forward declare an enum, makes gcc3 happy.
From miod@, ok bru@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/wscons/wsmousevar.h54
1 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/wscons/wsmousevar.h b/sys/dev/wscons/wsmousevar.h
index 3c5a5a8176d..ee15d82ed0c 100644
--- a/sys/dev/wscons/wsmousevar.h
+++ b/sys/dev/wscons/wsmousevar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmousevar.h,v 1.9 2016/03/30 23:34:12 bru Exp $ */
+/* $OpenBSD: wsmousevar.h,v 1.10 2016/05/30 12:38:34 mpi Exp $ */
/* $NetBSD: wsmousevar.h,v 1.4 2000/01/08 02:57:24 takemura Exp $ */
/*
@@ -126,9 +126,34 @@ void wsmouse_input(struct device *kbddev, u_int btns,
struct device;
-enum wsmouseval;
struct mtpoint;
+/*
+ * Type codes for wsmouse_set. REL_X/Y, MT_REL_X/Y, and TOUCH_WIDTH
+ * cannot be reported by other functions. Please note that REL_X/Y
+ * values are deltas to be applied to the absolute coordinates and
+ * don't represent "pure" relative motion.
+ */
+enum wsmouseval {
+ WSMOUSE_REL_X,
+ WSMOUSE_ABS_X,
+ WSMOUSE_REL_Y,
+ WSMOUSE_ABS_Y,
+ WSMOUSE_PRESSURE,
+ WSMOUSE_CONTACTS,
+ WSMOUSE_TOUCH_WIDTH,
+ WSMOUSE_MT_REL_X,
+ WSMOUSE_MT_ABS_X,
+ WSMOUSE_MT_REL_Y,
+ WSMOUSE_MT_ABS_Y,
+ WSMOUSE_MT_PRESSURE
+};
+
+#define WSMOUSE_IS_MT_CODE(code) \
+ ((code) >= WSMOUSE_MT_REL_X && (code) <= WSMOUSE_MT_PRESSURE)
+
+
+
/* Report button state. */
void wsmouse_buttons(struct device *, u_int);
@@ -169,31 +194,6 @@ void wsmouse_set_param(struct device *, size_t, int);
int wsmouse_set_mode(struct device *, int);
-/*
- * Type codes for wsmouse_set. REL_X/Y, MT_REL_X/Y, and TOUCH_WIDTH
- * cannot be reported by other functions. Please note that REL_X/Y
- * values are deltas to be applied to the absolute coordinates and
- * don't represent "pure" relative motion.
- */
-enum wsmouseval {
- WSMOUSE_REL_X,
- WSMOUSE_ABS_X,
- WSMOUSE_REL_Y,
- WSMOUSE_ABS_Y,
- WSMOUSE_PRESSURE,
- WSMOUSE_CONTACTS,
- WSMOUSE_TOUCH_WIDTH,
- WSMOUSE_MT_REL_X,
- WSMOUSE_MT_ABS_X,
- WSMOUSE_MT_REL_Y,
- WSMOUSE_MT_ABS_Y,
- WSMOUSE_MT_PRESSURE
-};
-
-#define WSMOUSE_IS_MT_CODE(code) \
- ((code) >= WSMOUSE_MT_REL_X && (code) <= WSMOUSE_MT_PRESSURE)
-
-
struct mtpoint {
int x;
int y;