More clean separation of htimer time and msec time in event poll code.

diff --git a/ulut/ul_htimdefs.h b/ulut/ul_htimdefs.h
index 273abecaccb6af02006fdbf10625a32b1246b7d6..53b7ac2b2dbca225f461d88d5fb29852dc40dc43 100644 (file)
--- a/ulut/ul_htimdefs.h
+++ b/ulut/ul_htimdefs.h
@@ -29,6 +29,8 @@ typedef signed long ul_msdiff_t;
 typedef ul_mstime_t ul_htim_time_t;
 typedef ul_msdiff_t ul_htim_diff_t;
 
+#define UL_HTIM_RESOLUTION 1000
+
 static inline int
 ul_htimer_cmp_fnc(const ul_htim_time_t *a, const ul_htim_time_t *b)
 {

diff --git a/ulut/ul_htimer.h b/ulut/ul_htimer.h
index ebe8f81735e1c5df2b2cd7edbb33eb7b7f21c39b..394f7e5cdd045e603a960495ddec165bde3e09c6 100644 (file)
--- a/ulut/ul_htimer.h
+++ b/ulut/ul_htimer.h
@@ -302,7 +302,7 @@ static inline int ul_htime_sub(ul_htim_diff_t *diff, const ul_htim_time_t *htimt
   return 0;
 }
 
-static inline int ul_htime_add(ul_htim_diff_t *sum, const ul_htim_time_t *htimfrom,
+static inline int ul_htime_add(ul_htim_time_t *sum, const ul_htim_time_t *htimfrom,
                                 const ul_htim_diff_t *diff)
 {
   *sum = *htimfrom + *diff;

diff --git a/ulut/ul_htimmstime.c b/ulut/ul_htimmstime.c
index ff2c2d8a5f3be12c749dc994f1a7d4920cbe5520..327bf50b4c838d2b9156deffb076352b237db107 100644 (file)
--- a/ulut/ul_htimmstime.c
+++ b/ulut/ul_htimmstime.c
@@ -108,22 +108,22 @@ void ul_compute_mstime_next(void)
 
 #ifdef UL_HTIMER_WITH_STD_TYPE
 
-int ul_mstime_root_htimer_init(int options, void *context)
+static int ul_mstime_root_htimer_init(int options, void *context)
 {
   ul_mstime_init();
   return 0;
 }
 
-inline ul_htimer_queue_t *ul_mstime_root_htimer_get(int options, void *context)
+static ul_htimer_queue_t *ul_mstime_root_htimer_get(int options, void *context)
 {
   return &ul_root_htimer;
 }
 
-void ul_mstime_root_htimer_put(ul_htimer_queue_t *queue)
+static void ul_mstime_root_htimer_put(ul_htimer_queue_t *queue)
 {
 }
 
-int ul_mstime_root_htimer_current_time(int options, ul_htim_time_t *htimer_time)
+static int ul_mstime_root_htimer_current_time(int options, ul_htim_time_t *htimer_time)
 {
   ul_mstime_t mstime;
   ul_mstime_now(&mstime);