[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCHv2] Add rtc reset function.
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] Re: [PATCHv2] Add rtc reset function. |
Date: |
Tue, 09 Jun 2009 12:23:21 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
Gleb Natapov wrote:
> On reset:
> Periodic Interrupt Enable (PIE) bit is cleared to zero
> Alarm Interrupt Enable (AIE) bit is cleared to zero
> Update ended Interrupt Flag (UF) bit is cleared to zero
> Interrupt Request status Flag (IRQF) bit is cleared to zero
> Periodic Interrupt Flag (PF) bit is cleared to zero
> Alarm Interrupt Flag (AF) bit is cleared to zero
> Square Wave output Enable (SQWE) zero
>
> Signed-off-by: Gleb Natapov <address@hidden>
> diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
> index 888b85a..8c446e1 100644
> --- a/hw/mc146818rtc.c
> +++ b/hw/mc146818rtc.c
> @@ -57,6 +57,11 @@
> #define REG_B_SQWE 0x08
> #define REG_B_DM 0x04
>
> +#define REG_C_UF 0x10
> +#define REG_C_IRQF 0x80
> +#define REG_C_PF 0x40
> +#define REG_C_AF 0x20
> +
> struct RTCState {
> uint8_t cmos_data[128];
> uint8_t cmos_index;
> @@ -568,6 +573,21 @@ static int rtc_load_td(QEMUFile *f, void *opaque, int
> version_id)
> }
> #endif
>
> +static void rtc_reset(void *opaque)
> +{
> + RTCState *s = opaque;
> +
> + s->cmos_data[RTC_REG_B] &= ~(REG_B_PIE | REG_B_AIE | REG_B_SQWE);
> + s->cmos_data[RTC_REG_C] &= ~(REG_C_UF | REG_C_IRQF | REG_C_PF |
> REG_C_AF);
> +
> + qemu_irq_lower(s->irq);
> +
> +#ifdef TARGET_I386
> + if (rtc_td_hack)
> + s->irq_coalesced = 0;
Sorry, missed that on first run: Isn't it safer, clearer, more beautiful
to reset this unconditionally?
Jan