From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MDeOe-0000bo-B1 for qemu-devel@nongnu.org; Mon, 08 Jun 2009 08:56:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MDeOY-0000Rb-S8 for qemu-devel@nongnu.org; Mon, 08 Jun 2009 08:56:15 -0400 Received: from [199.232.76.173] (port=54839 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MDeOY-0000RR-NC for qemu-devel@nongnu.org; Mon, 08 Jun 2009 08:56:10 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41856) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MDeOY-0007PP-6M for qemu-devel@nongnu.org; Mon, 08 Jun 2009 08:56:10 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n58Cu9fg005522 for ; Mon, 8 Jun 2009 08:56:09 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n58Cu8V8010155 for ; Mon, 8 Jun 2009 08:56:08 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n58Cu74L022057 for ; Mon, 8 Jun 2009 08:56:07 -0400 From: Gleb Natapov Date: Mon, 8 Jun 2009 15:56:04 +0300 Message-Id: <1244465766-6349-1-git-send-email-gleb@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] Add rtc reset function. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- hw/mc146818rtc.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 888b85a..98a2273 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -568,6 +568,22 @@ static int rtc_load_td(QEMUFile *f, void *opaque, int version_id) } #endif +static void rtc_reset(void *opaque) +{ + RTCState *s = opaque; + + /* clear PIE,AIE,SQWE on reset */ + s->cmos_data[RTC_REG_B] &= ~((1<<6) | (1<<5) | (1<<3)); + + /* clear UF,IRQF,PF,AF on reset */ + s->cmos_data[RTC_REG_C] &= ~((1<<4) | (1<<7) | (1<<6) | (1<<5)); + +#ifdef TARGET_I386 + if (rtc_td_hack) + s->irq_coalesced = 0; +#endif +} + RTCState *rtc_init_sqw(int base, qemu_irq irq, qemu_irq sqw_irq, int base_year) { RTCState *s; @@ -606,6 +622,8 @@ RTCState *rtc_init_sqw(int base, qemu_irq irq, qemu_irq sqw_irq, int base_year) if (rtc_td_hack) register_savevm("mc146818rtc-td", base, 1, rtc_save_td, rtc_load_td, s); #endif + qemu_register_reset(rtc_reset, 0, s); + return s; } @@ -721,5 +739,6 @@ RTCState *rtc_mm_init(target_phys_addr_t base, int it_shift, qemu_irq irq, if (rtc_td_hack) register_savevm("mc146818rtc-td", base, 1, rtc_save_td, rtc_load_td, s); #endif + qemu_register_reset(rtc_reset, 0, s); return s; } -- 1.6.2.1