Changeset ca07cd3 in mainline for uspace/lib/usbvirt/transaction.c

Timestamp:

2010-10-25T13:23:33Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

23cb44b

Parents:

355f7c2

Message:

Code cleanup, various bugfixes

The internal functions of virtual device framework always get
device structure as parameter, thus possible enabling more devices
within single task (that is not possible because currently there
is no way to pass extra argument into callback_connection()).

Also, added some missing comments and completely removed the device
id nonsense (devices can send their descriptors and the hub is able
to enable/disable its ports).

File:

• uspace/lib/usbvirt/transaction.c (modified) (10 diffs)

uspace/lib/usbvirt/transaction.c

@@ -38 +38 @@
 #include <mem.h>
 
-#include "ids.h"
+#include "hub.h"
 #include "private.h"
 
-static usb_direction_t setup_transaction_direction(usb_endpoint_t, void *, size_t);
-static void process_control_transfer(usb_endpoint_t, usbvirt_control_transfer_t *);
+static usb_direction_t setup_transaction_direction(usbvirt_device_t *,
+    usb_endpoint_t, void *, size_t);
+static void process_control_transfer(usbvirt_device_t *,
+    usb_endpoint_t, usbvirt_control_transfer_t *);
 
 /** Convert virtual USB transaction type to string.
@@ -60 +62 @@
 }
 
+/** SETUP transaction handling.
+ * The setup transaction only prepares control transfer on given endpoint.
+ */
 int transaction_setup(usbvirt_device_t *device, usb_endpoint_t endpoint,
     void *buffer, size_t size)
@@ -72 +77 @@
         }
         
-        transfer->direction = setup_transaction_direction(endpoint,
+        transfer->direction = setup_transaction_direction(device, endpoint,
             buffer, size);
         transfer->request = buffer;
@@ -79 +84 @@
         transfer->data_size = 0;
         
+        if (transfer->direction == USB_DIRECTION_IN) {
+                process_control_transfer(device, endpoint, transfer);
+        }
+        
         return EOK;
 }
 
+/** OUT transaction handling.
+ * The OUT transaction can trigger processing of a control transfer.
+ */
 int transaction_out(usbvirt_device_t *device, usb_endpoint_t endpoint,
     void *buffer, size_t size)
@@ -133 +145 @@
 }
 
+/** IN transaction handling.
+ * The IN transaction can trigger processing of a control transfer.
+ */
 int transaction_in(usbvirt_device_t *device, usb_endpoint_t endpoint,
     void *buffer, size_t size, size_t *data_size)
@@ -145 +160 @@
                          * This means end of input data.
                          */
-                        process_control_transfer(endpoint, transfer);
+                        process_control_transfer(device, endpoint, transfer);
                 } else {
                         /*
@@ -151 +166 @@
                          * of the buffer.
                          */
-                        // TODO: implement
+                        // FIXME: handle when the HC wants the data back
+                        // in more chunks
+                        size_t actual_size = 0;
+                        if (transfer->data) {
+                                actual_size = transfer->data_size;
+                        }
+                        if (actual_size > size) {
+                                actual_size = size;
+                        }
+                        if (actual_size > 0) {
+                                memcpy(buffer, transfer->data, actual_size);
+                                if (data_size) {
+                                        *data_size = actual_size;
+                                }
+                        }
                 }
                 
@@ -170 +199 @@
 }
 
-
-static usb_direction_t setup_transaction_direction(usb_endpoint_t endpoint,
+/** Determine direction of control transfer.
+ * First, try the user provided callback, otherwise guess, believing that
+ * it uses the same format as control pipe 0.
+ */
+static usb_direction_t setup_transaction_direction(usbvirt_device_t *device,
+    usb_endpoint_t endpoint,
     void *data, size_t size)
 {
@@ -202 +235 @@
 }
 
-static void process_control_transfer(usb_endpoint_t endpoint,
+/** Process control transfer.
+ */
+static void process_control_transfer(usbvirt_device_t *device,
+    usb_endpoint_t endpoint,
     usbvirt_control_transfer_t *transfer)
 {
@@ -213 +249 @@
         if (rc == EFORWARD) {
                 if (endpoint == 0) {
-                        rc = control_pipe(transfer);
+                        rc = control_pipe(device, transfer);
                 }
         }