aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Hobbs <jason.hobbs@calxeda.com>2011-06-29 11:58:28 -0500
committerJohn Rigby <john.rigby@linaro.org>2011-08-15 15:10:48 -0600
commit30f05e80f03cf45d0c62f439d987ae096d5ee30b (patch)
tree3b90d8755cc91fa642a893e3d516b66954d62d06
parent02c86d54b0b69eab15b214055cd19708670e4fa8 (diff)
downloadu-boot-linaro-stable-30f05e80f03cf45d0c62f439d987ae096d5ee30b.tar.gz
lib: add uuid_str_to_bin for use with bootp and PXE uuid
Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
-rw-r--r--include/common.h3
-rw-r--r--lib/Makefile1
-rw-r--r--lib/uuid.c53
3 files changed, 57 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index a3f31530e..0c4a91e0a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -660,6 +660,9 @@ int strcmp_compar(const void *, const void *);
/* lib/time.c */
void udelay (unsigned long);
+/* lib/uuid.c */
+void uuid_str_to_bin(const char *uuid, unsigned char *out);
+
/* lib/vsprintf.c */
ulong simple_strtoul(const char *cp,char **endp,unsigned int base);
int strict_strtoul(const char *cp, unsigned int base, unsigned long *res);
diff --git a/lib/Makefile b/lib/Makefile
index 884f64c00..075bb8c28 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -55,6 +55,7 @@ COBJS-y += ctype.o
COBJS-y += div64.o
COBJS-y += string.o
COBJS-y += time.o
+COBJS-$(CONFIG_BOOTP_PXE) += uuid.o
COBJS-y += vsprintf.o
COBJS := $(COBJS-y)
diff --git a/lib/uuid.c b/lib/uuid.c
new file mode 100644
index 000000000..227024564
--- /dev/null
+++ b/lib/uuid.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2011 Calxeda, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include "common.h"
+
+/*
+ * 0 9 14 19 24
+ * xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+ * le le le be be
+ */
+void uuid_str_to_bin(const char *uuid, unsigned char *out)
+{
+ uint16_t tmp16;
+ uint32_t tmp32;
+ uint64_t tmp64;
+
+ if (!uuid || !out)
+ return;
+
+ tmp32 = cpu_to_le32(simple_strtoul(uuid, NULL, 16));
+ memcpy(out, &tmp32, 4);
+
+ tmp16 = cpu_to_le16(simple_strtoul(uuid + 9, NULL, 16));
+ memcpy(out + 4, &tmp16, 2);
+
+ tmp16 = cpu_to_le16(simple_strtoul(uuid + 14, NULL, 16));
+ memcpy(out + 6, &tmp16, 2);
+
+ tmp16 = cpu_to_be16(simple_strtoul(uuid + 19, NULL, 16));
+ memcpy(out + 8, &tmp16, 2);
+
+ tmp64 = cpu_to_be64(simple_strtoull(uuid + 24, NULL, 16));
+ memcpy(out + 10, (char *)&tmp64 + 2, 6);
+}