Changes in uspace/drv/usbhid/main.c [31cfee16:b20de1d] in mainline

File:

• uspace/drv/usbhid/main.c (modified) (2 diffs)

uspace/drv/usbhid/main.c

@@ -99 +99 @@
         usb_log_debug("USB/HID device structure initialized.\n");
         
+        /* Create the function exposed under /dev/devices. */
+        ddf_fun_t *hid_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, 
+            usb_hid_get_function_name(hid_dev));
+        if (hid_fun == NULL) {
+                usb_log_error("Could not create DDF function node.\n");
+                usb_hid_free(&hid_dev);
+                return ENOMEM;
+        }
+        
+        /*
+         * Store the initialized HID device and HID ops
+         * to the DDF function.
+         */
+        hid_fun->ops = &hid_dev->ops;
+        hid_fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
+        
         /*
          * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
@@ -109 +125 @@
          *    pouzit usb/classes/hid/iface.h - prvy int je telefon
          */
+
+        rc = ddf_fun_bind(hid_fun);
+        if (rc != EOK) {
+                usb_log_error("Could not bind DDF function: %s.\n",
+                    str_error(rc));
+                // TODO: Can / should I destroy the DDF function?
+                ddf_fun_destroy(hid_fun);
+                usb_hid_free(&hid_dev);
+                return rc;
+        }
+        
+        rc = ddf_fun_add_to_class(hid_fun, usb_hid_get_class_name(hid_dev));
+        if (rc != EOK) {
+                usb_log_error(
+                    "Could not add DDF function to class 'hid': %s.\n",
+                    str_error(rc));
+                // TODO: Can / should I destroy the DDF function?
+                ddf_fun_destroy(hid_fun);
+                usb_hid_free(&hid_dev);
+                return rc;
+        }
         
         /* Start automated polling function.