Convert BIN2HEX/HEX2BIN to functions and add the abs() family

of functions while we're at it.

hex2bin() now also supports upper-case input characters.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3235 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 57 insertions, 4 deletions

diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index e197e430fd..4b868b447a 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -41,10 +41,6 @@
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
-#define BIN2HEX(b) ("0123456789abcdef"[b & 15])
-#define HEX2BIN(h) (('0' <= h && h <= '9') ? (h - '0') : \
-                    ('a' <= h && h <= 'f') ? (h - 'a' + 10) : 0)
-
 #define LITTLE_ENDIAN	1234
 #define BIG_ENDIAN	4321
 #ifdef CONFIG_TARGET_I386
@@ -119,6 +115,11 @@ void *realloc(void *ptr, size_t size);
 /* libc/lib.c */
 int bcd2dec(int b);
 int dec2bcd(int d);
+int abs(int j);
+long int labs(long int j);
+long long int llabs(long long int j);
+u8 bin2hex(u8 b);
+u8 hex2bin(u8 h);
 
 /* libc/memory.c */
 void *memset(void *s, int c, size_t n);
diff --git a/payloads/libpayload/libc/lib.c b/payloads/libpayload/libc/lib.c
index 9200455a8a..e7eed68eb6 100644
--- a/payloads/libpayload/libc/lib.c
+++ b/payloads/libpayload/libc/lib.c
@@ -27,6 +27,8 @@
  * SUCH DAMAGE.
  */
 
+#include <libpayload.h>
+
 /*
  * Convert a number in BCD format to decimal.
  *
@@ -49,3 +51,53 @@ int dec2bcd(int d)
 	return ((d / 10) << 4) | (d % 10);
 }
 
+/**
+ * Return the absolute value of the specified integer.
+ *
+ * @param val The integer of which we want to know the absolute value.
+ * @return The absolute value of the specified integer.
+ */
+int abs(int j)
+{
+	return (j >= 0 ? j : -j);
+}
+
+long int labs(long int j)
+{
+	return (j >= 0 ? j : -j);
+}
+
+long long int llabs(long long int j)
+{
+	return (j >= 0 ? j : -j);
+}
+
+/**
+ * Given a 4-bit value, return the ASCII hex representation of it.
+ *
+ * @param b A 4-bit value which shall be converted to ASCII hex.
+ * @return The ASCII hex representation of the specified 4-bit value.
+ *         Returned hex-characters will always be lower-case (a-f, not A-F).
+ */
+u8 bin2hex(u8 b)
+{
+	return (b < 10) ? '0' + b : 'a' + (b - 10);
+}
+
+/**
+ * Given an ASCII hex input character, return its integer value.
+ *
+ * For example, the input value '6' will be converted to 6, 'a'/'A' will
+ * be converted to 10, 'f'/'F' will be converted to 15, and so on.
+ *
+ * The return value for invalid input characters is 0.
+ *
+ * @param h The input byte in ASCII hex format.
+ * @return The integer value of the specified ASCII hex byte.
+ */
+u8 hex2bin(u8 h)
+{
+	return (('0' <= h && h <= '9') ? (h - '0') : \
+	        ('A' <= h && h <= 'F') ? (h - 'A' + 10) : \
+	        ('a' <= h && h <= 'f') ? (h - 'a' + 10) : 0);
+}