device: convert to stopwatch API

Instead of open coding the monotonic timers use the stopwatch
abstraction.

BUG=None
BRANCH=None
TEST=Booted and noted timings work as expected. Built with software_i2c
     and no compilation failures.

Change-Id: Ie5ecdd5bc764c1ab8ba4a923e65a1666aacd22f7
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: c7bffb5aeb41e9b88cd2c99edd6abc38f1dc90af
Original-Change-Id: I0170fe4b93d9976957a2dcb00a6ea41ddc0320ce
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/219495
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: http://review.coreboot.org/8817
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Aaron Durbin
2014-09-23 16:34:40 -05:00
committed by Patrick Georgi
parent ad5a909740
commit 46ba4807e9
2 changed files with 9 additions and 11 deletions

View File

@ -44,20 +44,21 @@ static int __wait(unsigned bus, int timeout_us, int for_scl)
int us;
int sda = software_i2c[bus]->get_sda(bus);
int scl = software_i2c[bus]->get_scl(bus);
struct mono_time start;
timer_monotonic_get(&start);
struct stopwatch sw;
stopwatch_init_usecs_expire(&sw, timeout_us);
do {
int old_sda = sda;
int old_scl = scl;
struct rela_time diff = current_time_from(&start);
us = rela_time_in_microseconds(&diff);
us = stopwatch_duration_usecs(&sw);
if (old_sda != (sda = software_i2c[bus]->get_sda(bus)))
spew("[SDA transitioned to %d after %dus] ", sda, us);
if (old_scl != (scl = software_i2c[bus]->get_scl(bus)))
spew("[SCL transitioned to %d after %dus] ", scl, us);
} while (us < timeout_us && (!for_scl || !scl));
} while (!stopwatch_expired(&sw) && (!for_scl || !scl));
return scl;
}