From patchwork Tue Jan 5 06:27:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 42203 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 7F9DFB6EED for ; Wed, 6 Jan 2010 08:46:09 +1100 (EST) Received: from localhost ([127.0.0.1]:41479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSHE6-0007Fc-N8 for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2010 16:46:06 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSFQ5-0007eM-4g for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:21 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSFPz-0007Zy-1C for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:19 -0500 Received: from [199.232.76.173] (port=40932 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSFPy-0007Zh-Rd for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:14 -0500 Received: from mx20.gnu.org ([199.232.41.8]:36255) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSFPy-0003Ef-GR for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:14 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NS2tq-0003n5-My for qemu-devel@nongnu.org; Tue, 05 Jan 2010 01:28:15 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id C166218283; Tue, 5 Jan 2010 15:27:42 +0900 (JST) Received: (nullmailer pid 22682 invoked by uid 1000); Tue, 05 Jan 2010 06:27:50 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Tue, 5 Jan 2010 15:27:42 +0900 Message-Id: <1262672870-22607-20-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1262672870-22607-1-git-send-email-yamahata@valinux.co.jp> References: <1262672870-22607-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V11 19/27] pc: move rtc declarations from pc.h into a dedicated header file. 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 Move rtc_xxx declarations from pc.h into mc146818rtc.h. Signed-off-by: Isaku Yamahata --- hw/mc146818rtc.h | 10 ++++++++++ hw/pc.h | 10 ++-------- 2 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 hw/mc146818rtc.h diff --git a/hw/mc146818rtc.h b/hw/mc146818rtc.h new file mode 100644 index 0000000..7211dae --- /dev/null +++ b/hw/mc146818rtc.h @@ -0,0 +1,10 @@ +#ifndef MC146818RTC_H +#define MC146818RTC_H + +typedef struct RTCState RTCState; + +RTCState *rtc_init(int base_year); +void rtc_set_memory(RTCState *s, int addr, int val); +void rtc_set_date(RTCState *s, const struct tm *tm); + +#endif /* !MC146818RTC_H */ diff --git a/hw/pc.h b/hw/pc.h index 7b7639c..b748615 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -3,6 +3,7 @@ #include "qemu-common.h" #include "isa.h" +#include "mc146818rtc.h" /* PC-style peripherals (also used by other machines). */ @@ -88,16 +89,9 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, target_phys_addr_t base, ram_addr_t size, target_phys_addr_t mask); -/* mc146818rtc.c */ - -typedef struct RTCState RTCState; - -RTCState *rtc_init(int base_year); -void rtc_set_memory(RTCState *s, int addr, int val); -void rtc_set_date(RTCState *s, const struct tm *tm); +/* pc.c */ void cmos_set_s3_resume_fn(void *opaque, int n, int level); -/* pc.c */ extern int fd_bootchk; void pc_register_ferr_irq(qemu_irq irq);