Changeset 7a7bfeb3 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/conndev.c

Timestamp:

2010-10-24T16:43:40Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

355f7c2

Parents:

b8a3cda

Message:

Virtual USB overhaul almost complete

The virtual HC, hub and keyboard are rewritten after changes to HCD API.
Comments will be added later.

File:

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

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

@@ -42 +42 @@
 #include "hub.h"
 
-/** Handle data from device to host.
- */
-static void handle_data_from_device(ipc_callid_t iid, ipc_call_t icall,
-    virtdev_connection_t *dev)
-{
-        usb_target_t target = {
-                .address = IPC_GET_ARG1(icall),
-                .endpoint = IPC_GET_ARG2(icall)
-        };
-        size_t len = IPC_GET_ARG3(icall);
-        
-        if (!hub_can_device_signal(dev)) {
-                ipc_answer_0(iid, EREFUSED);
-                return;
-        }
-        
-        dprintf("data from device %d [%d.%d]", dev->id,
-            target.address, target.endpoint);
-        
-        int rc;
-        
-        void * buffer = NULL;
-        if (len > 0) {
-                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(target, buffer, len);
-        
-        ipc_answer_0(iid, rc);
-}
-
 /** Connection handler for communcation with virtual device.
  *
@@ -110 +72 @@
                                 break;
                         
-                        case IPC_M_USBVIRT_DATA_FROM_DEVICE:
-                                handle_data_from_device(callid, call, dev);
-                                break;
-                        
                         default:
                                 ipc_answer_0(callid, EINVAL);