Changeset deece2f in mainline for uspace/drv/uhci-hcd

Timestamp:

2011-02-21T22:25:58Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

233e68d

Parents:

fb78ae72 (diff), dbe25f1 (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 merge

Location:

uspace/drv/uhci-hcd

Files:

• iface.c (modified) (2 diffs)
• main.c (modified) (2 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -42 +42 @@
 #include "uhci.h"
 
-static int get_address(device_t *dev, devman_handle_t handle,
-    usb_address_t *address)
-{
-        assert(dev);
-        uhci_t *hc = dev_to_uhci(dev);
-        assert(hc);
-        *address = usb_address_keeping_find(&hc->address_manager, handle);
-        if (*address <= 0)
-          return *address;
-        return EOK;
-}
 /*----------------------------------------------------------------------------*/
 static int reserve_default_address(device_t *dev, usb_speed_t speed)
@@ -168 +157 @@
 /*----------------------------------------------------------------------------*/
 usbhc_iface_t uhci_iface = {
-        .tell_address = get_address,
-
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,

uspace/drv/uhci-hcd/main.c

@@ -34 +34 @@
 #include <driver.h>
 #include <usb_iface.h>
+#include <usb/ddfiface.h>
 #include <device/hw_res.h>
 
@@ -48 +49 @@
 
 static int uhci_add_device(device_t *device);
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle);
-/*----------------------------------------------------------------------------*/
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+
+static int usb_iface_get_address(device_t *dev, devman_handle_t handle,
+    usb_address_t *address)
 {
-        /* This shall be called only for the UHCI itself. */
-        assert(dev->parent == NULL);
+        assert(dev);
+        uhci_t *hc = dev_to_uhci(dev);
+        assert(hc);
 
-        *handle = dev->handle;
+        usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
+            handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        if (address != NULL) {
+                *address = addr;
+        }
+
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
+
 static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
+        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
+        .get_address = usb_iface_get_address
 };
 /*----------------------------------------------------------------------------*/