diff options
| author | Vic Yang <victoryang@chromium.org> | 2013-05-16 10:05:45 -0700 |
|---|---|---|
| committer | Stéphane Marchesin <marcheu@chromium.org> | 2013-05-16 10:08:22 -0700 |
| commit | c58c01b14cd45550991be1624146bc813092d202 (patch) | |
| tree | 861e57cecae68cbab25c4d79a1d02bbcfc38998c | |
| parent | c8b7b430fe5e4aa3d5f27fbd160dfee31254e36d (diff) | |
| download | chrome-ec-c58c01b14cd45550991be1624146bc813092d202.tar.gz | |
Revert "Scale timer for emulator"
This is causing instability on buildbot. Let's revert until we can make it more stable.
This reverts commit 3615ac4c0b6141f9d5a3fb008d09f6792155815c
Change-Id: I0bd65832cc3706a24284ada80e2fb5102fa705cf
Reviewed-on: https://gerrit.chromium.org/gerrit/51479
Commit-Queue: Vic Yang <victoryang@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | Makefile.toolchain | 3 | ||||
| -rw-r--r-- | core/host/timer.c | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain index 2679e2b5f1..82119e5462 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -28,8 +28,7 @@ CFLAGS_DEBUG= -g CFLAGS_INCLUDE=$(foreach i,$(includes),-I$(i) ) CFLAGS_TEST=$(if $(TEST_BUILD),-DTEST_BUILD \ -DTEST_TASKFILE=$(PROJECT).tasklist,) \ - $(if $(EMU_BUILD),-DEMU_BUILD) \ - $(if $($(PROJECT)-scale),-DTEST_TIME_SCALE=$($(PROJECT)-scale)) + $(if $(EMU_BUILD),-DEMU_BUILD) CFLAGS_DEFINE=-DOUTDIR=$(out) -DCHIP=$(CHIP) -DBOARD_TASKFILE=ec.tasklist \ -DBOARD=$(BOARD) -DBOARD_$(BOARD) -DCORE=$(CORE) \ -DCHIP_$(CHIP) -DCHIP_VARIANT=$(CHIP_VARIANT) \ diff --git a/core/host/timer.c b/core/host/timer.c index 8d9f3f4be3..8de12a7f3c 100644 --- a/core/host/timer.c +++ b/core/host/timer.c @@ -12,15 +12,6 @@ #include "task.h" #include "timer.h" -/* - * Scale the timer to be 3 times faster for emulator. - * This can be adjusted for individual tests in test/build.mk by - * specifying <test_name>-scale=<new scale>. - */ -#ifndef TEST_TIME_SCALE -#define TEST_TIME_SCALE 3 -#endif - static timestamp_t boot_time; void usleep(unsigned us) @@ -33,8 +24,7 @@ timestamp_t _get_time(void) struct timespec ts; timestamp_t ret; clock_gettime(CLOCK_MONOTONIC, &ts); - ret.val = (1000000000 * (uint64_t)ts.tv_sec + ts.tv_nsec) * - TEST_TIME_SCALE / 1000; + ret.val = 1000000 * (uint64_t)ts.tv_sec + ts.tv_nsec / 1000; return ret; } |