diff options
| author | Alberto Garcia <berto@igalia.com> | 2015-06-12 16:01:30 +0300 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-07-02 09:20:18 +0100 |
| commit | e0cf11f31c24cfb17f44ed46c254d84c78e7f6e9 (patch) | |
| tree | 5e54e4b2b5d92e382428730e38f8b21a636ea7ff /hw | |
| parent | 471fae3c98d4f44b1957eb09d51ace440c585a20 (diff) | |
| download | qemu-e0cf11f31c24cfb17f44ed46c254d84c78e7f6e9.zip qemu-e0cf11f31c24cfb17f44ed46c254d84c78e7f6e9.tar.gz qemu-e0cf11f31c24cfb17f44ed46c254d84c78e7f6e9.tar.bz2 | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc/ppc.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr_rtc.c | 3 | ||||
| -rw-r--r-- | hw/timer/mc146818rtc.c | 1 | ||||
| -rw-r--r-- | hw/usb/hcd-ehci.c | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 99db56c..2a4b8e1 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -51,8 +51,6 @@ # define LOG_TB(...) do { } while (0) #endif -#define NSEC_PER_SEC 1000000000LL - static void cpu_ppc_tb_stop (CPUPPCState *env); static void cpu_ppc_tb_start (CPUPPCState *env); diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 83eb7c1..9da3746 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -26,6 +26,7 @@ * */ #include "cpu.h" +#include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/ppc/spapr.h" #include "qapi-event.h" @@ -40,8 +41,6 @@ struct sPAPRRTCState { int64_t ns_offset; }; -#define NSEC_PER_SEC 1000000000LL - void spapr_rtc_read(DeviceState *dev, struct tm *tm, uint32_t *ns) { sPAPRRTCState *rtc = SPAPR_RTC(dev); diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 2e3ffc8..954c34d 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -48,7 +48,6 @@ # define DPRINTF_C(format, ...) do { } while (0) #endif -#define NSEC_PER_SEC 1000000000LL #define SEC_PER_MIN 60 #define MIN_PER_HOUR 60 #define SEC_PER_HOUR 3600 diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index d4d7547..d7cd40b 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -32,7 +32,7 @@ #include "trace.h" #define FRAME_TIMER_FREQ 1000 -#define FRAME_TIMER_NS (1000000000 / FRAME_TIMER_FREQ) +#define FRAME_TIMER_NS (NSEC_PER_SEC / FRAME_TIMER_FREQ) #define UFRAME_TIMER_NS (FRAME_TIMER_NS / 8) #define NB_MAXINTRATE 8 // Max rate at which controller issues ints |