commit 9face5cad5b4ffb883b23e1c45aafac73c712fd6
author Todd Poynor <toddpoynor@google.com> Thu Aug 08 12:24:53 2013 -0700
committer Todd Poynor <toddpoynor@google.com> Thu Aug 08 12:26:36 2013 -0700
tree 048ff98dcdd90e640310da1e72b09b9ff9e252e8
parent 10b235e7436256da9adc827125645f141bd8fac9

healthd: create healthd_board_init()

Subsume healthd_board_poll_intervals, make clear the call is for init-time
actions.

Change-Id: I9267e4ce7c62b78d2997a43822f20bfa13b54cd8

healthd/healthd.cpp

diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp
index 89178fa..158274c 100644
--- a/healthd/healthd.cpp
+++ b/healthd/healthd.cpp
@@ -37,10 +37,11 @@
 // Periodic chores intervals in seconds
 #define DEFAULT_PERIODIC_CHORES_INTERVAL_FAST (60 * 1)
 #define DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW (60 * 10)
-static int periodic_chores_interval_fast =
-        DEFAULT_PERIODIC_CHORES_INTERVAL_FAST;
-static int periodic_chores_interval_slow =
-        DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW;
+
+static struct healthd_config healthd_config = {
+    .periodic_chores_interval_fast = DEFAULT_PERIODIC_CHORES_INTERVAL_FAST,
+    .periodic_chores_interval_slow = DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW,
+};
 
 #define POWER_SUPPLY_SUBSYSTEM "power_supply"
 
@@ -84,7 +85,8 @@
     // slow wake interval when on battery (watch for drained battery).
 
    int new_wake_interval = gBatteryMonitor->update() ?
-        periodic_chores_interval_fast : periodic_chores_interval_slow;
+       healthd_config.periodic_chores_interval_fast :
+           healthd_config.periodic_chores_interval_slow;
 
     if (new_wake_interval != wakealarm_wake_interval)
             wakealarm_set_interval(new_wake_interval);
@@ -94,12 +96,12 @@
     // poll at fast rate while awake and let alarm wake up at slow rate when
     // asleep.
 
-    if (periodic_chores_interval_fast == -1)
+    if (healthd_config.periodic_chores_interval_fast == -1)
         awake_poll_interval = -1;
     else
         awake_poll_interval =
-            new_wake_interval == periodic_chores_interval_fast ?
-                -1 : periodic_chores_interval_fast * 1000;
+            new_wake_interval == healthd_config.periodic_chores_interval_fast ?
+                -1 : healthd_config.periodic_chores_interval_fast * 1000;
 }
 
 static void periodic_chores() {
@@ -150,10 +152,7 @@
         return;
     }
 
-    healthd_board_poll_intervals(&periodic_chores_interval_fast,
-                                 &periodic_chores_interval_slow);
-
-    wakealarm_set_interval(periodic_chores_interval_fast);
+    wakealarm_set_interval(healthd_config.periodic_chores_interval_fast);
 }
 
 static void wakealarm_event(void) {
@@ -262,6 +261,7 @@
         }
     }
 
+    healthd_board_init(&healthd_config);
     wakealarm_init();
     uevent_init();
     binder_init();