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

Timestamp:

2011-05-06T09:25:44Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d0c060b

Parents:

9e929a0 (diff), 310c4df (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 with usb/development

File:

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

uspace/drv/usbhid/kbd/kbddev.c

@@ -766 +766 @@
 
 /*----------------------------------------------------------------------------*/
+
+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 +975 @@
         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 +1045 @@
         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) {