From patchwork Wed Oct 14 11:18:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 35943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CD3C6B7B6F for ; Wed, 14 Oct 2009 22:26:13 +1100 (EST) Received: from localhost ([127.0.0.1]:51930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My1ze-00006T-1v for incoming@patchwork.ozlabs.org; Wed, 14 Oct 2009 07:26:10 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1My1sc-0006Pw-9F for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:18:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1My1sX-0006OB-BN for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:18:53 -0400 Received: from [199.232.76.173] (port=60196 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My1sX-0006O8-0j for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:18:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59784) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1My1sW-0003Em-G7 for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:18:48 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9EBIl0P024280 for ; Wed, 14 Oct 2009 07:18:48 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9EBIfsj019196; Wed, 14 Oct 2009 07:18:47 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 14 Oct 2009 13:18:16 +0200 Message-Id: <369cfb38b63a3aeccbc77e8ea9ee6d61324392ad.1255518915.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 4/4] mc146818rtc: remove rtc_mm_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It was used for Acer Pica 61 emulation, removed in 2008 Signed-off-by: Juan Quintela --- hw/mc146818rtc.c | 105 ------------------------------------------------------ hw/pc.h | 2 - 2 files changed, 0 insertions(+), 107 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 4b449d9..61ddf0b 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -620,108 +620,3 @@ static void mc146818rtc_register(void) isa_qdev_register(&mc146818rtc_info); } device_init(mc146818rtc_register) - -/* Memory mapped interface */ -static uint32_t cmos_mm_readb (void *opaque, target_phys_addr_t addr) -{ - RTCState *s = opaque; - - return cmos_ioport_read(s, addr >> s->it_shift) & 0xFF; -} - -static void cmos_mm_writeb (void *opaque, - target_phys_addr_t addr, uint32_t value) -{ - RTCState *s = opaque; - - cmos_ioport_write(s, addr >> s->it_shift, value & 0xFF); -} - -static uint32_t cmos_mm_readw (void *opaque, target_phys_addr_t addr) -{ - RTCState *s = opaque; - uint32_t val; - - val = cmos_ioport_read(s, addr >> s->it_shift) & 0xFFFF; -#ifdef TARGET_WORDS_BIGENDIAN - val = bswap16(val); -#endif - return val; -} - -static void cmos_mm_writew (void *opaque, - target_phys_addr_t addr, uint32_t value) -{ - RTCState *s = opaque; -#ifdef TARGET_WORDS_BIGENDIAN - value = bswap16(value); -#endif - cmos_ioport_write(s, addr >> s->it_shift, value & 0xFFFF); -} - -static uint32_t cmos_mm_readl (void *opaque, target_phys_addr_t addr) -{ - RTCState *s = opaque; - uint32_t val; - - val = cmos_ioport_read(s, addr >> s->it_shift); -#ifdef TARGET_WORDS_BIGENDIAN - val = bswap32(val); -#endif - return val; -} - -static void cmos_mm_writel (void *opaque, - target_phys_addr_t addr, uint32_t value) -{ - RTCState *s = opaque; -#ifdef TARGET_WORDS_BIGENDIAN - value = bswap32(value); -#endif - cmos_ioport_write(s, addr >> s->it_shift, value); -} - -static CPUReadMemoryFunc * const rtc_mm_read[] = { - &cmos_mm_readb, - &cmos_mm_readw, - &cmos_mm_readl, -}; - -static CPUWriteMemoryFunc * const rtc_mm_write[] = { - &cmos_mm_writeb, - &cmos_mm_writew, - &cmos_mm_writel, -}; - -RTCState *rtc_mm_init(target_phys_addr_t base, int it_shift, qemu_irq irq, - int base_year) -{ - RTCState *s; - int io_memory; - - s = qemu_mallocz(sizeof(RTCState)); - - s->irq = irq; - s->cmos_data[RTC_REG_A] = 0x26; - s->cmos_data[RTC_REG_B] = 0x02; - s->cmos_data[RTC_REG_C] = 0x00; - s->cmos_data[RTC_REG_D] = 0x80; - - s->base_year = base_year; - rtc_set_date_from_host(s); - - s->periodic_timer = qemu_new_timer(rtc_clock, rtc_periodic_timer, s); - s->second_timer = qemu_new_timer(rtc_clock, rtc_update_second, s); - s->second_timer2 = qemu_new_timer(rtc_clock, rtc_update_second2, s); - - s->next_second_time = - qemu_get_clock(rtc_clock) + (get_ticks_per_sec() * 99) / 100; - qemu_mod_timer(s->second_timer2, s->next_second_time); - - io_memory = cpu_register_io_memory(rtc_mm_read, rtc_mm_write, s); - cpu_register_physical_memory(base, 2 << it_shift, io_memory); - - vmstate_register(base, &vmstate_rtc, s); - qemu_register_reset(rtc_reset, s); - return s; -} diff --git a/hw/pc.h b/hw/pc.h index d85f7fd..15fff8d 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -83,8 +83,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, typedef struct RTCState RTCState; RTCState *rtc_init(int base_year); -RTCState *rtc_mm_init(target_phys_addr_t base, int it_shift, qemu_irq irq, - int base_year); void rtc_set_memory(RTCState *s, int addr, int val); void rtc_set_date(RTCState *s, const struct tm *tm); void cmos_set_s3_resume(void);