Changeset e25a849 in mainline

Timestamp:

2011-05-06T15:50:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

42e2172

Parents:

dc06caa

Message:

libusbvirt: split IPC wrappers into more files

Location:

uspace/lib/usbvirt

Files:

• Makefile (modified) (1 diff)
• src/device.c (added)
• src/ipc_dev.c (moved) (moved from uspace/lib/usbvirt/src/ipc.c ) (3 diffs)
• src/ipc_hc.c (added)

uspace/lib/usbvirt/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        src/ipc.c \
         src/ctrltransfer.c \
+        src/device.c \
+        src/ipc_dev.c \
+        src/ipc_hc.c \
         src/stdreq.c \
         src/transfer.c

uspace/lib/usbvirt/src/ipc_dev.c

@@ -31 +31 @@
  */
 /** @file
- *
+ * IPC wrappers, device side.
  */
 #include <errno.h>
@@ -41 +41 @@
 #include <usbvirt/device.h>
 #include <usbvirt/ipc.h>
-
 #include <usb/debug.h>
-
-static usbvirt_device_t *DEV = NULL;
 
 static void ipc_get_name(usbvirt_device_t *dev,
@@ -248 +245 @@
 }
 
-static void callback_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-        assert(DEV != NULL);
-
-        async_answer_0(iid, EOK);
-
-        while (true) {
-                ipc_callid_t callid;
-                ipc_call_t call;
-
-                callid = async_get_call(&call);
-                bool processed = usbvirt_ipc_handle_call(DEV, callid, &call);
-                if (!processed) {
-                        switch (IPC_GET_IMETHOD(call)) {
-                                case IPC_M_PHONE_HUNGUP:
-                                        async_answer_0(callid, EOK);
-                                        return;
-                                default:
-                                        async_answer_0(callid, EINVAL);
-                                        break;
-                        }
-                }
-        }
-}
-
-/** Connect the device to the virtual host controller.
- *
- * @param dev The virtual device to be (virtually) plugged in.
- * @param vhc_path Devman path to the virtual host controller.
- * @return Error code.
- */
-int usbvirt_device_plug(usbvirt_device_t *dev, const char *vhc_path)
-{
-        int rc;
-        devman_handle_t handle;
-
-        rc = devman_device_get_handle(vhc_path, &handle, 0);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        int hcd_phone = devman_device_connect(handle, 0);
-
-        if (hcd_phone < 0) {
-                return hcd_phone;
-        }
-
-        DEV = dev;
-
-        rc = async_connect_to_me(hcd_phone, 0, 0, 0, callback_connection);
-        if (rc != EOK) {
-                DEV = NULL;
-                return rc;
-        }
-
-
-
-        return EOK;
-}
-
-
-
-int usbvirt_ipc_send_control_read(int phone, usb_endpoint_t ep,
-    void *setup_buffer, size_t setup_buffer_size,
-    void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
-{
-        aid_t opening_request = async_send_1(phone,
-            IPC_M_USBVIRT_CONTROL_READ, ep, NULL);
-        if (opening_request == 0) {
-                return ENOMEM;
-        }
-
-        int rc = async_data_write_start(phone,
-            setup_buffer, setup_buffer_size);
-        if (rc != EOK) {
-                async_wait_for(opening_request, NULL);
-                return rc;
-        }
-
-        ipc_call_t data_request_call;
-        aid_t data_request = async_data_read(phone,
-            data_buffer, data_buffer_size,
-            &data_request_call);
-
-        if (data_request == 0) {
-                async_wait_for(opening_request, NULL);
-                return ENOMEM;
-        }
-
-        sysarg_t data_request_rc;
-        sysarg_t opening_request_rc;
-        async_wait_for(data_request, &data_request_rc);
-        async_wait_for(opening_request, &opening_request_rc);
-
-        if (data_request_rc != EOK) {
-                /* Prefer the return code of the opening request. */
-                if (opening_request_rc != EOK) {
-                        return (int) opening_request_rc;
-                } else {
-                        return (int) data_request_rc;
-                }
-        }
-        if (opening_request_rc != EOK) {
-                return (int) opening_request_rc;
-        }
-
-        *data_transfered_size = IPC_GET_ARG2(data_request_call);
-
-        return EOK;
-}
-
-int usbvirt_ipc_send_control_write(int phone, usb_endpoint_t ep,
-    void *setup_buffer, size_t setup_buffer_size,
-    void *data_buffer, size_t data_buffer_size)
-{
-        aid_t opening_request = async_send_2(phone,
-            IPC_M_USBVIRT_CONTROL_WRITE, ep, data_buffer_size,  NULL);
-        if (opening_request == 0) {
-                return ENOMEM;
-        }
-
-        int rc = async_data_write_start(phone,
-            setup_buffer, setup_buffer_size);
-        if (rc != EOK) {
-                async_wait_for(opening_request, NULL);
-                return rc;
-        }
-
-        if (data_buffer_size > 0) {
-                rc = async_data_write_start(phone,
-                    data_buffer, data_buffer_size);
-
-                if (rc != EOK) {
-                        async_wait_for(opening_request, NULL);
-                        return rc;
-                }
-        }
-
-        sysarg_t opening_request_rc;
-        async_wait_for(opening_request, &opening_request_rc);
-
-        return (int) opening_request_rc;
-}
-
-int usbvirt_ipc_send_data_in(int phone, usb_endpoint_t ep,
-    usb_transfer_type_t tr_type, void *data, size_t data_size, size_t *act_size)
-{
-        aid_t opening_request = async_send_2(phone,
-            IPC_M_USBVIRT_INTERRUPT_IN, ep, tr_type, NULL);
-        if (opening_request == 0) {
-                return ENOMEM;
-        }
-
-        ipc_call_t data_request_call;
-        aid_t data_request = async_data_read(phone,
-            data, data_size,  &data_request_call);
-
-        if (data_request == 0) {
-                async_wait_for(opening_request, NULL);
-                return ENOMEM;
-        }
-
-        sysarg_t data_request_rc;
-        sysarg_t opening_request_rc;
-        async_wait_for(data_request, &data_request_rc);
-        async_wait_for(opening_request, &opening_request_rc);
-
-        if (data_request_rc != EOK) {
-                /* Prefer the return code of the opening request. */
-                if (opening_request_rc != EOK) {
-                        return (int) opening_request_rc;
-                } else {
-                        return (int) data_request_rc;
-                }
-        }
-        if (opening_request_rc != EOK) {
-                return (int) opening_request_rc;
-        }
-
-        if (act_size != NULL) {
-                *act_size = IPC_GET_ARG2(data_request_call);
-        }
-
-        return EOK;
-}
-
-int usbvirt_ipc_send_data_out(int phone, usb_endpoint_t ep,
-    usb_transfer_type_t tr_type, void *data, size_t data_size)
-{
-        aid_t opening_request = async_send_2(phone,
-            IPC_M_USBVIRT_INTERRUPT_OUT, ep, tr_type, NULL);
-        if (opening_request == 0) {
-                return ENOMEM;
-        }
-
-        int rc = async_data_write_start(phone,
-            data, data_size);
-        if (rc != EOK) {
-                async_wait_for(opening_request, NULL);
-                return rc;
-        }
-
-        sysarg_t opening_request_rc;
-        async_wait_for(opening_request, &opening_request_rc);
-
-        return (int) opening_request_rc;
-}
-
-
 /**
  * @}