Changeset c7d5189 in mainline

Timestamp:

2018-01-19T13:12:57Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

a4e7e6e1

Parents:

7138a78b

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-19 13:08:12)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-19 13:12:57)

Message:

usbhost: split hcd_device_explore

Location:

uspace/lib/usbhost

Files:

• include/usb/host/ddf_helpers.h (modified) (2 diffs)
• src/ddf_helpers.c (modified) (3 diffs)

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

@@ -42 +42 @@
 
 #include <usb/host/hcd.h>
+#include <usb/descriptor.h>
+
 
 int hcd_ddf_setup_hc(ddf_dev_t *, size_t);
@@ -51 +53 @@
 void hcd_ddf_fun_destroy(device_t *);
 
+int hcd_get_device_desc(device_t *, usb_standard_device_descriptor_t *);
+int hcd_setup_match_ids(device_t *, usb_standard_device_descriptor_t *);
 int hcd_device_explore(device_t *);
 

uspace/lib/usbhost/src/ddf_helpers.c

@@ -393 +393 @@
 }
 
-int hcd_device_explore(device_t *device)
-{
-        int err;
-        match_id_list_t mids;
-        usb_standard_device_descriptor_t desc = { 0 };
-
-        init_match_ids(&mids);
-
+int hcd_get_device_desc(device_t *device, usb_standard_device_descriptor_t *desc)
+{
         const usb_target_t control_ep = {{
                 .address = device->address,
@@ -408 +402 @@
         /* Get std device descriptor */
         const usb_device_request_setup_packet_t get_device_desc =
-            GET_DEVICE_DESC(sizeof(desc));
+            GET_DEVICE_DESC(sizeof(*desc));
 
         usb_log_debug("Device(%d): Requesting full device descriptor.",
             device->address);
         ssize_t got = bus_device_send_batch_sync(device, control_ep, USB_DIRECTION_IN,
-            (char *) &desc, sizeof(desc), *(uint64_t *)&get_device_desc,
+            (char *) desc, sizeof(*desc), *(uint64_t *)&get_device_desc,
             "read device descriptor");
-        if (got < 0) {
-                err = got < 0 ? got : EOVERFLOW;
-                usb_log_error("Device(%d): Failed to set get dev descriptor: %s",
-                    device->address, str_error(err));
-                goto out;
-        }
+
+        if (got < 0)
+                return got;
+
+        return got == sizeof(*desc) ? EOK : EOVERFLOW;
+}
+
+int hcd_setup_match_ids(device_t *device, usb_standard_device_descriptor_t *desc)
+{
+        int err;
+        match_id_list_t mids;
+
+        init_match_ids(&mids);
 
         /* Create match ids from the device descriptor */
         usb_log_debug("Device(%d): Creating match IDs.", device->address);
-        if ((err = create_match_ids(&mids, &desc))) {
-                usb_log_error("Device(%d): Failed to create match ids: %s", device->address, str_error(err));
-                goto out;
+        if ((err = create_match_ids(&mids, desc))) {
+                return err;
         }
 
@@ -433 +433 @@
         }
 
-out:
-        clean_match_ids(&mids);
-        return err;
+        return EOK;
+}
+
+
+int hcd_device_explore(device_t *device)
+{
+        int err;
+        usb_standard_device_descriptor_t desc = { 0 };
+
+        if ((err = hcd_get_device_desc(device, &desc))) {
+                usb_log_error("Device(%d): Failed to get dev descriptor: %s",
+                    device->address, str_error(err));
+                return err;
+        }
+
+        if ((err = hcd_setup_match_ids(device, &desc))) {
+                usb_log_error("Device(%d): Failed to setup match ids: %s", device->address, str_error(err));
+                return err;
+        }
+
+        return EOK;
 }