Changeset 92574f4 in mainline for uspace/lib/usb/src/usb.c

Timestamp:

2011-02-24T12:03:27Z (15 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/lib/usb/src/usb.c (modified) (1 diff)

uspace/lib/usb/src/usb.c

@@ -54 +54 @@
 }
 
-/** String representation of USB transaction outcome. */
-const char * usb_str_transaction_outcome(usb_transaction_outcome_t o)
-{
-        switch (o) {
-                case USB_OUTCOME_OK:
-                        return "ok";
-                case USB_OUTCOME_CRCERROR:
-                        return "CRC error";
-                case USB_OUTCOME_BABBLE:
-                        return "babble";
-                default:
-                        return "unknown";
-        }
-}
-
-
 /**
  * @}