commit c3236459f89cafd5588dfa913529f723c03a24c2
author Felipe Leme <felipeal@google.com> Mon Sep 26 16:14:11 2016 -0700
committer Felipe Leme <felipeal@google.com> Tue Sep 27 14:05:52 2016 -0700
tree 54b04bcedaa2ac78580380912835913434039b45
parent a33c1b9c5206167fc51e3775cc791335d3906e95

Uses new Dumpstate class functions on dumpstate_board().

BUG: 26379932
Test: manual / refactored code
Change-Id: Ifdab879684994183d59c097c2e43abc6f3c9a3f6

dumpstate/dumpstate.cpp

diff --git a/dumpstate/dumpstate.cpp b/dumpstate/dumpstate.cpp
index 1c12221..706dc7b 100644
--- a/dumpstate/dumpstate.cpp
+++ b/dumpstate/dumpstate.cpp
@@ -19,14 +19,16 @@
 
 void dumpstate_board()
 {
+    Dumpstate& ds = Dumpstate::GetInstance();
+
     /* ask init.dragon.rc to dump the charging state and wait */
     property_set("debug.bq25892", "dump");
     sleep(1);
 
-    dump_file("EC Version", "/sys/class/chromeos/cros_ec/version");
-    run_command("FW Version", 5, "fwtool", "vboot", NULL);
-    dump_file("Charger chip registers", "/data/misc/fw_logs/bq25892.txt");
-    dump_file("Battery gas gauge", "/sys/class/power_supply/bq27742-0/uevent");
-    dump_file("Touchscreen firmware updater", "/data/misc/touchfwup/rmi4update.txt");
-    dump_file("Ion heap", "/d/ion/heaps/system");
+    ds.DumpFile("EC Version", "/sys/class/chromeos/cros_ec/version");
+    ds.RunCommand("FW Version", {"fwtool", "vboot"}, CommandOptions::WithTimeout(5).Build());
+    ds.DumpFile("Charger chip registers", "/data/misc/fw_logs/bq25892.txt");
+    ds.DumpFile("Battery gas gauge", "/sys/class/power_supply/bq27742-0/uevent");
+    ds.DumpFile("Touchscreen firmware updater", "/data/misc/touchfwup/rmi4update.txt");
+    ds.DumpFile("Ion heap", "/d/ion/heaps/system");
 };