Changeset c4ba29c7 in mainline for uspace/drv/vhc/connhost.c

Timestamp:

2010-11-21T22:51:16Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8f62b0f

Parents:

4d31d58

Message:

Virtual host controller works again

Added correct implementation of transfer_ops, thus making VHC ready
to be used with the hcdhubd mini-framework.

File:

• uspace/drv/vhc/connhost.c (modified) (4 diffs)

uspace/drv/vhc/connhost.c

@@ -41 +41 @@
 #include "hc.h"
 
+typedef struct {
+        usb_direction_t direction;
+        usb_hcd_transfer_callback_out_t out_callback;
+        usb_hcd_transfer_callback_in_t in_callback;
+        usb_hc_device_t *hc;
+        void *arg;
+} transfer_info_t;
+
+static void universal_callback(void *buffer, size_t size,
+    usb_transaction_outcome_t outcome, void *arg)
+{
+        transfer_info_t *transfer = (transfer_info_t *) arg;
+
+        switch (transfer->direction) {
+                case USB_DIRECTION_IN:
+                        transfer->in_callback(transfer->hc,
+                            size, outcome,
+                            transfer->arg);
+                        break;
+                case USB_DIRECTION_OUT:
+                        transfer->out_callback(transfer->hc,
+                            outcome,
+                            transfer->arg);
+                        break;
+                default:
+                        assert(false && "unreachable");
+                        break;
+        }
+
+        free(transfer);
+}
+
+static transfer_info_t *create_transfer_info(usb_hc_device_t *hc,
+    usb_direction_t direction, void *arg)
+{
+        transfer_info_t *transfer = malloc(sizeof(transfer_info_t));
+
+        transfer->direction = direction;
+        transfer->in_callback = NULL;
+        transfer->out_callback = NULL;
+        transfer->arg = arg;
+        transfer->hc = hc;
+
+        return transfer;
+}
+
 static int enqueue_transfer_out(usb_hc_device_t *hc,
     usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *endpoint,
@@ -50 +96 @@
             usb_str_transfer_type(endpoint->transfer_type),
             size);
-        return ENOTSUP;
+
+        transfer_info_t *transfer
+            = create_transfer_info(hc, USB_DIRECTION_OUT, arg);
+        transfer->out_callback = callback;
+
+        usb_target_t target = {
+                .address = dev->address,
+                .endpoint = endpoint->endpoint
+        };
+
+        hc_add_transaction_to_device(false, target, buffer, size,
+            universal_callback, transfer);
+
+        return EOK;
 }
 
@@ -62 +121 @@
             usb_str_transfer_type(endpoint->transfer_type),
             size);
-        return ENOTSUP;
+
+        transfer_info_t *transfer
+            = create_transfer_info(hc, USB_DIRECTION_OUT, arg);
+        transfer->out_callback = callback;
+
+        usb_target_t target = {
+                .address = dev->address,
+                .endpoint = endpoint->endpoint
+        };
+
+        hc_add_transaction_to_device(true, target, buffer, size,
+            universal_callback, transfer);
+
+        return EOK;
 }
 
@@ -74 +146 @@
             usb_str_transfer_type(endpoint->transfer_type),
             size);
-        return ENOTSUP;
+
+        transfer_info_t *transfer
+            = create_transfer_info(hc, USB_DIRECTION_IN, arg);
+        transfer->in_callback = callback;
+
+        usb_target_t target = {
+                .address = dev->address,
+                .endpoint = endpoint->endpoint
+        };
+
+        hc_add_transaction_from_device(target, buffer, size,
+            universal_callback, transfer);
+
+        return EOK;
 }