Changeset c9256c5 in mainline for uspace/lib/usbdev

Timestamp:

2011-05-20T20:37:06Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1889786, fcbcaae9

Parents:

74b1e40 (diff), e8f826b (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:

Minor fixes and improvements

• Ensure linking against libusb is static only.
• Generic HC communication moved into libusb.
• Headers clean-up.
• Add function for resolving USB device path.

Location:

uspace/lib/usbdev

Files:

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

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>
@@ -163 +163 @@
 
 int usb_device_get_assigned_interface(ddf_dev_t *);
-usb_address_t usb_device_get_assigned_address(devman_handle_t);
 
 int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *,

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(

uspace/lib/usbdev/src/pipes.c

@@ -36 +36 @@
 #include <usb/dev/pipes.h>
 #include <usb/debug.h>
-#include <usb/driver.h>
+#include <usb/hc.h>
 #include <usbhc_iface.h>
 #include <usb_iface.h>
@@ -97 +97 @@
 
         return (int) iface_no;
-}
-
-/** Tell USB address assigned to given device.
- *
- * @param dev_handle Devman handle of the USB device in question.
- * @return USB address or negative error code.
- */
-usb_address_t usb_device_get_assigned_address(devman_handle_t dev_handle)
-{
-        int parent_phone = devman_parent_device_connect(dev_handle,
-            IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
-        sysarg_t address;
-
-        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS,
-            dev_handle, &address);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        async_hangup(parent_phone);
-
-        return (usb_address_t) address;
 }