Changeset 7a7bfeb3 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/devices.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/devices.c (modified) (2 diffs)

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

@@ -126 +126 @@
                 aid_t req;
                 int rc = EOK;
-                
-                req = async_send_4(dev->phone,
-                    IPC_M_USBVIRT_DATA_TO_DEVICE,
+                int method = IPC_M_USBVIRT_TRANSACTION_SETUP;
+                
+                switch (transaction->type) {
+                        case USBVIRT_TRANSACTION_SETUP:
+                                method = IPC_M_USBVIRT_TRANSACTION_SETUP;
+                                break;
+                        case USBVIRT_TRANSACTION_IN:
+                                method = IPC_M_USBVIRT_TRANSACTION_IN;
+                                break;
+                        case USBVIRT_TRANSACTION_OUT:
+                                method = IPC_M_USBVIRT_TRANSACTION_OUT;
+                                break;
+                }
+                
+                req = async_send_3(dev->phone,
+                    method,
                     transaction->target.address,
                     transaction->target.endpoint,
-                    transaction->type,
                     transaction->len,
                     &answer_data);
                 
                 if (transaction->len > 0) {
-                        rc = async_data_write_start(dev->phone,
-                            transaction->buffer, transaction->len);
-                }
+                        if (transaction->type == USBVIRT_TRANSACTION_IN) {
+                                rc = async_data_read_start(dev->phone,
+                                    transaction->buffer, transaction->len);
+                        } else {
+                                rc = async_data_write_start(dev->phone,
+                                    transaction->buffer, transaction->len);
+                        }
+                }
+                
                 if (rc != EOK) {
                         async_wait_for(req, NULL);
@@ -152 +170 @@
          */
         if (virthub_dev.address == transaction->target.address) {
-                virthub_dev.receive_data(&virthub_dev, transaction->target.endpoint,
-                    transaction->buffer, transaction->len);
+                size_t tmp;
+                switch (transaction->type) {
+                        case USBVIRT_TRANSACTION_SETUP:
+                                virthub_dev.transaction_setup(&virthub_dev,
+                                    transaction->target.endpoint,
+                                    transaction->buffer, transaction->len);
+                                break;
+                                
+                        case USBVIRT_TRANSACTION_IN:
+                                virthub_dev.transaction_in(&virthub_dev,
+                                    transaction->target.endpoint,
+                                    transaction->buffer, transaction->len,
+                                    &tmp);
+                                if (tmp < transaction->len) {
+                                        transaction->len = tmp;
+                                }
+                                break;
+                                
+                        case USBVIRT_TRANSACTION_OUT:
+                                virthub_dev.transaction_out(&virthub_dev,
+                                    transaction->target.endpoint,
+                                    transaction->buffer, transaction->len);
+                                break;
+                }
         }