Changeset 76daaf9f in mainline for uspace/drv/vhc/hc.c

Timestamp:

2010-12-13T14:33:23Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d5e7668

Parents:

7feeb84

Message:

Virtual HC remembers transfer type as well

File:

• uspace/drv/vhc/hc.c (modified) (5 diffs)

uspace/drv/vhc/hc.c

@@ -68 +68 @@
 static link_t transaction_list;
 
-#define TRANSACTION_FORMAT "T[%d:%d %s (%d)]"
+#define TRANSACTION_FORMAT "T[%d.%d %s/%s (%d)]"
 #define TRANSACTION_PRINTF(t) \
         (t).target.address, (t).target.endpoint, \
+        usb_str_transfer_type((t).transfer_type), \
         usbvirt_str_transaction_type((t).type), \
         (int)(t).len
@@ -143 +144 @@
  */
 static transaction_t *transaction_create(usbvirt_transaction_type_t type,
-    usb_target_t target,
+    usb_target_t target, usb_transfer_type_t transfer_type,
     void * buffer, size_t len,
     hc_transaction_done_callback_t callback, void * arg)
@@ -151 +152 @@
         list_initialize(&transaction->link);
         transaction->type = type;
+        transaction->transfer_type = transfer_type;
         transaction->target = target;
         transaction->buffer = buffer;
@@ -166 +168 @@
  */
 void hc_add_transaction_to_device(bool setup, usb_target_t target,
+    usb_transfer_type_t transfer_type,
     void * buffer, size_t len,
     hc_transaction_done_callback_t callback, void * arg)
 {
         transaction_t *transaction = transaction_create(
-            setup ? USBVIRT_TRANSACTION_SETUP : USBVIRT_TRANSACTION_OUT, target,
+            setup ? USBVIRT_TRANSACTION_SETUP : USBVIRT_TRANSACTION_OUT,
+            target, transfer_type,
             buffer, len, callback, arg);
         list_append(&transaction->link, &transaction_list);
@@ -178 +182 @@
  */
 void hc_add_transaction_from_device(usb_target_t target,
+    usb_transfer_type_t transfer_type,
     void * buffer, size_t len,
     hc_transaction_done_callback_t callback, void * arg)
 {
         transaction_t *transaction = transaction_create(USBVIRT_TRANSACTION_IN,
-            target, buffer, len, callback, arg);
+            target, transfer_type,
+            buffer, len, callback, arg);
         list_append(&transaction->link, &transaction_list);
 }