Changeset 9370884 in mainline for uspace/drv

Timestamp:

2011-03-14T21:22:52Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15d3b54, a963a68

Parents:

ff34e5a (diff), c69209d (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:

Development branch changes

Location:

uspace/drv

Files:

• usbhid/hiddev.c (modified) (1 diff)
• usbhub/usbhub.c (modified) (2 diffs)
• usbmid/usbmid.c (modified) (1 diff)

uspace/drv/usbhid/hiddev.c

@@ -391 +391 @@
                 return rc;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&hid_dev->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Probing default control pipe failed: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
 
         /*

uspace/drv/usbhub/usbhub.c

@@ -118 +118 @@
                 dprintf(USB_LOG_LEVEL_ERROR,
                                 "could not initialize connection to device endpoint, errno %d",opResult);
-        }
-        return opResult;
+                return opResult;
+        }
+
+        opResult = usb_endpoint_pipe_probe_default_control(&hub->endpoints.control);
+        if (opResult != EOK) {
+                dprintf(USB_LOG_LEVEL_ERROR, "failed probing endpoint 0, %d", opResult);
+                return opResult;
+        }
+
+        return EOK;
 }
 
@@ -430 +438 @@
                         &new_device_pipe,
                         &new_device_connection);
+        usb_endpoint_pipe_probe_default_control(&new_device_pipe);
         /// \TODO get highspeed info
         usb_speed_t speed = isLowSpeed?USB_SPEED_LOW:USB_SPEED_FULL;

uspace/drv/usbmid/usbmid.c

@@ -116 +116 @@
                 return NULL;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&mid->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Probing default control pipe failed: %s.\n",
+                    str_error(rc));
+                free(mid);
+                return NULL;
+        }
 
         mid->dev = dev;