Changeset 26e7d6d in mainline for uspace/srv/hid/input/include/mouse_proto.h

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a347a11

Parents:

3842a955 (diff), 086290d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/hid/input/include/mouse_proto.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_proto.h ) (3 diffs)

uspace/srv/hid/input/include/mouse_proto.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mouse
- * @brief
+/** @addtogroup inputgen generic
+ * @brief Mouse protocol driver interface.
+ * @ingroup input
  * @{
  */
@@ -37 +38 @@
 #define MOUSE_PROTO_H_
 
-extern void mouse_proto_parse_byte(int);
-extern int mouse_proto_init(void);
+#include <mouse_port.h>
+
+struct mouse_dev;
+
+typedef struct mouse_proto_ops {
+        void (*parse)(sysarg_t);
+        int (*init)(struct mouse_dev *);
+} mouse_proto_ops_t;
+
+extern mouse_proto_ops_t adb_proto;
+extern mouse_proto_ops_t ps2_proto;
+extern mouse_proto_ops_t mousedev_proto;
 
 #endif