From patchwork Fri May 14 07:29:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 52586 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 5664AB7E54 for ; Fri, 14 May 2010 18:37:52 +1000 (EST) Received: from localhost ([127.0.0.1]:46554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCqOz-0000td-1D for incoming@patchwork.ozlabs.org; Fri, 14 May 2010 04:37:49 -0400 Received: from [140.186.70.92] (port=56892 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCqME-0008Qp-CT for qemu-devel@nongnu.org; Fri, 14 May 2010 04:34:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCqMC-0003KJ-Qv for qemu-devel@nongnu.org; Fri, 14 May 2010 04:34:58 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:37529) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCpO1-0002er-S1 for qemu-devel@nongnu.org; Fri, 14 May 2010 03:32:47 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id C48C6107165; Fri, 14 May 2010 16:32:40 +0900 (JST) Received: (nullmailer pid 28005 invoked by uid 1000); Fri, 14 May 2010 07:29:25 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Fri, 14 May 2010 16:29:16 +0900 Message-Id: <034d9605a84baf6cb569cc336e5078124972c27e.1273821065.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: blauwirbel@gmail.com, yamahata@valinux.co.jp, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 18/26] 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 Acked-by: Gerd Hoffmann --- hw/mc146818rtc.h | 10 ++++++++++ hw/pc.h | 9 +-------- 2 files changed, 11 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 8cfec6c..e3cc0a5 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -5,6 +5,7 @@ #include "ioport.h" #include "isa.h" #include "fdc.h" +#include "mc146818rtc.h" /* PC-style peripherals (also used by other machines). */ @@ -76,14 +77,6 @@ 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 */ extern int fd_bootchk;