From aced667f48c29a160aa4e5c0a8df037092b28189 Mon Sep 17 00:00:00 2001
From: Michael Sevakis <jethead71@rockbox.org>
Date: Mon, 18 Sep 2017 06:00:05 -0400
Subject: Undo hacks to meant to get around string formatting limitations

The new vuprintf makes unnecessary workarounds due to formatting
limitations. I checked grep output for whatever appeared to fit
but it's possible I missed some instances because they weren't
so obvious.

Also, this means sound settings can dynamically work with any
number of decimals rather than the current assumption of one or
two. Add an ipow() function to help and take advantage of dynamic
field width and precision. Consolidate string formatting of sound
settings.

Change-Id: I46caf534859dfd1916cd440cd25e5206b192fcd8
---
 lib/fixedpoint/fixedpoint.c    | 29 +++++++++++++++++++++++++++++
 lib/fixedpoint/fixedpoint.h    |  2 ++
 lib/fixedpoint/fixedpoint.make |  3 ---
 3 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'lib/fixedpoint')

diff --git a/lib/fixedpoint/fixedpoint.c b/lib/fixedpoint/fixedpoint.c
index 645419d102..d1307bb248 100644
--- a/lib/fixedpoint/fixedpoint.c
+++ b/lib/fixedpoint/fixedpoint.c
@@ -211,6 +211,35 @@ long fp_sqrt(long x, unsigned int fracbits)
     return g;
 }
 
+/* raise an integer to an integer power */
+long ipow(long x, long y)
+{
+    /* y[k] = bit k of y, 0 or 1; k=0...n; n=|_ lg(y) _|
+     *
+     * x^y =  x^(y[0]*2^0 + y[1]*2^1 + ... + y[n]*2^n)
+     *     =  x^(y[0]*2^0) * x^(y[1]*2^1) * ... * x^(y[n]*2^n)
+     */
+    long a = 1;
+
+    if (y < 0 && x != -1)
+    {
+        a = 0; /* would be < 1 or +inf if x == 0 */
+    }
+    else
+    {
+        while (y)
+        {
+            if (y & 1)
+                a *= x;
+
+            y /= 2;
+            x *= x;
+        }
+    }
+
+    return a;
+}
+
 /**
  * Fixed point sinus using a lookup table
  * don't forget to divide the result by 16384 to get the actual sinus value
diff --git a/lib/fixedpoint/fixedpoint.h b/lib/fixedpoint/fixedpoint.h
index bc50ff687d..dcd7c8298c 100644
--- a/lib/fixedpoint/fixedpoint.h
+++ b/lib/fixedpoint/fixedpoint.h
@@ -85,6 +85,8 @@ long fp14_sin(int val);
 long fp16_log(int x);
 long fp16_exp(int x);
 
+long ipow(long x, long y);
+
 /* fast unsigned multiplication (16x16bit->32bit or 32x32bit->32bit,
  * whichever is faster for the architecture) */
 #ifdef CPU_ARM
diff --git a/lib/fixedpoint/fixedpoint.make b/lib/fixedpoint/fixedpoint.make
index 0233e9499b..5be0e38ea7 100644
--- a/lib/fixedpoint/fixedpoint.make
+++ b/lib/fixedpoint/fixedpoint.make
@@ -13,11 +13,8 @@ FIXEDPOINTLIB_OBJ := $(call c2obj, $(FIXEDPOINTLIB_SRC))
 INCLUDES += -I$(FIXEDPOINTLIB_DIR)
 OTHER_SRC += $(FIXEDPOINTLIB_SRC)
 
-# If not SOFTWARECODECS, then only plugins depend upon us
-ifdef SOFTWARECODECS
 CORE_LIBS += $(FIXEDPOINTLIB)
 CORE_GCSECTIONS := yes
-endif
 
 FIXEDPOINTLIB_FLAGS := $(CFLAGS) $(SHARED_CFLAGS)
 
-- 
cgit v1.2.3