From patchwork Wed Aug 14 11:29:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 267099 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 86ACE2C01BE for ; Wed, 14 Aug 2013 21:30:15 +1000 (EST) Received: from localhost ([::1]:54369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9ZHJ-0002ZK-NS for incoming@patchwork.ozlabs.org; Wed, 14 Aug 2013 07:30:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9ZGz-0002Yx-An for qemu-devel@nongnu.org; Wed, 14 Aug 2013 07:29:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9ZGt-0005IF-CQ for qemu-devel@nongnu.org; Wed, 14 Aug 2013 07:29:53 -0400 Received: from thoth.sbs.de ([192.35.17.2]:31485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9ZGt-0005Hk-2j for qemu-devel@nongnu.org; Wed, 14 Aug 2013 07:29:47 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id r7EBTirY026738; Wed, 14 Aug 2013 13:29:44 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.40.156]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id r7EBThar027467; Wed, 14 Aug 2013 13:29:44 +0200 Message-ID: <520B6A27.4040207@siemens.com> Date: Wed, 14 Aug 2013 13:29:43 +0200 From: Jan Kiszka 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 MIME-Version: 1.0 To: qemu-devel , Anthony Liguori X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 192.35.17.2 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] rtc: remove dead SQW IRQ code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This was once introduced by commit 100d9891d6 but was never used in-tree and then got broken by commit 32e0c8260d. Time to clean up. Signed-off-by: Jan Kiszka --- hw/timer/mc146818rtc.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 3c3baac..b3f1baa 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -70,7 +70,6 @@ typedef struct RTCState { uint64_t last_update; int64_t offset; qemu_irq irq; - qemu_irq sqw_irq; int it_shift; /* periodic timer */ QEMUTimer *periodic_timer; @@ -151,8 +150,7 @@ static void periodic_timer_update(RTCState *s, int64_t current_time) period_code = s->cmos_data[RTC_REG_A] & 0x0f; if (period_code != 0 - && ((s->cmos_data[RTC_REG_B] & REG_B_PIE) - || ((s->cmos_data[RTC_REG_B] & REG_B_SQWE) && s->sqw_irq))) { + && (s->cmos_data[RTC_REG_B] & REG_B_PIE)) { if (period_code <= 2) period_code += 7; /* period in 32 Khz cycles */ @@ -202,11 +200,6 @@ static void rtc_periodic_timer(void *opaque) #endif qemu_irq_raise(s->irq); } - if (s->cmos_data[RTC_REG_B] & REG_B_SQWE) { - /* Not square wave at all but we don't want 2048Hz interrupts! - Must be seen as a pulse. */ - qemu_irq_raise(s->sqw_irq); - } } /* handle update-ended timer */