Changeset 8e7c9fe in mainline for uspace/lib/gpt/libgpt.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/gpt/libgpt.c (modified) (2 diffs)

uspace/lib/gpt/libgpt.c

@@ -707 +707 @@
 }
 
-/** Generate a new pseudo-random UUID
- *
- * FIXME: This UUID generator is not compliant with RFC 4122.
- *
- */
+/** Generate a new pseudo-random UUID compliant with RFC 4122 */
 void gpt_set_random_uuid(uint8_t *uuid)
 {
@@ -718 +714 @@
         for (size_t i = 0; i < 16; i++)
                 uuid[i] = random();
+
+        /* 
+         * Set version (stored in bits 4-7 of seventh byte) to 4 (random
+         * UUID) and bits 6 and 7 of ninth byte to 0 and 1 respectively -
+         * according to RFC 4122, section 4.4.
+         */
+        uuid[6] &= 0x0f;
+        uuid[6] |= (0x4 << 4);
+        uuid[8] &= 0x3f;
+        uuid[8] |= (1 << 7);
 }