Changeset a33f0a6 in mainline for uspace/srv/hid/input/include

Timestamp:

2011-08-03T17:34:57Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

Location:

uspace/srv/hid/input/include

Files:

• gsp.h (moved) (moved from uspace/srv/hid/kbd/include/gsp.h ) (1 diff)
• input.h (moved) (moved from uspace/srv/hid/kbd/include/kbd.h ) (3 diffs)
• kbd.h (added)
• kbd_ctl.h (moved) (moved from uspace/srv/hid/kbd/include/kbd_ctl.h ) (4 diffs)
• kbd_port.h (added)
• layout.h (added)
• mouse.h (added)
• mouse_port.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_port.h ) (4 diffs)
• mouse_proto.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_proto.h ) (3 diffs)
• stroke.h (moved) (moved from uspace/srv/hid/kbd/include/stroke.h ) (3 diffs)
• sun.h (moved) (moved from uspace/srv/hid/kbd/include/sun.h )

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

@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen generic
+/** @addtogroup inputgen generic
  * @brief       Generic scancode parser.
- * @ingroup  kbd
+ * @ingroup  input
  * @{
- */ 
+ */
 /** @file
  */

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup kbdgen generic
- * @brief HelenOS generic uspace keyboard handler.
- * @ingroup kbd
+/** @addtogroup inputgen generic
+ * @brief HelenOS input server.
+ * @ingroup input
  * @{
  */
@@ -35 +36 @@
  */
 
-#ifndef KBD_KBD_H_
-#define KBD_KBD_H_
+#ifndef INPUT_H_
+#define INPUT_H_
 
 #include <bool.h>
 
+#define NAME       "input"
+#define NAMESPACE  "hid"
+
 extern bool irc_service;
 extern int irc_phone;
-
-extern void kbd_push_scancode(int);
-extern void kbd_push_ev(int, unsigned int);
 
 #endif

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen generic
- * @brief       HelenOS generic uspace keyboard handler.
- * @ingroup  kbd
+/** @addtogroup inputgen generic
+ * @brief Keyboard controller driver interface.
+ * @ingroup input
  * @{
- */ 
+ */
 /** @file
  */
@@ -38 +38 @@
 #define KBD_CTL_H_
 
-extern void kbd_ctl_parse_scancode(int);
-extern int kbd_ctl_init(void);
-extern void kbd_ctl_set_ind(unsigned);
+#include <kbd_port.h>
+
+struct kbd_dev;
+
+typedef struct kbd_ctl_ops {
+        void (*parse)(sysarg_t);
+        int (*init)(struct kbd_dev *);
+        void (*set_ind)(struct kbd_dev *, unsigned int);
+} kbd_ctl_ops_t;
+
+extern kbd_ctl_ops_t apple_ctl;
+extern kbd_ctl_ops_t gxe_fb_ctl;
+extern kbd_ctl_ops_t kbdev_ctl;
+extern kbd_ctl_ops_t pc_ctl;
+extern kbd_ctl_ops_t stty_ctl;
+extern kbd_ctl_ops_t sun_ctl;
 
 #endif
@@ -46 +59 @@
 /**
  * @}
- */ 
-
+ */

uspace/srv/hid/input/include/mouse_port.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 port driver interface.
+ * @ingroup input
  * @{
  */
@@ -39 +40 @@
 #include <sys/types.h>
 
-extern int mouse_port_init(void);
-extern void mouse_port_yield(void);
-extern void mouse_port_reclaim(void);
-extern void mouse_port_write(uint8_t);
+struct mouse_dev;
+
+typedef struct mouse_port_ops {
+        int (*init)(struct mouse_dev *);
+        void (*yield)(void);
+        void (*reclaim)(void);
+        void (*write)(uint8_t);
+} mouse_port_ops_t;
+
+extern mouse_port_ops_t adb_mouse_port;
+extern mouse_port_ops_t chardev_mouse_port;
 
 #endif
@@ -48 +56 @@
 /**
  * @}
- */ 
-
+ */

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

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen generic
+/** @addtogroup inputgen generic
  * @brief       Generic scancode parser.
- * @ingroup  kbd
+ * @ingroup  input
  * @{
  */ 
@@ -38 +38 @@
 #define KBD_STROKE_H_
 
-extern void stroke_sim(unsigned, unsigned);
+#include <kbd.h>
+
+extern void stroke_sim(kbd_dev_t *, unsigned, unsigned);
 
 #endif