浏览代码

Use do_div from div64.h for vsprintf

Use do_div from div64.h for vsprintf in case of 64bit division.
For 32bit division, do_div from div64.h can't be used as it
needs a 64bit parameter.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Acked-by: Stefan Roese <sr@denx.de>
CC: Simon Kagstrom <simon.kagstrom@netinsight.net>
Dirk Behme 16 年之前
父节点
当前提交
479105065d
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      lib_generic/vsprintf.c

+ 4 - 3
lib_generic/vsprintf.c

@@ -22,18 +22,19 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 #endif
 
 #ifdef CONFIG_SYS_64BIT_VSPRINTF
+#include <div64.h>
 # define NUM_TYPE long long
 #else
 # define NUM_TYPE long
-#endif
-#define noinline __attribute__((noinline))
-
 #define do_div(n, base) ({ \
 	unsigned int __res; \
 	__res = ((unsigned NUM_TYPE) n) % base; \
 	n = ((unsigned NUM_TYPE) n) / base; \
 	__res; \
 })
+#endif
+#define noinline __attribute__((noinline))
+
 
 const char hex_asc[] = "0123456789abcdef";
 #define hex_asc_lo(x)   hex_asc[((x) & 0x0f)]