[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] Make hpet_in_legacy_mode() return 0 for !TARGET
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 4/6] Make hpet_in_legacy_mode() return 0 for !TARGET_I386 |
Date: |
Mon, 24 May 2010 17:18:19 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/hpet_emul.h | 12 ++++++++++--
hw/mc146818rtc.c | 6 ------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/hw/hpet_emul.h b/hw/hpet_emul.h
index 7e9b610..b6fae0a 100644
--- a/hw/hpet_emul.h
+++ b/hw/hpet_emul.h
@@ -15,6 +15,15 @@
extern int no_hpet;
+#if !defined(TARGET_I386)
+
+static inline uint32_t hpet_in_legacy_mode(void)
+{
+ return 0;
+}
+
+#else
+
#define HPET_BASE 0xfed00000
#define HPET_CLK_PERIOD 10000000ULL /* 10000000 femtoseconds == 10ns*/
@@ -76,9 +85,8 @@ typedef struct HPETState {
uint64_t hpet_counter; /* main counter */
} HPETState;
-#if defined TARGET_I386
extern uint32_t hpet_in_legacy_mode(void);
extern void hpet_init(qemu_irq *irq);
-#endif
+#endif /* TARGET_I386 */
#endif
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 571c593..b2af5de 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -101,9 +101,7 @@ static void rtc_irq_raise(qemu_irq irq)
* mode is established while interrupt is raised. We want it to
* be lowered in any case
*/
-#if defined TARGET_I386
if (!hpet_in_legacy_mode())
-#endif
qemu_irq_raise(irq);
}
@@ -148,14 +146,10 @@ static void rtc_timer_update(RTCState *s, int64_t
current_time)
int enable_pie;
period_code = s->cmos_data[RTC_REG_A] & 0x0f;
-#if defined TARGET_I386
/* disable periodic timer if hpet is in legacy mode, since interrupts are
* disabled anyway.
*/
enable_pie = !hpet_in_legacy_mode();
-#else
- enable_pie = 1;
-#endif
if (period_code != 0
&& (((s->cmos_data[RTC_REG_B] & REG_B_PIE) && enable_pie)
|| ((s->cmos_data[RTC_REG_B] & REG_B_SQWE) && s->sqw_irq))) {
--
1.6.6.1
- [Qemu-devel] [PATCH 0/6] Make hpet a compile time option, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 1/6] Create again config-device.h and config.devices.h, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 2/6] Move no_hpet declaration to hpet_emul.h, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 3/6] Move no_hpet test to inside hpet_init(), Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 6/6] Create CONFIG_HPET, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 4/6] Make hpet_in_legacy_mode() return 0 for !TARGET_I386,
Juan Quintela <=
- [Qemu-devel] [PATCH 5/6] make hpet_in_legacy_mode() return a bool, Juan Quintela, 2010/05/24
- [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Juan Quintela, 2010/05/24
- [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Jan Kiszka, 2010/05/24
- [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Paul Brook, 2010/05/24
- Re: [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Anthony Liguori, 2010/05/24
- Re: [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Paul Brook, 2010/05/24