mips: mtmips: make use of sysreset-resetctrl for mt7628 soc

[oweals/u-boot.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 8b1b29fb5aa75278762a4c1222481fb42c0855c3..b4edee29b0dbe07e39cf1016d31fbc62c16beabb 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -2,6 +2,8 @@
  *  linux/lib/vsprintf.c
  *
  *  Copyright (C) 1991, 1992  Linus Torvalds
+ * (C) Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
 /* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */
@@ -16,8 +18,8 @@
 #include <efi_loader.h>
 #include <div64.h>
 #include <hexdump.h>
-#include <uuid.h>
 #include <stdarg.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/types.h>
@@ -274,28 +276,30 @@ static char *string(char *buf, char *end, char *s, int field_width,
        return buf;
 }
 
+/* U-Boot uses UTF-16 strings in the EFI context only. */
+#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
 static char *string16(char *buf, char *end, u16 *s, int field_width,
                int precision, int flags)
 {
-       u16 *str = s ? s : L"<NULL>";
-       int utf16_len = utf16_strnlen(str, precision);
-       u8 utf8[utf16_len * MAX_UTF8_PER_UTF16];
-       int utf8_len, i;
-
-       utf8_len = utf16_to_utf8(utf8, str, utf16_len) - utf8;
+       const u16 *str = s ? s : L"<NULL>";
+       ssize_t i, len = utf16_strnlen(str, precision);
 
        if (!(flags & LEFT))
-               while (utf8_len < field_width--)
+               for (; len < field_width; --field_width)
                        ADDCH(buf, ' ');
-       for (i = 0; i < utf8_len; ++i)
-               ADDCH(buf, utf8[i]);
-       while (utf8_len < field_width--)
+       for (i = 0; i < len && buf + utf16_utf8_strnlen(str, 1) <= end; ++i) {
+               s32 s = utf16_get(&str);
+
+               if (s < 0)
+                       s = '?';
+               utf8_put(s, &buf);
+       }
+       for (; len < field_width; --field_width)
                ADDCH(buf, ' ');
        return buf;
 }
 
-#if defined(CONFIG_EFI_LOADER) && \
-       !defined(CONFIG_SPL_BUILD) && !defined(API_BUILD)
+#if CONFIG_IS_ENABLED(EFI_DEVICE_PATH_TO_TEXT)
 static char *device_path_string(char *buf, char *end, void *dp, int field_width,
                                int precision, int flags)
 {
@@ -314,8 +318,8 @@ static char *device_path_string(char *buf, char *end, void *dp, int field_width,
        return buf;
 }
 #endif
+#endif
 
-#ifdef CONFIG_CMD_NET
 static char *mac_address_string(char *buf, char *end, u8 *addr, int field_width,
                                int precision, int flags)
 {
@@ -377,37 +381,41 @@ static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
        return string(buf, end, ip4_addr, field_width, precision,
                      flags & ~SPECIAL);
 }
-#endif
 
 #ifdef CONFIG_LIB_UUID
 /*
- * This works (roughly) the same way as linux's, but we currently always
- * print lower-case (ie. we just keep %pUB and %pUL for compat with linux),
- * mostly just because that is what uuid_bin_to_str() supports.
+ * This works (roughly) the same way as Linux's.
  *
  *   %pUb:   01020304-0506-0708-090a-0b0c0d0e0f10
+ *   %pUB:   01020304-0506-0708-090A-0B0C0D0E0F10
  *   %pUl:   04030201-0605-0807-090a-0b0c0d0e0f10
+ *   %pUL:   04030201-0605-0807-090A-0B0C0D0E0F10
  */
 static char *uuid_string(char *buf, char *end, u8 *addr, int field_width,
                         int precision, int flags, const char *fmt)
 {
        char uuid[UUID_STR_LEN + 1];
-       int str_format = UUID_STR_FORMAT_STD;
+       int str_format;
 
        switch (*(++fmt)) {
        case 'L':
+               str_format = UUID_STR_FORMAT_GUID | UUID_STR_UPPER_CASE;
+               break;
        case 'l':
                str_format = UUID_STR_FORMAT_GUID;
                break;
        case 'B':
-       case 'b':
-               /* this is the default */
+               str_format = UUID_STR_FORMAT_STD | UUID_STR_UPPER_CASE;
                break;
        default:
+               str_format = UUID_STR_FORMAT_STD;
                break;
        }
 
-       uuid_bin_to_str(addr, uuid, str_format);
+       if (addr)
+               uuid_bin_to_str(addr, uuid, str_format);
+       else
+               strcpy(uuid, "<NULL>");
 
        return string(buf, end, uuid, field_width, precision, flags);
 }
@@ -447,13 +455,12 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
 #endif
 
        switch (*fmt) {
-#if defined(CONFIG_EFI_LOADER) && \
-       !defined(CONFIG_SPL_BUILD) && !defined(API_BUILD)
+/* Device paths only exist in the EFI context. */
+#if CONFIG_IS_ENABLED(EFI_DEVICE_PATH_TO_TEXT) && !defined(API_BUILD)
        case 'D':
                return device_path_string(buf, end, ptr, field_width,
                                          precision, flags);
 #endif
-#ifdef CONFIG_CMD_NET
        case 'a':
                flags |= SPECIAL | ZEROPAD;
 
@@ -483,7 +490,6 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                                               precision, flags);
                flags &= ~SPECIAL;
                break;
-#endif
 #ifdef CONFIG_LIB_UUID
        case 'U':
                return uuid_string(buf, end, ptr, field_width, precision,
@@ -609,10 +615,14 @@ repeat:
                        continue;
 
                case 's':
-                       if (qualifier == 'l' && !IS_ENABLED(CONFIG_SPL_BUILD)) {
+/* U-Boot uses UTF-16 strings in the EFI context only. */
+#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
+                       if (qualifier == 'l') {
                                str = string16(str, end, va_arg(args, u16 *),
                                               field_width, precision, flags);
-                       } else {
+                       } else
+#endif
+                       {
                                str = string(str, end, va_arg(args, char *),
                                             field_width, precision, flags);
                        }
@@ -862,3 +872,19 @@ bool str2long(const char *p, ulong *num)
        *num = simple_strtoul(p, &endptr, 16);
        return *p != '\0' && *endptr == '\0';
 }
+
+char *strmhz(char *buf, unsigned long hz)
+{
+       long l, n;
+       long m;
+
+       n = DIV_ROUND_CLOSEST(hz, 1000) / 1000L;
+       l = sprintf(buf, "%ld", n);
+
+       hz -= n * 1000000L;
+       m = DIV_ROUND_CLOSEST(hz, 1000L);
+       if (m != 0)
+               sprintf(buf + l, ".%03ld", m);
+
+       return buf;
+}