Changeset 0edf7c7 in mainline

Timestamp:

2011-05-20T20:01:25Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04028225

Parents:

a60afd0

Message:

HC communication moved into libusb

Although communication with HC looked like a thing common only
to devices, any utility wanting to communicate with the device may
try to get some information about it from the HC.

Thus the usb_hc_connection* and some other generic functions were
moved into libusb.

Also merged dev/hc.h and host.h into hc.h.

Location:

uspace

Files:

• app/lsusb/main.c (modified) (1 diff)
• app/mkbd/main.c (modified) (1 diff)
• app/usbinfo/main.c (modified) (1 diff)
• drv/uhci-rhd/port.h (modified) (1 diff)
• lib/usb/Makefile (modified) (1 diff)
• lib/usb/include/usb/hc.h (moved) (moved from uspace/lib/usbdev/include/usb/dev/hc.h ) (2 diffs)
• lib/usb/include/usb/host.h (deleted)
• lib/usb/src/hc.c (moved) (moved from uspace/lib/usbdev/src/usbdevice.c ) (2 diffs)
• lib/usb/src/host.c (deleted)
• lib/usbdev/Makefile (modified) (1 diff)
• lib/usbdev/include/usb/dev/hub.h (modified) (2 diffs)
• lib/usbdev/include/usb/dev/pipes.h (modified) (1 diff)
• lib/usbdev/src/hub.c (modified) (1 diff)

uspace/app/lsusb/main.c

@@ -45 +45 @@
 #include <devmap.h>
 #include <usb/dev/hub.h>
-#include <usb/host.h>
+#include <usb/hc.h>
 
 #define NAME "lsusb"

uspace/app/mkbd/main.c

@@ -45 +45 @@
 #include <devmap.h>
 #include <usb/dev/hub.h>
-#include <usb/host.h>
+#include <usb/hc.h>
 #include <usb/driver.h>
 #include <usb/dev/pipes.h>

uspace/app/usbinfo/main.c

@@ -43 +43 @@
 #include <devman.h>
 #include <devmap.h>
-#include <usb/dev/hc.h>
+#include <usb/hc.h>
 #include <usb/dev/pipes.h>
-#include <usb/host.h>
 #include <usb/driver.h>
 #include "usbinfo.h"

uspace/drv/uhci-rhd/port.h

@@ -38 +38 @@
 #include <fibril.h>
 #include <ddf/driver.h>
-#include <usb/dev/hc.h> /* usb_hc_connection_t */
+#include <usb/hc.h> /* usb_hc_connection_t */
 
 typedef uint16_t port_status_t;

uspace/lib/usb/Makefile

@@ -39 +39 @@
         src/driver.c \
         src/dump.c \
-        src/host.c \
+        src/hc.c \
         src/usb.c
 

uspace/lib/usb/include/usb/hc.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libusbdev
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * General communication between device drivers and host controller driver.
+ * General communication with host controller driver.
  */
-#ifndef LIBUSBDEV_HC_H_
-#define LIBUSBDEV_HC_H_
+#ifndef LIBUSB_HC_H_
+#define LIBUSB_HC_H_
 
 #include <sys/types.h>
@@ -57 +57 @@
 bool usb_hc_connection_is_opened(const usb_hc_connection_t *);
 int usb_hc_connection_close(usb_hc_connection_t *);
+int usb_hc_get_handle_by_address(usb_hc_connection_t *, usb_address_t,
+    devman_handle_t *);
 
+int usb_ddf_get_hc_handle_by_class(size_t, devman_handle_t *);
 
 

uspace/lib/usb/src/hc.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusbdev
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * General communication between device drivers and host controller driver.
+ * General communication with host controller driver (implementation).
  */
 #include <devman.h>
 #include <async.h>
+#include <dev_iface.h>
 #include <usb_iface.h>
-#include <usb/dev/hc.h>
+#include <usbhc_iface.h>
+#include <usb/hc.h>
 #include <usb/driver.h>
 #include <usb/debug.h>
@@ -143 +145 @@
 }
 
+/** Get handle of USB device with given address.
+ *
+ * @param[in] connection Opened connection to host controller.
+ * @param[in] address Address of device in question.
+ * @param[out] handle Where to write the device handle.
+ * @return Error code.
+ */
+int usb_hc_get_handle_by_address(usb_hc_connection_t *connection,
+    usb_address_t address, devman_handle_t *handle)
+{
+        if (!usb_hc_connection_is_opened(connection)) {
+                return ENOENT;
+        }
+
+        sysarg_t tmp;
+        int rc = async_req_2_1(connection->hc_phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
+            address, &tmp);
+        if ((rc == EOK) && (handle != NULL)) {
+                *handle = tmp;
+        }
+
+        return rc;
+}
+
+
+/** 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)
+{
+        char *class_index_str;
+        devman_handle_t hc_handle_tmp;
+        int rc;
+
+        rc = asprintf(&class_index_str, "%zu", class_index);
+        if (rc < 0) {
+                return ENOMEM;
+        }
+        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;
+}
+
 /**
  * @}

uspace/lib/usbdev/Makefile

@@ -46 +46 @@
         src/pipesio.c \
         src/recognise.c \
-        src/request.c \
-        src/usbdevice.c
+        src/request.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usbdev/include/usb/dev/hub.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include <usb/dev/hc.h>
+#include <usb/hc.h>
 
 int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
@@ -63 +63 @@
     const usb_hc_attached_device_t *);
 int usb_hc_unregister_device(usb_hc_connection_t *, usb_address_t);
-int usb_hc_get_handle_by_address(usb_hc_connection_t *, usb_address_t,
-    devman_handle_t *);
 
 #endif

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <usb/usb.h>
-#include <usb/dev/hc.h>
+#include <usb/hc.h>
 #include <usb/descriptor.h>
 #include <ipc/devman.h>

uspace/lib/usbdev/src/hub.c

@@ -120 +120 @@
 }
 
-/** Get handle of USB device with given address.
- *
- * @param[in] connection Opened connection to host controller.
- * @param[in] address Address of device in question.
- * @param[out] handle Where to write the device handle.
- * @return Error code.
- */
-int usb_hc_get_handle_by_address(usb_hc_connection_t *connection,
-    usb_address_t address, devman_handle_t *handle)
-{
-        CHECK_CONNECTION(connection);
-
-        sysarg_t tmp;
-        int rc = async_req_2_1(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
-            address, &tmp);
-        if ((rc == EOK) && (handle != NULL)) {
-                *handle = tmp;
-        }
-
-        return rc;
-}
 
 static void unregister_control_endpoint_on_default_address(