diff options
| author | David Turner <digit@android.com> | 2010-09-09 22:54:36 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-09-13 00:30:34 -0700 |
| commit | 6a9ef1773bf874dea493ff3861782a1e577b67dd (patch) | |
| tree | 18cb2addd19195710b8860077ed9bfbef8ad44a5 /cpu-common.h | |
| parent | 0c0b2b4e96b030854987b16a779e30a3741d3b0d (diff) | |
| download | external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.zip external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.tar.gz external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.tar.bz2 | |
upstream: move timer management code to qemu-timer.c
Diffstat (limited to 'cpu-common.h')
| -rw-r--r-- | cpu-common.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/cpu-common.h b/cpu-common.h index 8f89325..d48ba5b 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -3,19 +3,25 @@ /* CPU interfaces that are target indpendent. */ -#if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) +#if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__) #define WORDS_ALIGNED #endif +#ifdef TARGET_PHYS_ADDR_BITS +#include "targphys.h" +#endif + +#ifndef NEED_CPU_H +#include "poison.h" +#endif + #include "bswap.h" +#include "qemu-queue.h" + +#if !defined(CONFIG_USER_ONLY) /* address in the RAM (different from a physical address) */ -#ifdef CONFIG_KQEMU -/* FIXME: This is wrong. */ -typedef uint32_t ram_addr_t; -#else typedef unsigned long ram_addr_t; -#endif /* memory API */ @@ -92,4 +98,6 @@ void cpu_physical_memory_write_rom(target_phys_addr_t addr, #define IO_MEM_SUBPAGE (2) #define IO_MEM_SUBWIDTH (4) +#endif + #endif /* !CPU_COMMON_H */ |