Changeset beee81a in mainline for uspace/lib/usbvirt/src/ipc_hc.c

Timestamp:

2011-05-07T09:35:15Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bc02b83, d38d830

Parents:

42e2172

Message:

Virtual USB refactoring

Changes include

• add missing comments
• add function for virtual device disconnect
• fix memory leak
• support for bulks
• checking of input parameters

File:

• uspace/lib/usbvirt/src/ipc_hc.c (modified) (5 diffs)

uspace/lib/usbvirt/src/ipc_hc.c

@@ -54 +54 @@
  * @return Error code.
  */
-int usbvirt_ipc_send_control_read(int phone, usb_endpoint_t ep,
+int usbvirt_ipc_send_control_read(int phone,
     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 (phone < 0) {
+                return EINVAL;
+        }
+        if ((setup_buffer == NULL) || (setup_buffer_size == 0)) {
+                return EINVAL;
+        }
+        if ((data_buffer == NULL) || (data_buffer_size == 0)) {
+                return EINVAL;
+        }
+
+        aid_t opening_request = async_send_0(phone,
+            IPC_M_USBVIRT_CONTROL_READ, NULL);
         if (opening_request == 0) {
                 return ENOMEM;
@@ -98 +108 @@
         }
 
-        *data_transfered_size = IPC_GET_ARG2(data_request_call);
+        if (data_transfered_size != NULL) {
+                *data_transfered_size = IPC_GET_ARG2(data_request_call);
+        }
 
         return EOK;
@@ -113 +125 @@
  * @return Error code.
  */
-int usbvirt_ipc_send_control_write(int phone, usb_endpoint_t ep,
+int usbvirt_ipc_send_control_write(int phone,
     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 (phone < 0) {
+                return EINVAL;
+        }
+        if ((setup_buffer == NULL) || (setup_buffer_size == 0)) {
+                return EINVAL;
+        }
+        if ((data_buffer_size > 0) && (data_buffer == NULL)) {
+                return EINVAL;
+        }
+
+        aid_t opening_request = async_send_1(phone,
+            IPC_M_USBVIRT_CONTROL_WRITE, data_buffer_size,  NULL);
         if (opening_request == 0) {
                 return ENOMEM;
@@ -159 +181 @@
     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;
-        }
+        if (phone < 0) {
+                return EINVAL;
+        }
+        usbvirt_hc_to_device_method_t method;
+        switch (tr_type) {
+        case USB_TRANSFER_INTERRUPT:
+                method = IPC_M_USBVIRT_INTERRUPT_IN;
+                break;
+        case USB_TRANSFER_BULK:
+                method = IPC_M_USBVIRT_BULK_IN;
+                break;
+        default:
+                return EINVAL;
+        }
+        if ((ep <= 0) || (ep >= USBVIRT_ENDPOINT_MAX)) {
+                return EINVAL;
+        }
+        if ((data == NULL) || (data_size == 0)) {
+                return EINVAL;
+        }
+
+
+        aid_t opening_request = async_send_2(phone, method, ep, tr_type, NULL);
+        if (opening_request == 0) {
+                return ENOMEM;
+        }
+
 
         ipc_call_t data_request_call;
@@ -210 +254 @@
     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 (phone < 0) {
+                return EINVAL;
+        }
+        usbvirt_hc_to_device_method_t method;
+        switch (tr_type) {
+        case USB_TRANSFER_INTERRUPT:
+                method = IPC_M_USBVIRT_INTERRUPT_OUT;
+                break;
+        case USB_TRANSFER_BULK:
+                method = IPC_M_USBVIRT_BULK_OUT;
+                break;
+        default:
+                return EINVAL;
+        }
+        if ((ep <= 0) || (ep >= USBVIRT_ENDPOINT_MAX)) {
+                return EINVAL;
+        }
+        if ((data == NULL) || (data_size == 0)) {
+                return EINVAL;
+        }
+
+        aid_t opening_request = async_send_1(phone, method, ep, NULL);
         if (opening_request == 0) {
                 return ENOMEM;