Remove c files inclusions: use libunittest instead.

[bertos.git] / bertos / algo / ramp_test.c

diff --git a/bertos/algo/ramp_test.c b/bertos/algo/ramp_test.c
index b96189b5977d9932cbc2f0df91826f1465621540..7666662fb1ea515af44b3c13ac89b3b66a42287c 100644 (file)
--- a/bertos/algo/ramp_test.c
+++ b/bertos/algo/ramp_test.c
@@ -10,7 +10,7 @@
  * \version $Id$
  *
  * \author Simone Zinanni <s.zinanni@develer.com>
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Giovanni Bajo <rasky@develer.com>
  * \author Daniele Basile <asterix@develer.com>
  *
@@ -104,74 +104,84 @@
 
 #include "ramp.h"
 #include <cfg/debug.h>
+#include <cfg/test.h>
 
-#warning FIXME:Review and refactor this test..
 
 static bool ramp_test_single(uint32_t minFreq, uint32_t maxFreq, uint32_t length)
 {
-    struct Ramp r;
-    uint16_t cur, old;
-    uint32_t clock;
-    uint32_t oldclock;
+       struct Ramp r;
+       uint16_t cur, old;
+       uint32_t clock;
+       uint32_t oldclock;
 
-    ramp_setup(&r, length, minFreq, maxFreq);
+       ramp_setup(&r, length, minFreq, maxFreq);
 
-    cur = old = r.clocksMaxWL;
-    clock = 0;
-    oldclock = 0;
+       cur = old = r.clocksMaxWL;
+       clock = 0;
+       oldclock = 0;
 
-    kprintf("testing ramp: (length=%lu, min=%lu, max=%lu)\n", length, minFreq, maxFreq);
-    kprintf("              [length=%lu, max=%04x, min=%04x]\n", r.clocksRamp, r.clocksMaxWL, r.clocksMinWL);
+       kprintf("testing ramp: (length=%lu, min=%lu, max=%lu)\n", (unsigned long)length, (unsigned long)minFreq, (unsigned long)maxFreq);
+       kprintf("              [length=%lu, max=%04x, min=%04x]\n", (unsigned long)r.clocksRamp, r.clocksMaxWL, r.clocksMinWL);
 
        int i = 0;
-    int nonbyte = 0;
-
-    while (clock + cur < r.clocksRamp)
-    {
-        oldclock = clock;
-        old = cur;
-
-        clock += cur;
-        cur = ramp_evaluate(&r, clock);
-
-        if (old < cur)
-        {
-            uint16_t t1 = FIX_MULT32(oldclock >> RAMP_CLOCK_SHIFT_PRECISION, r.precalc.inv_total_time);
-            uint16_t t2 = FIX_MULT32(clock >> RAMP_CLOCK_SHIFT_PRECISION,    r.precalc.inv_total_time);
-            uint16_t denom1 = FIX_MULT32((uint16_t)((~t1) + 1), r.precalc.max_div_min) + t1;
-            uint16_t denom2 = FIX_MULT32((uint16_t)((~t2) + 1), r.precalc.max_div_min) + t2;
-
-            kprintf("    Failed: %04x @ %lu   -->   %04x @ %lu\n", old, oldclock, cur, clock);
-            kprintf("    T:     %04x -> %04x\n", t1, t2);
-            kprintf("    DENOM: %04x -> %04x\n", denom1, denom2);
-
-            cur = ramp_evaluate(&r, clock);
-            return false;
-        }
+       int nonbyte = 0;
+
+       while (clock + cur < r.clocksRamp)
+       {
+               oldclock = clock;
+               old = cur;
+
+               clock += cur;
+               cur = ramp_evaluate(&r, clock);
+
+               if (old < cur)
+               {
+                       uint16_t t1 = FIX_MULT32(oldclock >> RAMP_CLOCK_SHIFT_PRECISION, r.precalc.inv_total_time);
+                       uint16_t t2 = FIX_MULT32(clock >> RAMP_CLOCK_SHIFT_PRECISION,    r.precalc.inv_total_time);
+                       uint16_t denom1 = FIX_MULT32((uint16_t)((~t1) + 1), r.precalc.max_div_min) + t1;
+                       uint16_t denom2 = FIX_MULT32((uint16_t)((~t2) + 1), r.precalc.max_div_min) + t2;
+
+                       kprintf("    Failed: %04x @ %lu   -->   %04x @ %lu\n", old, (unsigned long)oldclock, cur, (unsigned long)clock);
+                       kprintf("    T:     %04x -> %04x\n", t1, t2);
+                       kprintf("    DENOM: %04x -> %04x\n", denom1, denom2);
+
+                       cur = ramp_evaluate(&r, clock);
+                       return false;
+               }
                i++;
                if ((old-cur) >= 256)
                        nonbyte++;
-    }
+       }
 
 
 
-    kprintf("Test finished: %04x @ %lu [min=%04x, totlen=%lu, numsteps:%d, nonbyte:%d]\n", cur, clock, r.clocksMinWL, r.clocksRamp, i, nonbyte);
+       kprintf("Test finished: %04x @ %lu [min=%04x, totlen=%lu, numsteps:%d, nonbyte:%d]\n", cur, (unsigned long)clock, r.clocksMinWL, (unsigned long)r.clocksRamp, i, nonbyte);
 
-    return true;
+       return true;
 }
 
+int ramp_testSetup(void)
+{
+       kdbg_init();
+       return 0;
+}
+
+int ramp_testTearDown(void)
+{
+       return 0;
+}
 
-void ramp_test(void)
+int ramp_testRun(void)
 {
-    bool ok = true;
+       #define TEST_RAMP(min, max, len) do { \
+               if (!ramp_test_single(min, max, len)) \
+                       return -1; \
+       } while(0)
 
-    ok = ramp_test_single(200,  5000, 3000000) && ok;
-    ok = ramp_test_single(1000, 2000, 1000000) && ok;
+       TEST_RAMP(200,  5000, 3000000);
+       TEST_RAMP(1000, 2000, 1000000);
 
-    if (ok)
-        kputs("Ramp test succeeded!\n");
-       else
-        kputs("Ramp test fail!\n");
+       return 0;
 }
 
-
+TEST_MAIN(ramp);