Changeset a045ab1 in mainline

Timestamp:

2011-12-11T13:55:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2c202c5

Parents:

6df14c5

Message:

libusb: Move USB dev functions to separate header/source file

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/dev.h (added)
• include/usb/hc.h (modified) (1 diff)
• include/usb/usb.h (modified) (1 diff)
• src/ddfiface.c (modified) (2 diffs)
• src/dev.c (added)
• src/hc.c (modified) (2 diffs)
• src/resolve.c (modified) (2 diffs)

uspace/lib/usb/Makefile

@@ -37 +37 @@
         src/class.c \
         src/ddfiface.c \
+        src/dev.c \
         src/debug.c \
         src/dump.c \

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

@@ -114 +114 @@
 }
 
-usb_address_t usb_get_address_by_handle(devman_handle_t);
-
-int usb_find_hc(devman_handle_t, devman_handle_t *);
-
-int usb_resolve_device_handle(const char *, devman_handle_t *, usb_address_t *,
-    devman_handle_t *);
-
 int usb_ddf_get_hc_handle_by_sid(service_id_t, devman_handle_t *);
 

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup libusb
  * @{

uspace/lib/usb/src/ddfiface.c

@@ -43 +43 @@
 #include <errno.h>
 #include <assert.h>
+
+#include <usb/dev.h>
 
 /** DDF interface for USB device, implementation for typical hub. */
@@ -134 +136 @@
         assert(fun);
         assert(fun->driver_data);
-        usb_hub_attached_device_t *device = fun->driver_data;
+        const usb_hub_attached_device_t *device = fun->driver_data;
         assert(device->fun == fun);
         if (address)

uspace/lib/usb/src/hc.c

@@ -37 +37 @@
 #include <async.h>
 #include <dev_iface.h>
-#include <usb_iface.h>
 #include <usbhc_iface.h>
 #include <usb/hc.h>
 #include <usb/debug.h>
+#include <usb/dev.h>
 #include <errno.h>
 #include <assert.h>
@@ -288 +288 @@
         return ret;
 }
-/*----------------------------------------------------------------------------*/
-/** Tell USB address assigned to device with given handle.
- *
- * @param dev_handle Devman handle of the USB device in question.
- * @return USB address or negative error code.
- */
-usb_address_t usb_get_address_by_handle(devman_handle_t dev_handle)
-{
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_ATOMIC, dev_handle,
-            IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-
-        async_exch_t *exch = async_exchange_begin(parent_sess);
-        if (!exch) {
-                async_hangup(parent_sess);
-                return ENOMEM;
-        }
-        usb_address_t address;
-        const int ret = usb_get_my_address(exch, &address);
-
-        async_exchange_end(exch);
-        async_hangup(parent_sess);
-
-        if (ret != EOK)
-                return ret;
-
-        return address;
-}
-
-/** Find host controller handle for the 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_find_hc(devman_handle_t device_handle, devman_handle_t *hc_handle)
-{
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_ATOMIC, device_handle,
-            IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-
-        async_exch_t *exch = async_exchange_begin(parent_sess);
-        if (!exch) {
-                async_hangup(parent_sess);
-                return ENOMEM;
-        }
-        const int ret = usb_get_hc_handle(exch, hc_handle);
-
-        async_exchange_end(exch);
-        async_hangup(parent_sess);
-
-        return ret;
-}
 
 /**

uspace/lib/usb/src/resolve.c

@@ -34 +34 @@
  */
 #include <inttypes.h>
+#include <usb/dev.h>
 #include <usb/hc.h>
 #include <devman.h>
@@ -77 +78 @@
     devman_handle_t *dev_handle)
 {
-        int rc;
         usb_hc_connection_t conn;
-
         usb_hc_connection_initialize(&conn, hc_handle);
-        rc = usb_hc_connection_open(&conn);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        rc = usb_hc_get_handle_by_address(&conn, addr, dev_handle);
-
-        usb_hc_connection_close(&conn);
+
+        const int rc = usb_hc_get_handle_by_address(&conn, addr, dev_handle);
 
         return rc;