Changeset 30f9f8f in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-05-06T09:29:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9a884ed

Parents:

c709eb0 (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 development/ changes

File:

• uspace/drv/usbhid/main.c (modified) (1 diff)

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
-
-        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;
-        }
+         * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
+         *    do nej.
+         * 2) do tych ops do .interfaces[DEV_IFACE_USBHID (asi)] priradi 
+         *    vyplnenu strukturu usbhid_iface_t.
+         * 3) klientska aplikacia - musi si rucne vytvorit telefon
+         *    (devman_device_connect() - cesta k zariadeniu (/hw/pci0/...) az 
+         *    k tej fcii.
+         *    pouzit usb/classes/hid/iface.h - prvy int je telefon
+         */
         
         /* Start automated polling function.