Changeset 72af8da in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-03-16T18:50:17Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

42a3a57

Parents:

3e7b7cd (diff), fcf07e6 (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:

merge from usb/development

File:

• uspace/drv/usbhub/usbhub.c (modified) (3 diffs)

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;
 }
 
@@ -233 +241 @@
         dprintf(USB_LOG_LEVEL_DEBUG, "starting control transaction");
         usb_endpoint_pipe_start_session(&result->endpoints.control);
+        opResult = usb_request_set_configuration(&result->endpoints.control, 1);
+        assert(opResult == EOK);
+
         opResult = usb_request_get_descriptor(&result->endpoints.control,
                         USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
@@ -427 +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;