From 97652c6c62884b23519a9c24c1552d1edaf720e2 Mon Sep 17 00:00:00 2001
From: Jef Driesen <jefdriesen@users.sourceforge.net>
Date: Tue, 8 Dec 2009 14:51:32 +0000
Subject: [PATCH] Make the bcd2dec() function available to all backends.

---
 src/array.c          |  6 ++++++
 src/array.h          |  3 +++
 src/oceanic_common.c | 12 +-----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/array.c b/src/array.c
index ab2947f..1e6649c 100644
--- a/src/array.c
+++ b/src/array.c
@@ -132,3 +132,9 @@ array_uint16_le (const unsigned char data[])
 {
 	return data[0] + (data[1] << 8);
 }
+
+unsigned char
+bcd2dec (unsigned char value)
+{
+	return ((value >> 4) & 0x0f) * 10 + (value & 0x0f);
+}
diff --git a/src/array.h b/src/array.h
index add8e57..f441290 100644
--- a/src/array.h
+++ b/src/array.h
@@ -61,6 +61,9 @@ array_uint16_be (const unsigned char data[]);
 unsigned short
 array_uint16_le (const unsigned char data[]);
 
+unsigned char
+bcd2dec (unsigned char value);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/src/oceanic_common.c b/src/oceanic_common.c
index ba14ca7..0ca872a 100644
--- a/src/oceanic_common.c
+++ b/src/oceanic_common.c
@@ -54,16 +54,6 @@ iceil (unsigned int x, unsigned int n)
 }
 
 
-static unsigned char
-bcd (unsigned char value)
-{
-	unsigned char lower = (value     ) & 0x0F;
-	unsigned char upper = (value >> 4) & 0x0F;
-
-	return lower + 10 * upper;
-}
-
-
 static unsigned int
 get_profile_first (const unsigned char data[], const oceanic_common_layout_t *layout)
 {
@@ -155,7 +145,7 @@ oceanic_common_device_foreach (oceanic_common_device_t *device, const oceanic_co
 	device_devinfo_t devinfo;
 	devinfo.model = array_uint16_be (id + 8);
 	devinfo.firmware = 0;
-	devinfo.serial = bcd (id[10]) * 10000 + bcd (id[11]) * 100 + bcd (id[12]);
+	devinfo.serial = bcd2dec (id[10]) * 10000 + bcd2dec (id[11]) * 100 + bcd2dec (id[12]);
 	device_event_emit (abstract, DEVICE_EVENT_DEVINFO, &devinfo);
 
 	// Read the pointer data.