Changeset 92574f4 in mainline for uspace/drv/vhc/hc.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/drv/vhc/hc.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>
@@ -90 +89 @@
  */
 static void process_transaction_with_outcome(transaction_t * transaction,
-    usb_transaction_outcome_t outcome)
+    int outcome)
 {
         usb_log_debug2("Transaction " TRANSACTION_FORMAT " done: %s.\n",
             TRANSACTION_PRINTF(*transaction),
-            usb_str_transaction_outcome(outcome));
+            str_error(outcome));
         
         transaction->callback(transaction->buffer, transaction->actual_len,
@@ -128 +127 @@
                     TRANSACTION_PRINTF(*transaction), ports);
 
-                usb_transaction_outcome_t outcome;
+                int outcome;
                 outcome = virtdev_send_to_all(transaction);