Changeset 4bfd85b in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-05-03T10:12:03Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

0a494fe

Parents:

0dea35f (diff), 3facf63a (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:

Mouse driver ported to HID parser, DDF function for subdrivers.

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
@@ -125 +109 @@
          *    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.