Changeset 3f3afb9 in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-04-11T20:38:37Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

1324ff3, a39cfb8

Parents:

58226b4 (diff), d91645ab (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:

forgotten hub port powering

File:

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

uspace/drv/usbhid/main.c

@@ -98 +98 @@
         /* 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->device_type));
+            usb_hid_get_function_name(hid_dev));
         if (hid_fun == NULL) {
                 usb_log_error("Could not create DDF function node.\n");
@@ -122 +122 @@
         }
         
-        rc = ddf_fun_add_to_class(hid_fun, 
-            usb_hid_get_class_name(hid_dev->device_type));
+        rc = ddf_fun_add_to_class(hid_fun, usb_hid_get_class_name(hid_dev));
         if (rc != EOK) {
                 usb_log_error(
@@ -142 +141 @@
            hid_dev->poll_pipe_index,
            /* Callback when data arrives. */
-           hid_dev->poll_callback,
+           usb_hid_polling_callback,
            /* How much data to request. */
            dev->pipes[hid_dev->poll_pipe_index].pipe->max_packet_size,