Changeset daf59d1 in mainline

Timestamp:

2012-12-21T11:37:14Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0a12879

Parents:

0ef03d7

Message:

libusbhost: Move lsit of usb device to ddf helper structure.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/ddf_helpers.h (modified) (1 diff)
• include/usb/host/hcd.h (modified) (1 diff)
• src/ddf_helpers.c (modified) (5 diffs)
• src/hcd.c (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -40 +40 @@
 #include <usbhc_iface.h>
 
-int hcd_ddf_add_device(hcd_t *instance, ddf_dev_t *parent,
+int hcd_ddf_add_usb_device(ddf_dev_t *parent,
     usb_address_t address, usb_speed_t speed, const char *name,
     const match_id_list_t *mids);

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -57 +57 @@
         /** Endpoint manager. */
         usb_endpoint_manager_t ep_manager;
-        /** Added devices */
-        list_t devices;
 
         /** Device specific driver data. */

uspace/lib/usbhost/src/ddf_helpers.c

@@ -45 +45 @@
 typedef struct hc_dev {
         ddf_fun_t *hc_fun;
+        list_t devices;
 } hc_dev_t;
 
@@ -118 +119 @@
 };
 
-int hcd_ddf_add_device(hcd_t *instance, ddf_dev_t *parent,
+int hcd_ddf_add_usb_device(ddf_dev_t *parent,
     usb_address_t address, usb_speed_t speed, const char *name,
     const match_id_list_t *mids)
 {
-        assert(instance);
         assert(parent);
-        hc_dev_t *hc_dev = ddf_dev_data_get(parent);
+        hc_dev_t *hc_dev = dev_to_hc_dev(parent);
         devman_handle_t hc_handle = ddf_fun_get_handle(hc_dev->hc_fun);
 
@@ -154 +154 @@
         }
 
-        ret = usb_device_manager_bind_address(&instance->dev_manager,
+        ret = usb_device_manager_bind_address(&dev_to_hcd(parent)->dev_manager,
             address, ddf_fun_get_handle(fun));
         if (ret != EOK)
-                usb_log_warning("Failed to bind root hub address: %s.\n",
+                usb_log_warning("Failed to bind address: %s.\n",
                     str_error(ret));
 
-        list_append(&info->link, &instance->devices);
+        list_append(&info->link, &hc_dev->devices);
         return EOK;
 }
@@ -210 +210 @@
         add_match_id(&mid_list, &mid);
 
-        ret = hcd_ddf_add_device(
-            instance, device, *address, speed, "rh", &mid_list);
+        ret = hcd_ddf_add_usb_device(device, *address, speed, "rh", &mid_list);
         CHECK_RET_UNREG_RETURN(ret,
             "Failed to add hcd device: %s.\n", str_error(ret));
@@ -240 +239 @@
                 return ENOMEM;
         }
+        list_initialize(&instance->devices);
 
 #define CHECK_RET_DEST_FREE_RETURN(ret, message...) \

uspace/lib/usbhost/src/hcd.c

@@ -55 +55 @@
         usb_device_manager_init(&hcd->dev_manager, max_speed);
         usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
-        list_initialize(&hcd->devices);
 
         hcd->private_data = NULL;