Changeset 0edf7c7 in mainline for uspace/lib/usbdev

Timestamp:

2011-05-20T20:01:25Z (14 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/lib/usbdev

Files:

• Makefile (modified) (1 diff)
• include/usb/dev/hub.h (modified) (2 diffs)
• include/usb/dev/pipes.h (modified) (1 diff)
• src/hub.c (modified) (1 diff)

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(