Changeset a81a1d09 in mainline for uspace/lib/usb/src

Timestamp:

2011-05-11T16:49:28Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

Location:

uspace/lib/usb/src

Files:

• ddfiface.c (modified) (1 diff)
• driver.c (moved) (moved from uspace/app/tester/adt/usbaddrkeep.c ) (2 diffs)
• dump.c (modified) (1 diff)
• hidparser.c (deleted)
• host.c (moved) (moved from uspace/app/virtusbkbd/stdreq.c ) (2 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -37 +37 @@
 #include <async.h>
 #include <usb/ddfiface.h>
+#include <usb/driver.h>
 #include <usb/debug.h>
 #include <errno.h>

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;
 }
+
+/**
+ * @}
+ */

uspace/lib/usb/src/dump.c

@@ -41 +41 @@
 #include <usb/descriptor.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
 
 /** Mapping between descriptor id and dumping function. */

uspace/lib/usb/src/host.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup usbvirtkbd
+/** @addtogroup libusb
  * @{
  */
 /**
  * @file
- * @brief Keyboard configuration.
+ * Host controller common functions (implementation).
  */
+#include <stdio.h>
+#include <str_error.h>
 #include <errno.h>
+#include <assert.h>
+#include <bool.h>
+#include <usb/host.h>
 #include <usb/descriptor.h>
-#include "stdreq.h"
-#include "kbdconfig.h"
+#include <devman.h>
 
-int req_get_descriptor(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size)
+/** Get host controller handle by its class index.
+ *
+ * @param class_index Class index for the host controller.
+ * @param hc_handle Where to store the HC handle
+ *      (can be NULL for existence test only).
+ * @return Error code.
+ */
+int usb_ddf_get_hc_handle_by_class(size_t class_index,
+    devman_handle_t *hc_handle)
 {
-        if (setup_packet->value_high == USB_DESCTYPE_HID_REPORT) {
-                /*
-                 * For simplicity, always return the same
-                 * report descriptor.
-                 */
-                usbvirt_control_reply_helper(setup_packet,
-                    data, act_size,
-                    report_descriptor, report_descriptor_size);
+        char *class_index_str;
+        devman_handle_t hc_handle_tmp;
+        int rc;
 
-                return EOK;
+        rc = asprintf(&class_index_str, "%zu", class_index);
+        if (rc < 0) {
+                return ENOMEM;
         }
-        
-        /* Let the framework handle all the rest. */
-        return EFORWARD;
+        rc = devman_device_get_handle_by_class("usbhc", class_index_str,
+            &hc_handle_tmp, 0);
+        free(class_index_str);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (hc_handle != NULL) {
+                *hc_handle = hc_handle_tmp;
+        }
+
+        return EOK;
 }
-
-
 
 /** @}