mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
timer: Use a single definition of NSEC_PER_SEC for the whole codebase
Signed-off-by: Alberto Garcia <berto@igalia.com> Message-id: c6e55468856ba0b8f95913c4da111cc0ef266541.1434113783.git.berto@igalia.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
471fae3c98
commit
e0cf11f31c
9 changed files with 21 additions and 26 deletions
|
@ -12,6 +12,7 @@
|
|||
#include "libqtest.h"
|
||||
#include "libqos/pci-pc.h"
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qemu-common.h"
|
||||
|
||||
/* Tests only initialization so far. TODO: Replace with functional tests */
|
||||
|
@ -20,7 +21,6 @@ static void nop(void)
|
|||
}
|
||||
|
||||
#define CLK 33000000
|
||||
#define NS_PER_SEC 1000000000ULL
|
||||
|
||||
static QPCIBus *pcibus;
|
||||
static QPCIDevice *dev;
|
||||
|
@ -86,7 +86,7 @@ static void test_timer(void)
|
|||
fatal("time too big %u\n", curr);
|
||||
}
|
||||
for (cnt = 0; ; ) {
|
||||
clock_step(1 * NS_PER_SEC);
|
||||
clock_step(1 * NSEC_PER_SEC);
|
||||
prev = curr;
|
||||
curr = in_Timer();
|
||||
|
||||
|
@ -125,7 +125,7 @@ static void test_timer(void)
|
|||
out_IntrStatus(0x4000);
|
||||
curr = in_Timer();
|
||||
out_TimerInt(curr + 0.5 * CLK);
|
||||
clock_step(1 * NS_PER_SEC);
|
||||
clock_step(1 * NSEC_PER_SEC);
|
||||
out_Timer(0);
|
||||
if ((in_IntrStatus() & 0x4000) == 0) {
|
||||
fatal("we should have an interrupt here!\n");
|
||||
|
@ -137,7 +137,7 @@ static void test_timer(void)
|
|||
out_IntrStatus(0x4000);
|
||||
curr = in_Timer();
|
||||
out_TimerInt(curr + 0.5 * CLK);
|
||||
clock_step(1 * NS_PER_SEC);
|
||||
clock_step(1 * NSEC_PER_SEC);
|
||||
out_TimerInt(0);
|
||||
if ((in_IntrStatus() & 0x4000) == 0) {
|
||||
fatal("we should have an interrupt here!\n");
|
||||
|
@ -148,7 +148,7 @@ static void test_timer(void)
|
|||
next = curr + 5.0 * CLK;
|
||||
out_TimerInt(next);
|
||||
for (cnt = 0; ; ) {
|
||||
clock_step(1 * NS_PER_SEC);
|
||||
clock_step(1 * NSEC_PER_SEC);
|
||||
prev = curr;
|
||||
curr = in_Timer();
|
||||
diff = (curr-prev) & 0xffffffffu;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue