Changes in uspace/lib/usb/src/hc.c [77ad86c:8e5ce07] in mainline

File:

• uspace/lib/usb/src/hc.c (modified) (6 diffs)

uspace/lib/usb/src/hc.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
- * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -34 +33 @@
  * General communication with host controller driver (implementation).
  */
-
+#include <devman.h>
+#include <async.h>
+#include <dev_iface.h>
+#include <usb_iface.h>
+#include <usbhc_iface.h>
+#include <usb/hc.h>
 #include <usb/debug.h>
-
+#include <errno.h>
 #include <assert.h>
-#include <errno.h>
-#include <usbhc_iface.h>
-#include <usb/dev.h>
-#include <usb/hc.h>
-
-static int usb_hc_connection_add_ref(usb_hc_connection_t *connection)
-{
-        assert(connection);
-        
-        fibril_mutex_lock(&connection->guard);
-        if (connection->ref_count == 0) {
-                assert(connection->hc_sess == NULL);
-                /* Parallel exchange for us */
-                connection->hc_sess = devman_device_connect(EXCHANGE_PARALLEL,
-                        connection->hc_handle, 0);
-                if (!connection->hc_sess) {
-                        fibril_mutex_unlock(&connection->guard);
-                        return ENOMEM;
-                }
-        }
-        
-        ++connection->ref_count;
-        fibril_mutex_unlock(&connection->guard);
-        return EOK;
-}
-
-static int usb_hc_connection_del_ref(usb_hc_connection_t *connection)
-{
-        assert(connection);
-        
-        fibril_mutex_lock(&connection->guard);
-        if (connection->ref_count == 0) {
-                /* Closing already closed connection... */
-                assert(connection->hc_sess == NULL);
-                fibril_mutex_unlock(&connection->guard);
-                return EOK;
-        }
-        
-        --connection->ref_count;
-        int ret = EOK;
-        if (connection->ref_count == 0) {
-                assert(connection->hc_sess);
-                ret = async_hangup(connection->hc_sess);
-                connection->hc_sess = NULL;
-        }
-        fibril_mutex_unlock(&connection->guard);
-        return ret;
-}
-
-#define EXCH_INIT(connection, exch) \
-do { \
-        exch = NULL; \
-        if (!connection) \
-                return EBADMEM; \
-        const int ret = usb_hc_connection_add_ref(connection); \
-        if (ret != EOK) \
-                return ret; \
-        exch = async_exchange_begin(connection->hc_sess); \
-        if (exch == NULL) { \
-                usb_hc_connection_del_ref(connection); \
-                return ENOMEM; \
-        } \
-} while (0)
-
-#define EXCH_FINI(connection, exch) \
-if (exch) { \
-        async_exchange_end(exch); \
-        usb_hc_connection_del_ref(connection); \
-} else (void)0
 
 /** Initialize connection to USB host controller.
@@ -124 +59 @@
 
         devman_handle_t hc_handle;
-        const int rc = usb_get_hc_by_handle(device->handle, &hc_handle);
-        if (rc == EOK) {
-                usb_hc_connection_initialize(connection, hc_handle);
-        }
+        int rc = usb_hc_find(device->handle, &hc_handle);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_hc_connection_initialize(connection, hc_handle);
 
         return rc;
 }
 
-void usb_hc_connection_deinitialize(usb_hc_connection_t *connection)
-{
-        assert(connection);
-        fibril_mutex_lock(&connection->guard);
-        if (connection->ref_count != 0) {
-                usb_log_warning("%u stale reference(s) to HC connection.\n",
-                    connection->ref_count);
-                assert(connection->hc_sess);
-                async_hangup(connection->hc_sess);
-                connection->hc_sess = NULL;
-                connection->ref_count = 0;
-        }
-        fibril_mutex_unlock(&connection->guard);
+/** Manually initialize connection to USB host controller.
+ *
+ * @param connection Connection to be initialized.
+ * @param hc_handle Devman handle of the host controller.
+ * @return Error code.
+ */
+int usb_hc_connection_initialize(usb_hc_connection_t *connection,
+    devman_handle_t hc_handle)
+{
+        assert(connection);
+
+        connection->hc_handle = hc_handle;
+        connection->hc_sess = NULL;
+
+        return EOK;
 }
 
@@ -154 +93 @@
 int usb_hc_connection_open(usb_hc_connection_t *connection)
 {
-        return usb_hc_connection_add_ref(connection);
+        assert(connection);
+        
+        if (usb_hc_connection_is_opened(connection))
+                return EBUSY;
+        
+        async_sess_t *sess = devman_device_connect(EXCHANGE_ATOMIC,
+            connection->hc_handle, 0);
+        if (!sess)
+                return ENOMEM;
+        
+        connection->hc_sess = sess;
+        return EOK;
+}
+
+/** Tells whether connection to host controller is opened.
+ *
+ * @param connection Connection to the host controller.
+ * @return Whether connection is opened.
+ */
+bool usb_hc_connection_is_opened(const usb_hc_connection_t *connection)
+{
+        assert(connection);
+        return (connection->hc_sess != NULL);
 }
 
