From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick Delaunay Date: Tue, 22 Nov 2016 14:24:41 +0100 Subject: [U-Boot] [Resend RFC PATCH v1 2/3] uuid: remove dependency with io.h In-Reply-To: <1479821082-26311-1-git-send-email-patrick.delaunay73@gmail.com> References: <1479821082-26311-1-git-send-email-patrick.delaunay73@gmail.com> Message-ID: <1479821082-26311-3-git-send-email-patrick.delaunay73@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Patrick Delaunay io.h is only used for CONFIG_RANDOM_UUID - for clrsetbits_be16 - for clrsetbits_8 available only for some target (but not for SANDBOX) Signed-off-by: Patrick Delaunay Signed-off-by: Patrick Delaunay --- lib/uuid.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/uuid.c b/lib/uuid.c index eb8d8eb..47646e3 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -276,13 +275,13 @@ void gen_rand_uuid(unsigned char *uuid_bin) for (i = 0; i < sizeof(struct uuid) / sizeof(*ptr); i++) *(ptr + i) = cpu_to_be32(rand()); - clrsetbits_be16(&uuid.time_hi_and_version, - UUID_VERSION_MASK, - UUID_VERSION << UUID_VERSION_SHIFT); + /* UUID is big endian */ + uuid.time_hi_and_version |= ~cpu_to_be16(UUID_VERSION_MASK); + uuid.time_hi_and_version &= + cpu_to_be16(UUID_VERSION << UUID_VERSION_SHIFT); - clrsetbits_8(&uuid.clock_seq_hi_and_reserved, - UUID_VARIANT_MASK, - UUID_VARIANT << UUID_VARIANT_SHIFT); + uuid.clock_seq_hi_and_reserved |= ~UUID_VARIANT_MASK; + uuid.clock_seq_hi_and_reserved &= UUID_VARIANT << UUID_VARIANT_SHIFT; memcpy(uuid_bin, &uuid, sizeof(struct uuid)); } -- 1.9.1