Changeset 92574f4 in mainline for uspace/drv/vhc/devices.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/devices.c (modified) (5 diffs)

uspace/drv/vhc/devices.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>
@@ -113 +112 @@
  * @param transaction Transaction to be sent over the bus.
  */
-usb_transaction_outcome_t virtdev_send_to_all(transaction_t *transaction)
+int virtdev_send_to_all(transaction_t *transaction)
 {
         /* For easier debugging. */
@@ -127 +126 @@
                         assert(false && "unreachable branch in switch()");
         }
-        usb_transaction_outcome_t outcome = USB_OUTCOME_BABBLE;
+        int outcome = EBADCHECKSUM;
 
         link_t *pos;
@@ -186 +185 @@
                  */
                 if (rc == EOK) {
-                        outcome = USB_OUTCOME_OK;
+                        outcome = EOK;
                 }
         }
@@ -222 +221 @@
                                 break;
                 }
-                outcome = USB_OUTCOME_OK;
+                outcome = EOK;
         }