Changeset a81a1d09 in mainline for uspace/drv/usbhid/kbd/kbddev.c

Timestamp:

2011-05-11T16:49:28Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (7 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -255 +255 @@
         
         if (hid_dev == NULL || hid_dev->data == NULL) {
+                usb_log_debug("default_connection_handler: "
+                    "Missing parameter.\n");
                 async_answer_0(icallid, EINVAL);
                 return;
@@ -267 +269 @@
 
                 if (kbd_dev->console_phone != -1) {
+                        usb_log_debug("default_connection_handler: "
+                            "console phone already set\n");
                         async_answer_0(icallid, ELIMIT);
                         return;
@@ -272 +276 @@
 
                 kbd_dev->console_phone = callback;
+                
+                usb_log_debug("default_connection_handler: OK\n");
                 async_answer_0(icallid, EOK);
                 return;
         }
         
+        usb_log_debug("default_connection_handler: Wrong function.\n");
         async_answer_0(icallid, EINVAL);
 }
@@ -555 +562 @@
                         usb_log_debug2("Key pressed: %d (keycode: %d)\n", key,
                             kbd_dev->keys[i]);
-                        usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key);
                         if (!usb_kbd_is_lock(key)) {
                                 usb_kbd_repeat_start(kbd_dev, key);
                         }
+                        usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key);
                 } else {
                         // found, nothing happens
@@ -766 +773 @@
 
 /*----------------------------------------------------------------------------*/
+
+static int usb_kbd_create_function(usb_hid_dev_t *hid_dev)
+{
+        assert(hid_dev != NULL);
+        assert(hid_dev->usb_dev != NULL);
+        
+        /* Create the function exposed under /dev/devices. */
+        usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
+        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
+            HID_KBD_FUN_NAME);
+        if (fun == NULL) {
+                usb_log_error("Could not create DDF function node.\n");
+                return ENOMEM;
+        }
+        
+        /*
+         * Store the initialized HID device and HID ops
+         * to the DDF function.
+         */
+        fun->ops = &hid_dev->ops;
+        fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
+
+        int rc = ddf_fun_bind(fun);
+        if (rc != EOK) {
+                usb_log_error("Could not bind DDF function: %s.\n",
+                    str_error(rc));
+                ddf_fun_destroy(fun);
+                return rc;
+        }
+        
+        usb_log_debug("Adding DDF function to class %s...\n", 
+            HID_KBD_CLASS_NAME);
+        rc = ddf_fun_add_to_class(fun, HID_KBD_CLASS_NAME);
+        if (rc != EOK) {
+                usb_log_error(
+                    "Could not add DDF function to class %s: %s.\n",
+                    HID_KBD_CLASS_NAME, str_error(rc));
+                ddf_fun_destroy(fun);
+                return rc;
+        }
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
 /* API functions                                                              */
 /*----------------------------------------------------------------------------*/
@@ -930 +982 @@
         usb_log_debug("HID/KBD device structure initialized.\n");
         
+        usb_log_debug("Creating KBD function...\n");
+        int rc = usb_kbd_create_function(hid_dev);
+        if (rc != EOK) {
+                usb_kbd_free(&kbd_dev);
+                return rc;
+        }
+        
         return EOK;
 }
@@ -993 +1052 @@
         if ((*kbd_dev)->led_data != NULL) {
                 free((*kbd_dev)->led_data);
-        }
-        if ((*kbd_dev)->output_buffer != NULL) {
-                free((*kbd_dev)->output_buffer);
         }
         if ((*kbd_dev)->led_path != NULL) {