From patchwork Wed Mar 28 13:42:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 149209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 236E7B6EEC for ; Thu, 29 Mar 2012 00:43:09 +1100 (EST) Received: from localhost ([::1]:41763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCt9W-0007UK-V7 for incoming@patchwork.ozlabs.org; Wed, 28 Mar 2012 09:43:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCt98-00073Y-9o for qemu-devel@nongnu.org; Wed, 28 Mar 2012 09:42:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCt96-0003tH-5Y for qemu-devel@nongnu.org; Wed, 28 Mar 2012 09:42:41 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:42861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCt95-0003n7-T6 for qemu-devel@nongnu.org; Wed, 28 Mar 2012 09:42:40 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so2096131pbc.4 for ; Wed, 28 Mar 2012 06:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=CDMm66NsAa1OF0DmaBZt0RSpDKn+iI7Tyxh8IYe6lsY=; b=lkXzqm7i3Wlm4mAb255GqtcAxAf8pDH0u2+hGf+dBTNThh7jyquTf7760N4YqYjlxV aemY6UM5DoJ10kgFrQaWortwfQK+SQeoHF7jHtYdogvSPeoICfFf+eBTp4qefQQAJNqy EdO0pum5l1NboYKUn4uVy56pU7ANbvsjUPhQqTbnBIlkyx8ZUv34euzYfUF1SSyMixse bC71mjz6jJgvYlBnkp1cgvbwfTlLaDc861N/yMXOkWFcwJQJeaRhdGwuPBaG7ncCTCXB I4PtHP17LiRFiHFLm9hsIGZBhqrld60X7sWRnLjfmUU0wS5SDEnlaRFDXhndNSJHmFU0 CCzw== Received: by 10.68.213.73 with SMTP id nq9mr7239638pbc.143.1332942158992; Wed, 28 Mar 2012 06:42:38 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id m6sm2744894pbd.5.2012.03.28.06.42.36 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Mar 2012 06:42:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 28 Mar 2012 15:42:06 +0200 Message-Id: <1332942127-8964-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1332942127-8964-1-git-send-email-pbonzini@redhat.com> References: <1332942127-8964-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH v4 6/7] rtc: split out macros into a header file and use in test case 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 From: Anthony Liguori Signed-off-by: Anthony Liguori Signed-off-by: Paolo Bonzini --- hw/mc146818rtc.c | 33 -------------------------- hw/mc146818rtc.h | 3 +- hw/mc146818rtc_regs.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 35 deletions(-) create mode 100644 hw/mc146818rtc_regs.h diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 2b59c36..9c64e0a 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -47,39 +47,6 @@ #define RTC_REINJECT_ON_ACK_COUNT 20 -#define RTC_SECONDS 0 -#define RTC_SECONDS_ALARM 1 -#define RTC_MINUTES 2 -#define RTC_MINUTES_ALARM 3 -#define RTC_HOURS 4 -#define RTC_HOURS_ALARM 5 -#define RTC_ALARM_DONT_CARE 0xC0 - -#define RTC_DAY_OF_WEEK 6 -#define RTC_DAY_OF_MONTH 7 -#define RTC_MONTH 8 -#define RTC_YEAR 9 - -#define RTC_REG_A 10 -#define RTC_REG_B 11 -#define RTC_REG_C 12 -#define RTC_REG_D 13 - -#define REG_A_UIP 0x80 - -#define REG_B_SET 0x80 -#define REG_B_PIE 0x40 -#define REG_B_AIE 0x20 -#define REG_B_UIE 0x10 -#define REG_B_SQWE 0x08 -#define REG_B_DM 0x04 -#define REG_B_24H 0x02 - -#define REG_C_UF 0x10 -#define REG_C_IRQF 0x80 -#define REG_C_PF 0x40 -#define REG_C_AF 0x20 - typedef struct RTCState { ISADevice dev; MemoryRegion io; diff --git a/hw/mc146818rtc.h b/hw/mc146818rtc.h index f119930..f286b6a 100644 --- a/hw/mc146818rtc.h +++ b/hw/mc146818rtc.h @@ -2,8 +2,7 @@ #define MC146818RTC_H #include "isa.h" - -#define RTC_ISA_IRQ 8 +#include "mc146818rtc_regs.h" ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); diff --git a/hw/mc146818rtc_regs.h b/hw/mc146818rtc_regs.h new file mode 100644 index 0000000..3ab3770 --- /dev/null +++ b/hw/mc146818rtc_regs.h @@ -0,0 +1,62 @@ +/* + * QEMU MC146818 RTC emulation + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#ifndef RTC_REGS_H +#define RTC_REGS_H + +#define RTC_ISA_IRQ 8 + +#define RTC_SECONDS 0 +#define RTC_SECONDS_ALARM 1 +#define RTC_MINUTES 2 +#define RTC_MINUTES_ALARM 3 +#define RTC_HOURS 4 +#define RTC_HOURS_ALARM 5 +#define RTC_ALARM_DONT_CARE 0xC0 + +#define RTC_DAY_OF_WEEK 6 +#define RTC_DAY_OF_MONTH 7 +#define RTC_MONTH 8 +#define RTC_YEAR 9 + +#define RTC_REG_A 10 +#define RTC_REG_B 11 +#define RTC_REG_C 12 +#define RTC_REG_D 13 + +#define REG_A_UIP 0x80 + +#define REG_B_SET 0x80 +#define REG_B_PIE 0x40 +#define REG_B_AIE 0x20 +#define REG_B_UIE 0x10 +#define REG_B_SQWE 0x08 +#define REG_B_DM 0x04 +#define REG_B_24H 0x02 + +#define REG_C_UF 0x10 +#define REG_C_IRQF 0x80 +#define REG_C_PF 0x40 +#define REG_C_AF 0x20 + +#endif