Changeset db71e2a in mainline for kernel/test/print/print4.c

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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:

merge mainline changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• kernel/test/print/print4.c (modified) (2 diffs)

kernel/test/print/print4.c

@@ -36 +36 @@
         uint8_t group;
         for (group = 1; group < 4; group++) {
-                TPRINTF("%#" PRIx8 ": ", group << 5);
+                TPRINTF("%#x: ", group << 5);
                 
                 uint8_t index;
@@ -52 +52 @@
         
         for (group = 4; group < 8; group++) {
-                TPRINTF("%#" PRIx8 ": ", group << 5);
+                TPRINTF("%#x: ", group << 5);
                 
                 uint8_t index;