diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-25 18:03:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-25 18:03:19 +0100 |
| commit | 690b286fefa806f130dfc1931b5ba0b4dd2fb415 (patch) | |
| tree | ccea2619650e9e981a81429769111746237d2587 /include/hw | |
| parent | cdf98182420e3bec62e2fd957eb8a17761161c0f (diff) | |
| parent | ab60b7485cece312ad9c21327ee678f0f9898fb5 (diff) | |
| download | hqemu-690b286fefa806f130dfc1931b5ba0b4dd2fb415.zip hqemu-690b286fefa806f130dfc1931b5ba0b4dd2fb415.tar.gz | |
Merge remote-tracking branch 'remotes/vivier-misc/tags/pull-muldiv64-20150925' into staging
Remove muldiv64() by using period instead of frequency
# gpg: Signature made Fri 25 Sep 2015 14:54:37 BST using RSA key ID 3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier-misc/tags/pull-muldiv64-20150925:
net: remove muldiv64()
bt: remove muldiv64()
hpet: remove muldiv64()
arm: clarify the use of muldiv64()
openrisc: remove muldiv64()
mips: remove muldiv64()
pcnet: remove muldiv64()
rtl8139: remove muldiv64()
i6300esb: remove muldiv64()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/timer/hpet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h index 773953b..d872909 100644 --- a/include/hw/timer/hpet.h +++ b/include/hw/timer/hpet.h @@ -16,9 +16,9 @@ #include "qom/object.h" #define HPET_BASE 0xfed00000 -#define HPET_CLK_PERIOD 10000000ULL /* 10000000 femtoseconds == 10ns*/ +#define HPET_CLK_PERIOD 10 /* 10 ns*/ -#define FS_PER_NS 1000000 +#define FS_PER_NS 1000000 /* 1000000 femtoseconds == 1 ns */ #define HPET_MIN_TIMERS 3 #define HPET_MAX_TIMERS 32 |
