Changeset 98e15b1 in mainline for uspace/drv

Timestamp:

2011-05-29T21:58:31Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

95067954, d600874

Parents:

6ab7f3e9 (diff), bd7acda (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 with usb/development

Location:

uspace/drv

Files:

• ehci-hcd/hc_iface.c (modified) (2 diffs)
• usbhub/usbhub.c (modified) (1 diff)
• usbmouse/init.c (modified) (2 diffs)
• usbmouse/mouse.c (modified) (1 diff)

uspace/drv/ehci-hcd/hc_iface.c

@@ -48 +48 @@
             methodname, __FILE__, __LINE__)
 
-/** Reserve default address.
- *
- * This function may block the caller.
- *
- * @param[in] fun Device function the action was invoked on.
- * @param[in] speed Speed of the device for which the default address is
- *      reserved.
- * @return Error code.
- */
-static int reserve_default_address(ddf_fun_t *fun, usb_speed_t speed)
-{
-        UNSUPPORTED("reserve_default_address");
-
-        return ENOTSUP;
-}
-
-/** Release default address.
- *
- * @param[in] fun Device function the action was invoked on.
- * @return Error code.
- */
-static int release_default_address(ddf_fun_t *fun)
-{
-        UNSUPPORTED("release_default_address");
-
-        return ENOTSUP;
-}
-
 /** Found free USB address.
  *
@@ -332 +304 @@
 /** Host controller interface implementation for EHCI. */
 usbhc_iface_t ehci_hc_iface = {
-        .reserve_default_address = reserve_default_address,
-        .release_default_address = release_default_address,
         .request_address = request_address,
         .bind_address = bind_address,

uspace/drv/usbhub/usbhub.c

@@ -515 +515 @@
         fibril_mutex_unlock(&hub->pending_ops_mutex);
 
+        usb_device_destroy(hub->usb_device);
+
         free(hub->ports);
         free(hub);

uspace/drv/usbmouse/init.c

@@ -39 +39 @@
 #include <usb/hid/hid.h>
 #include <usb/dev/request.h>
+#include <usb/hid/request.h>
 #include <errno.h>
 
@@ -126 +127 @@
         
         /* Set the boot protocol. */
-        rc = usb_control_request_set(&dev->ctrl_pipe,
-            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-            USB_HIDREQ_SET_PROTOCOL, USB_HID_PROTOCOL_BOOT, dev->interface_no,
-            NULL, 0);
+        rc = usbhid_req_set_protocol(&dev->ctrl_pipe, dev->interface_no,
+            USB_HID_PROTOCOL_BOOT);
         if (rc != EOK) {
                 goto leave;

uspace/drv/usbmouse/mouse.c

@@ -117 +117 @@
         async_hangup(mouse->console_phone);
         mouse->console_phone = -1;
+
+        usb_device_destroy(dev);
 }