[GitHub] wes3 closed pull request #1292: hw/battery: Fix incorrect os_time comparisons

[GitBox <gi...@apache.org>]

wes3 closed pull request #1292: hw/battery: Fix incorrect os_time comparisons
URL: https://github.com/apache/mynewt-core/pull/1292
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/hw/battery/src/battery.c b/hw/battery/src/battery.c
index 517fa5f5b6..542fcd9b26 100644
--- a/hw/battery/src/battery.c
+++ b/hw/battery/src/battery.c
@@ -76,31 +76,34 @@ static void
 battery_poll_event_cb(struct os_event *ev)
 {
     int i;
-    os_time_t next_poll = 0xFFFFFFFF;
+    int pflag;
+    os_time_t next_poll;
     os_time_t now = os_time_get();
     struct battery *bat;
-    int ticks;
+    os_stime_t ticks;
 
+    pflag = 0;
     for (i = 0; i < BATTERY_MAX_COUNT; ++i) {
         bat = battery_manager.bm_batteries[i];
         if (bat) {
-            if (now > bat->b_next_run) {
+            if (OS_TIME_TICK_GEQ(now, bat->b_next_run)) {
                 bat->b_last_read_time = now;
                 battery_mgr_poll_battery(battery_manager.bm_batteries[i]);
                 bat->b_next_run = now + os_time_ms_to_ticks32(bat->b_poll_rate);
             }
-            if (bat->b_next_run < next_poll) {
+            if ((pflag == 0) || OS_TIME_TICK_LT(bat->b_next_run, next_poll)) {
+                pflag = 1;
                 next_poll = bat->b_next_run;
             }
         }
     }
 
-    if (next_poll != 0xFFFFFFFF) {
-        ticks = next_poll - os_time_get();
+    if (pflag) {
+        ticks = (os_stime_t)(next_poll - os_time_get());
         if (ticks < 0) {
             ticks = 1;
         }
-        os_callout_reset(&battery_manager.bm_poll_callout, ticks);
+        os_callout_reset(&battery_manager.bm_poll_callout, (os_time_t)ticks);
     }
 }
 
@@ -494,16 +497,15 @@ int
 battery_set_poll_rate_ms(struct os_dev *battery, uint32_t poll_rate)
 {
     struct battery *bat = (struct battery *)battery;
-    bat->b_poll_rate = poll_rate;
 
-    if (bat->b_last_read_time == 0 ||
-        os_time_ms_to_ticks32(bat->b_last_read_time + poll_rate) < os_time_get()) {
-        os_callout_reset(&battery_manager.bm_poll_callout, 0);
-    } else {
-        os_callout_reset(&battery_manager.bm_poll_callout,
-            os_time_ms_to_ticks32(bat->b_last_read_time + poll_rate) - os_time_get());
+    if ((poll_rate == 0) || (bat == NULL)) {
+        return -1;
     }
 
+    bat->b_poll_rate = poll_rate;
+    bat->b_next_run = os_time_get();
+    os_callout_reset(&battery_manager.bm_poll_callout, 0);
+
     return 0;
 }
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services