Changeset 9e195e2c in mainline for uspace/lib/usb/src/driver.c

Timestamp:

2011-05-12T09:03:00Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d59d0bb

Parents:

456aea3 (diff), c372e03 (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 development

File:

• uspace/lib/usb/src/driver.c (moved) (moved from uspace/app/tester/adt/usbaddrkeep.c ) (2 diffs)

uspace/lib/usb/src/driver.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <usb/addrkeep.h>
+/** @addtogroup libusb
+ * @{
+ */
+/** @file
+ *
+ */
+#include <devman.h>
+#include <dev_iface.h>
+#include <usb_iface.h>
+#include <usb/driver.h>
 #include <errno.h>
-#include "../tester.h"
-
-#define MAX_ADDRESS 5
 
 
-const char *test_usbaddrkeep(void)
+/** Find host controller handle that is ancestor of given device.
+ *
+ * @param[in] device_handle Device devman handle.
+ * @param[out] hc_handle Where to store handle of host controller
+ *      controlling device with @p device_handle handle.
+ * @return Error code.
+ */
+int usb_hc_find(devman_handle_t device_handle, devman_handle_t *hc_handle)
 {
-        int rc;
-        usb_address_keeping_t addresses;
-
-        TPRINTF("Initializing addresses keeping structure...\n");
-        usb_address_keeping_init(&addresses, MAX_ADDRESS);
-        
-        TPRINTF("Requesting address...\n");
-        usb_address_t addr = usb_address_keeping_request(&addresses);
-        TPRINTF("Address assigned: %d\n", (int) addr);
-        if (addr != 1) {
-                return "have not received expected address 1";
+        int parent_phone = devman_parent_device_connect(device_handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
         }
 
-        TPRINTF("Releasing not assigned address...\n");
-        rc = usb_address_keeping_release(&addresses, 2);
-        if (rc != ENOENT) {
-                return "have not received expected ENOENT";
+        devman_handle_t h;
+        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
+
+        async_hangup(parent_phone);
+
+        if (rc != EOK) {
+                return rc;
         }
 
-        TPRINTF("Releasing acquired address...\n");
-        rc = usb_address_keeping_release(&addresses, addr);
-        if (rc != EOK) {
-                return "have not received expected EOK";
+        if (hc_handle != NULL) {
+                *hc_handle = h;
         }
 
-        return NULL;
+        return EOK;
 }
+
+/**
+ * @}
+ */