diff options
| author | malc | 2011-08-22 12:41:12 +0200 |
|---|---|---|
| committer | malc | 2011-08-22 12:41:12 +0200 |
| commit | 1afa194a0a3384c5a8fd150e4335d332c22883cf (patch) | |
| tree | 87d1ca2dbfb03128e628e344a713297131bad7f7 /hw/slavio_timer.c | |
| parent | tcg/ppc64: implement not_i32/64 and ext32u_i64 (diff) | |
| parent | Merge remote-tracking branch 'pmaydell/armhw-for-upstream' into staging (diff) | |
| download | qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.gz qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.xz qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/slavio_timer.c')
| -rw-r--r-- | hw/slavio_timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c index f89b4fb5bf..84449baa71 100644 --- a/hw/slavio_timer.c +++ b/hw/slavio_timer.c @@ -48,16 +48,16 @@ typedef struct CPUTimerState { qemu_irq irq; ptimer_state *timer; uint32_t count, counthigh, reached; - uint64_t limit; - // processor only + /* processor only */ uint32_t running; + uint64_t limit; } CPUTimerState; typedef struct SLAVIO_TIMERState { SysBusDevice busdev; uint32_t num_cpus; - CPUTimerState cputimer[MAX_CPUS + 1]; uint32_t cputimer_mode; + CPUTimerState cputimer[MAX_CPUS + 1]; } SLAVIO_TIMERState; typedef struct TimerContext { |