Changeset 93fb170c in mainline for uspace/drv/usbkbd/main.c

Timestamp:

2011-01-08T18:51:31Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15be932

Parents:

8f748215 (diff), a523af4 (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 main branch

File:

• uspace/drv/usbkbd/main.c (modified) (6 diffs)

uspace/drv/usbkbd/main.c

@@ -29 +29 @@
 #include <driver.h>
 #include <ipc/driver.h>
+#include <ipc/kbd.h>
+#include <io/keycode.h>
+#include <io/console.h>
 #include <errno.h>
 #include <fibril.h>
@@ -41 +44 @@
 #define GUESSED_POLL_ENDPOINT 1
 
+static void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *);
+static device_ops_t keyboard_ops = {
+        .default_handler = default_connection_handler
+};
+
+static int console_callback_phone = -1;
+
+/** Default handler for IPC methods not handled by DDF.
+ *
+ * @param dev Device handling the call.
+ * @param icallid Call id.
+ * @param icall Call data.
+ */
+void default_connection_handler(device_t *dev,
+    ipc_callid_t icallid, ipc_call_t *icall)
+{
+        sysarg_t method = IPC_GET_IMETHOD(*icall);
+
+        if (method == IPC_M_CONNECT_TO_ME) {
+                int callback = IPC_GET_ARG5(*icall);
+
+                if (console_callback_phone != -1) {
+                        ipc_answer_0(icallid, ELIMIT);
+                        return;
+                }
+
+                console_callback_phone = callback;
+                ipc_answer_0(icallid, EOK);
+                return;
+        }
+
+        ipc_answer_0(icallid, EINVAL);
+}
+
+static void send_key(int key, int type, wchar_t c) {
+        async_msg_4(console_callback_phone, KBD_EVENT, type, key,
+            KM_NUM_LOCK, c);
+}
+
+static void send_alnum(int key, wchar_t c) {
+        printf(NAME ": sending key '%lc' to console\n", (wint_t) c);
+        send_key(key, KEY_PRESS, c);
+        send_key(key, KEY_RELEASE, c);
+}
+
 /*
  * Callbacks for parser
@@ -142 +190 @@
         // get phone to my HC and save it as my parent's phone
         // TODO: maybe not a good idea if DDF will use parent_phone
-        kbd_dev->device->parent_phone = usb_drv_hc_connect(dev, 0);
+        kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
 
         kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
@@ -183 +231 @@
                 sizeof(usb_hid_report_in_callbacks_t));
         callbacks->keyboard = usbkbd_process_keycodes;
+
+        if (console_callback_phone != -1) {
+                static size_t counter = 0;
+                counter++;
+                if (counter > 3) {
+                        counter = 0;
+                        send_alnum(KC_A, L'a');
+                }
+        }
 
         usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
@@ -268 +325 @@
          * Not supported yet, skip..
          */
-//      int phone = usb_drv_hc_connect(dev, 0);
+//      int phone = usb_drv_hc_connect_auto(dev, 0);
 //      if (phone < 0) {
 //              /*
@@ -289 +346 @@
         fibril_add_ready(fid);
 
+        dev->ops = &keyboard_ops;
+
+        add_device_to_class(dev, "keyboard");
+
         /*
          * Hurrah, device is initialized.