Changeset bc9a629 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/hcd.c

Timestamp:

2010-10-10T09:00:53Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b371844

Parents:

4bc309b

Message:

Start work on virtual USB keyboard

The virtual HC(D) is now able to serve as HCD towards central USB driver
as well as virtual HC towards virtual devices.

Each device is a separate task that communicates with VHCD through simple
protocol.

Will clean and comment the code in next revisions. Promise.

File:

• uspace/srv/hw/bus/usb/hcd/virtual/hcd.c (modified) (7 diffs)

uspace/srv/hw/bus/usb/hcd/virtual/hcd.c

@@ -45 +45 @@
 
 #include <usb/hcd.h>
+#include <usb/virtdev.h>
 #include "vhcd.h"
 #include "hc.h"
+#include "devices.h"
 
 static usb_transaction_handle_t g_handle_seed = 1;
@@ -61 +63 @@
 static void out_callback(void * buffer, size_t len, usb_transaction_outcome_t outcome, void * arg)
 {
+        dprintf("out_callback(buffer, %u, %d, %p)", len, outcome, arg);
         (void)len;
         transaction_details_t * trans = (transaction_details_t *)arg;
@@ -72 +75 @@
 static void in_callback(void * buffer, size_t len, usb_transaction_outcome_t outcome, void * arg)
 {
+        dprintf("in_callback(buffer, %u, %d, %p)", len, outcome, arg);
         transaction_details_t * trans = (transaction_details_t *)arg;
         
@@ -140 +144 @@
         
         dprintf("adding transaction to HC", NAME);
-        hc_add_out_transaction(transf_type, target,
+        hc_add_transaction_to_device(transf_type, target,
             buffer, len,
             out_callback, trans);
@@ -176 +180 @@
         
         dprintf("adding transaction to HC", NAME);
-        hc_add_in_transaction(transf_type, target,
+        hc_add_transaction_from_device(transf_type, target,
             buffer, len,
             in_callback, trans);
@@ -184 +188 @@
 }
 
+static void handle_data_from_device(ipc_callid_t iid, ipc_call_t icall, virtdev_connection_t *dev)
+{
+        usb_endpoint_t endpoint = IPC_GET_ARG1(icall);
+        usb_target_t target = {
+                .address = dev->address,
+                .endpoint = endpoint
+        };
+        size_t len;
+        void * buffer;
+        int rc = async_data_write_accept(&buffer, false,
+            1, USB_MAX_PAYLOAD_SIZE,
+            0, &len);
+        
+        if (rc != EOK) {
+                ipc_answer_0(iid, rc);
+                return;
+        }
+        
+        rc = hc_fillin_transaction_from_device(USB_TRANSFER_INTERRUPT, target, buffer, len);
+        
+        ipc_answer_0(iid, rc);
+}
+
+static virtdev_connection_t *recognise_device(int id, int callback_phone)
+{
+        switch (id) {
+                case USB_VIRTDEV_KEYBOARD_ID:
+                        return virtdev_add_device(
+                            USB_VIRTDEV_KEYBOARD_ADDRESS, callback_phone);
+                default:
+                        return NULL;
+        }               
+}
+
+static void device_client_connection(int callback_phone, int device_id)
+{
+        virtdev_connection_t *dev = recognise_device(device_id, callback_phone);
+        if (!dev) {
+                if (callback_phone != -1) {
+                        ipc_hangup(callback_phone);
+                }
+                return;
+        }
+        dprintf("device %d connected", device_id);
+        while (true) {
+                ipc_callid_t callid; 
+                ipc_call_t call; 
+                
+                callid = async_get_call(&call);
+                
+                switch (IPC_GET_METHOD(call)) {
+                        case IPC_M_PHONE_HUNGUP:
+                                if (callback_phone != -1) {
+                                        ipc_hangup(callback_phone);
+                                }
+                                ipc_answer_0(callid, EOK);
+                                dprintf("hung-up on device %d", device_id);
+                                virtdev_destroy_device(dev);
+                                return;
+                        case IPC_M_CONNECT_TO_ME:
+                                ipc_answer_0(callid, ELIMIT);
+                                break;
+                        case IPC_M_USB_VIRTDEV_DATA_FROM_DEVICE:
+                                dprintf("data from device %d", device_id);
+                                handle_data_from_device(callid, call, dev);
+                                break;
+                        default:
+                                ipc_answer_0(callid, EINVAL);
+                                break;
+                }
+        }
+}
 
 static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
@@ -216 +292 @@
                                         ipc_answer_0(callid, EOK);
                                 }
+                                if (IPC_GET_ARG1(call) == 1) {
+                                        /* Virtual device was just connected
+                                         * to us. This is handled elsewhere.
+                                         */
+                                        device_client_connection(callback_phone,
+                                            IPC_GET_ARG2(call));
+                                        return;
+                                }
                                 break;