Changeset 196fbb0 in mainline

Timestamp:

2011-10-12T18:57:06Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6626bba9

Parents:

940f576

Message:

usbhub: Store hub function ptr within hub structure.

Location:

uspace/drv/bus/usb/usbhub

Files:

• usbhub.c (modified) (3 diffs)
• usbhub.h (modified) (1 diff)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -136 +136 @@
 
         usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n");
-        ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
+        hub_info->hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
             fun_exposed, HUB_FNC_NAME);
-        if (hub_fun == NULL) {
+        if (hub_info->hub_fun == NULL) {
                 usb_log_error("Failed to create hub function.\n");
                 free(hub_info);
@@ -144 +144 @@
         }
 
-        opResult = ddf_fun_bind(hub_fun);
+        opResult = ddf_fun_bind(hub_info->hub_fun);
         if (opResult != EOK) {
                 usb_log_error("Failed to bind hub function: %s.\n",
                    str_error(opResult));
                 free(hub_info);
-                ddf_fun_destroy(hub_fun);
+                ddf_fun_destroy(hub_info->hub_fun);
                 return opResult;
         }
@@ -157 +157 @@
             usb_hub_polling_terminated_callback, hub_info);
         if (opResult != EOK) {
-                ddf_fun_destroy(hub_fun);
+                ddf_fun_destroy(hub_info->hub_fun);
                 free(hub_info);
                 usb_log_error("Failed to create polling fibril: %s.\n",

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -76 +76 @@
         /** Condition variable for pending_ops_count. */
         fibril_condvar_t pending_ops_cv;
+        ddf_fun_t *hub_fun;
 };