diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
| commit | 5d8f37ad78fc66901af50c762029a501561f3b23 (patch) | |
| tree | 206790f8f21000850a98c4f9590a79e779106278 /hw/goldfish_timer.c | |
| parent | cd059b15f2c7df69f4a087bd66900eb172e41d1c (diff) | |
| download | external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.zip external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.gz external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.bz2 | |
Merge upstream QEMU 10.0.50 into the Android source tree.
This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.
Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:
net.c net-android.c
qemu-char.c qemu-char-android.c
slirp/ slirp-android/
etc...
Tested on linux-x86, darwin-x86 and windows host machines.
Diffstat (limited to 'hw/goldfish_timer.c')
| -rw-r--r-- | hw/goldfish_timer.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/goldfish_timer.c b/hw/goldfish_timer.c index 73f1455..8a84895 100644 --- a/hw/goldfish_timer.c +++ b/hw/goldfish_timer.c @@ -74,7 +74,6 @@ static int goldfish_timer_load(QEMUFile* f, void* opaque, int version_id) static uint32_t goldfish_timer_read(void *opaque, target_phys_addr_t offset) { struct timer_state *s = (struct timer_state *)opaque; - offset -= s->dev.base; switch(offset) { case TIMER_TIME_LOW: s->now = muldiv64(qemu_get_clock(vm_clock), 1000000000, ticks_per_sec); @@ -91,7 +90,6 @@ static void goldfish_timer_write(void *opaque, target_phys_addr_t offset, uint32 { struct timer_state *s = (struct timer_state *)opaque; int64_t alarm, now; - offset -= s->dev.base; switch(offset) { case TIMER_ALARM_LOW: s->alarm_low = value; @@ -161,7 +159,6 @@ static int goldfish_rtc_load(QEMUFile* f, void* opaque, int version_id) static uint32_t goldfish_rtc_read(void *opaque, target_phys_addr_t offset) { struct rtc_state *s = (struct rtc_state *)opaque; - offset -= s->dev.base; switch(offset) { case 0x0: s->now = (int64_t)time(NULL) * 1000000000; @@ -178,7 +175,6 @@ static void goldfish_rtc_write(void *opaque, target_phys_addr_t offset, uint32_t { struct rtc_state *s = (struct rtc_state *)opaque; int64_t alarm; - offset -= s->dev.base; switch(offset) { case 0x8: s->alarm_low = value; |