@@ -164 +125 @@
 int usb_hc_connection_close(usb_hc_connection_t *connection)
 {
-        return usb_hc_connection_del_ref(connection);
-}
-
-/** Ask host controller for free address assignment.
- *
- * @param connection Opened connection to host controller.
- * @param preferred Preferred SUB address.
- * @param strict Fail if the preferred address is not avialable.
- * @param speed Speed of the new device (device that will be assigned
- *    the returned address).
- * @return Assigned USB address or negative error code.
- */
-usb_address_t usb_hc_request_address(usb_hc_connection_t *connection,
-    usb_address_t preferred, bool strict, usb_speed_t speed)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        usb_address_t address = preferred;
-        const int ret = usbhc_request_address(exch, &address, strict, speed);
-
-        EXCH_FINI(connection, exch);
-        return ret == EOK ? address : ret;
-}
-
-int usb_hc_bind_address(usb_hc_connection_t * connection,
-    usb_address_t address, devman_handle_t handle)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret = usbhc_bind_address(exch, address, handle);
-
-        EXCH_FINI(connection, exch);
-        return ret;
+        assert(connection);
+
+        if (!usb_hc_connection_is_opened(connection)) {
+                return ENOENT;
+        }
+
+        int rc = async_hangup(connection->hc_sess);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        connection->hc_sess = NULL;
+
+        return EOK;
 }
 
@@ -211 +151 @@
     usb_address_t address, devman_handle_t *handle)
 {
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret = usbhc_get_handle(exch, address, handle);
-
-        EXCH_FINI(connection, exch);
-        return ret;
-}
-
-int usb_hc_release_address(usb_hc_connection_t *connection,
-    usb_address_t address)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret = usbhc_release_address(exch, address);
-
-        EXCH_FINI(connection, exch);
-        return ret;
-}
-
-int usb_hc_register_endpoint(usb_hc_connection_t *connection,
-    usb_address_t address, usb_endpoint_t endpoint, usb_transfer_type_t type,
-    usb_direction_t direction, size_t packet_size, unsigned interval)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret = usbhc_register_endpoint(exch, address, endpoint,
-            type, direction, packet_size, interval);
-
-        EXCH_FINI(connection, exch);
-        return ret;
-}
-
-int usb_hc_unregister_endpoint(usb_hc_connection_t *connection,
-    usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret =
-            usbhc_unregister_endpoint(exch, address, endpoint, direction);
-
-        EXCH_FINI(connection, exch);
-        return ret;
-}
-
-int usb_hc_read(usb_hc_connection_t *connection, usb_address_t address,
-    usb_endpoint_t endpoint, uint64_t setup, void *data, size_t size,
-    size_t *real_size)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret =
-            usbhc_read(exch, address, endpoint, setup, data, size, real_size);
-
-        EXCH_FINI(connection, exch);
-        return ret;
-}
-
-int usb_hc_write(usb_hc_connection_t *connection, usb_address_t address,
-    usb_endpoint_t endpoint, uint64_t setup, const void *data, size_t size)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret = usbhc_write(exch, address, endpoint, setup, data, size);
-
-        EXCH_FINI(connection, exch);
-        return ret;
+        if (!usb_hc_connection_is_opened(connection))
+                return ENOENT;
+        
+        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
+        
+        sysarg_t tmp;
+        int rc = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
+            address, &tmp);
+        
+        async_exchange_end(exch);
+        
+        if ((rc == EOK) && (handle != NULL))
+                *handle = tmp;
+        
+        return rc;
+}
+
+/** 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_hc_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);
+        
+        sysarg_t address;
+        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_ADDRESS,
+            dev_handle, &address);
+        
+        async_exchange_end(exch);
+        async_hangup(parent_sess);
+        
+        if (rc != EOK)
+                return rc;
+        
+        return (usb_address_t) address;
+}
+
+
+/** Get host controller handle by its class index.
+ *
+ * @param sid Service ID of the HC function.
+ * @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_sid(service_id_t sid, devman_handle_t *hc_handle)
+{
+        devman_handle_t handle;
+        int rc;
+        
+        rc = devman_fun_sid_to_handle(sid, &handle);
+        if (hc_handle != NULL)
+                *hc_handle = handle;
+        
+        return rc;
+}
+
+/** 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)
+{
+        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);
+        
+        devman_handle_t h;
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
+        
+        async_exchange_end(exch);
+        async_hangup(parent_sess);
+        
+        if (rc != EOK)
+                return rc;
+        
+        if (hc_handle != NULL)
+                *hc_handle = h;
+        
+        return EOK;
 }