summaryrefslogtreecommitdiff
path: root/test/powerdemo.c
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-10-26 14:31:47 -0700
committerGerrit <chrome-bot@google.com>2012-10-29 16:52:49 -0700
commit1d916d7c6b25de10c870cf7f35a44d3654d9f099 (patch)
tree5d7337654d86766324103217ab61ae0b71d65e0f /test/powerdemo.c
parent67aadcf614513353d7c9a0216fc70f7af18d8d05 (diff)
downloadchrome-ec-1d916d7c6b25de10c870cf7f35a44d3654d9f099.tar.gz
Use SECOND and MSEC constants
We'd defined them in a number of different files. This moves definitions to timer.h, and uses them everywhere we have large delays (since 10*SECOND is less typo-prone than 10000000). Also add msleep() and sleep() inline functions. No need for mdelay() or delay(), since any delays that long should use sleep funcs instead of spin-waiting. BUG=chrome-os-partner:15579 BRANCH=none TEST=boot system; taskinfo displays similar numbers to before Change-Id: I2a92a9f10f46b6b7b6571759b1f8ab4ecfbf8259 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/36726
Diffstat (limited to 'test/powerdemo.c')
-rw-r--r--test/powerdemo.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/powerdemo.c b/test/powerdemo.c
index 496459f9f7..a5e79e0366 100644
--- a/test/powerdemo.c
+++ b/test/powerdemo.c
@@ -5,16 +5,14 @@
/* Power state machine demo module for Chrome EC */
-#include "board.h"
#include "clock.h"
+#include "common.h"
#include "powerdemo.h"
#include "task.h"
#include "timer.h"
#include "uart.h"
#include "registers.h"
-#define US_PER_SECOND 1000000
-
static volatile enum {
POWER_STATE_IDLE = 0, /* Idle */
POWER_STATE_DOWN1, /* Assert output for 1ms */
@@ -75,7 +73,7 @@ int power_demo_init(void)
/* 32-bit timer mode */
LM4_TIMER_CFG(7) = 4;
/* Set the prescaler to increment every microsecond */
- LM4_TIMER_TAPR(7) = clock_get_freq() / US_PER_SECOND;
+ LM4_TIMER_TAPR(7) = clock_get_freq() / SECOND;
/* One-shot, counting down */
LM4_TIMER_TAMR(7) = 0x01;
/* Set overflow interrupt */