timer: Cleanup and warning removal from driver and test

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1648 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h
index 907610c75a9d7b92138e0a40d84d6ada59eb8539..4aa33639d5765d3cf4c87461bf41aecb826d563c 100644 (file)
--- a/bertos/cfg/debug.h
+++ b/bertos/cfg/debug.h
@@ -168,16 +168,23 @@
         * The assumption here is that valid pointers never point to low
         * memory regions.  This helps catching pointers taken from
         * struct/class memebers when the struct pointer was NULL.
+        *
+        * \see ASSERT_VALID_PTR_OR_NULL()
         */
-       #define ASSERT_VALID_PTR(p) ((void)(LIKELY((p) >= (void *)CPU_RAM_START) \
+       #define ASSERT_VALID_PTR(p) ((void)(LIKELY((void *)(p) >= (void *)CPU_RAM_START) \
                ? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__)))
 
        /**
         * Check that the given pointer is not pointing to invalid memory.
         *
+        * \note The check for invalid memory is architecture specific and
+        *       conservative.  The current implementation only checks against
+        *       a lower bound.
+        *
         * \see ASSERT_VALID_PTR()
         */
-       #define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) || ((p) >= (void *)CPU_RAM_START)) \
+       #define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) \
+               || ((void *)(p) >= (void *)CPU_RAM_START)) \
                ? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__)))
 
        #if !CONFIG_KDEBUG_DISABLE_TRACE

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index bfc4feb2c1a02a619a3acb02ee25473353afa145..f282478aa361a42e77e69762ffab5f8fbabbf968 100644 (file)
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -187,7 +187,7 @@ void timer_delayTicks(ticks_t delay)
        Timer t;
 
        ASSERT(!sig_check(SIG_SINGLE));
-       timer_set_event_signal(&t, proc_current(), SIG_SINGLE);
+       timer_setSignal(&t, proc_current(), SIG_SINGLE);
        timer_setDelay(&t, delay);
        timer_add(&t);
        sig_wait(SIG_SINGLE);

diff --git a/bertos/drv/timer_test.c b/bertos/drv/timer_test.c
index 22b18761d2e9e84b3d15c55e750ff5e994a745a2..9c649a31f6321305f55acd8cda8e69b2d7e7ddf0 100644 (file)
--- a/bertos/drv/timer_test.c
+++ b/bertos/drv/timer_test.c
@@ -47,29 +47,29 @@
 
 static void timer_test_constants(void)
 {
-       kprintf("TIMER_HW_HPTICKS_PER_SEC=%lu\n", TIMER_HW_HPTICKS_PER_SEC);
+       kprintf("TIMER_HW_HPTICKS_PER_SEC=%lu\n", (unsigned long)TIMER_HW_HPTICKS_PER_SEC);
        #ifdef TIMER_PRESCALER
-               kprintf("TIMER_PRESCALER=%d\n", TIMER_PRESCALER);
+               kprintf("TIMER_PRESCALER    = %lu\n", (unsigned long)TIMER_PRESCALER);
        #endif
        #ifdef TIMER1_OVF_COUNT
-               kprintf("TIMER1_OVF_COUNT=%d\n", (int)TIMER1_OVF_COUNT);
+               kprintf("TIMER1_OVF_COUNT   = %lu\n", (unsigned long)TIMER1_OVF_COUNT);
        #endif
-       kprintf("TIMER_TICKS_PER_SEC=%d\n", (int)TIMER_TICKS_PER_SEC);
+       kprintf("TIMER_TICKS_PER_SEC= %lu\n",  (unsigned long)TIMER_TICKS_PER_SEC);
        kprintf("\n");
-       kprintf("ms_to_ticks(100)=%lu\n", ms_to_ticks(100));
-       kprintf("ms_to_ticks(10000)=%lu\n", ms_to_ticks(10000));
-       kprintf("us_to_ticks(100)=%lu\n", us_to_ticks(100));
-       kprintf("us_to_ticks(10000)=%lu\n", us_to_ticks(10000));
+       kprintf("ms_to_ticks(100)   = %lu\n",   (unsigned long)ms_to_ticks(100));
+       kprintf("ms_to_ticks(10000) = %lu\n",   (unsigned long)ms_to_ticks(10000));
+       kprintf("us_to_ticks(100)   = %lu\n",   (unsigned long)us_to_ticks(100));
+       kprintf("us_to_ticks(10000) = %lu\n",   (unsigned long)us_to_ticks(10000));
        kprintf("\n");
-       kprintf("ticks_to_ms(100)=%lu\n", ticks_to_ms(100));
-       kprintf("ticks_to_ms(10000)=%lu\n", ticks_to_ms(10000));
-       kprintf("ticks_to_us(100)=%lu\n", ticks_to_us(100));
-       kprintf("ticks_to_us(10000)=%lu\n", ticks_to_us(10000));
+       kprintf("ticks_to_ms(100)   = %lu\n",   (unsigned long)ticks_to_ms(100));
+       kprintf("ticks_to_ms(10000) = %lu\n",   (unsigned long)ticks_to_ms(10000));
+       kprintf("ticks_to_us(100)   = %lu\n",   (unsigned long)ticks_to_us(100));
+       kprintf("ticks_to_us(10000) = %lu\n",   (unsigned long)ticks_to_us(10000));
        kprintf("\n");
-       kprintf("hptime_to_us(100)=%ld\n", hptime_to_us(100));
-       kprintf("hptime_to_us(10000)=%lu\n", hptime_to_us(10000));
-       kprintf("us_to_hptime(100)=%lu\n", us_to_hptime(100));
-       kprintf("us_to_hptime(10000)=%lu\n", us_to_hptime(10000));
+       kprintf("hptime_to_us(100)  = %lu\n",   (unsigned long)hptime_to_us(100));
+       kprintf("hptime_to_us(10000)= %lu\n",   (unsigned long)hptime_to_us(10000));
+       kprintf("us_to_hptime(100)  = %lu\n",   (unsigned long)us_to_hptime(100));
+       kprintf("us_to_hptime(10000)= %lu\n",   (unsigned long)us_to_hptime(10000));
 }
 
 static void timer_test_delay(void)
@@ -89,7 +89,7 @@ static void timer_test_hook(iptr_t _timer)
 {
        Timer *timer = (Timer *)(void *)_timer;
 
-       kprintf("Timer %ld expired\n", ticks_to_ms(timer->_delay));
+       kprintf("Timer %lu expired\n", (unsigned long)ticks_to_ms(timer->_delay));
        timer_add(timer);
 }
 
@@ -104,7 +104,7 @@ static void timer_test_async(void)
        {
                Timer *timer = &test_timers[i];
                timer_setDelay(timer, ms_to_ticks(test_delays[i]));
-               timer_set_event_softint(timer, timer_test_hook, (iptr_t)timer);
+               timer_setSoftint(timer, timer_test_hook, (iptr_t)timer);
                timer_add(timer);
        }
 }
@@ -122,7 +122,7 @@ static void timer_test_poll(void)
                {
                        ++secs;
                        start_time += 1000;
-                       kprintf("seconds = %d, ticks=%ld\n", secs, now);
+                       kprintf("seconds = %d, ticks=%lu\n", secs, (unsigned long)now);
                }
                wdt_reset();
        }