From patchwork Mon Sep 26 13:40:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 116421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8A392B6F70 for ; Mon, 26 Sep 2011 23:41:54 +1000 (EST) Received: from localhost ([::1]:44995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8BRC-0002vz-Iy for incoming@patchwork.ozlabs.org; Mon, 26 Sep 2011 09:41:38 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8BQu-0002bq-9v for qemu-devel@nongnu.org; Mon, 26 Sep 2011 09:41:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8BQr-0000gc-RO for qemu-devel@nongnu.org; Mon, 26 Sep 2011 09:41:20 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:55711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8BQr-0000g6-KW for qemu-devel@nongnu.org; Mon, 26 Sep 2011 09:41:17 -0400 Received: by mail-bw0-f45.google.com with SMTP id zv15so5968451bkb.4 for ; Mon, 26 Sep 2011 06:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=FBu59WYgSelvrw8cgMze4t8W/k1w6RkY/LrziBI904M=; b=LjNFxwF5uQ2OpQR1xC/+rhnJJmq+qBpXIXA/NFCVzE9HPwgKTRjLGFlfsaKpYkMqqi HO3PP2jPOTmhhucn0q7WDMfVU9gHmmroQAw3BqhXuBxhqkkBRo6TXXVu5yMRFwW3w7sG h8pU9SPRWzdW+j9gbA8woJ0O/5SikJCHBkKm4= Received: by 10.204.135.9 with SMTP id l9mr4155929bkt.318.1317044477210; Mon, 26 Sep 2011 06:41:17 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id l15sm2506469bkw.9.2011.09.26.06.41.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Sep 2011 06:41:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 26 Sep 2011 15:40:50 +0200 Message-Id: <1317044451-6429-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317044451-6429-1-git-send-email-pbonzini@redhat.com> References: <1317044451-6429-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Subject: [Qemu-devel] [PATCH v3 1/2] ptimer: move declarations to ptimer.h 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 Signed-off-by: Paolo Bonzini --- hw/arm_timer.c | 1 + hw/etraxfs_timer.c | 1 + hw/grlib_apbuart.c | 1 + hw/grlib_gptimer.c | 1 + hw/lan9118.c | 1 + hw/leon3.c | 1 + hw/lm32_timer.c | 1 + hw/mcf5206.c | 1 + hw/mcf5208.c | 1 + hw/milkymist-sysctl.c | 1 + hw/musicpal.c | 1 + hw/ptimer.c | 1 + hw/ptimer.h | 27 +++++++++++++++++++++++++++ hw/sh_timer.c | 1 + hw/slavio_timer.c | 1 + hw/syborg_timer.c | 1 + hw/xilinx_axidma.c | 1 + hw/xilinx_timer.c | 1 + qemu-timer.h | 13 ------------- 19 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 hw/ptimer.h diff --git a/hw/arm_timer.c b/hw/arm_timer.c index 09a4b24..63c19d7 100644 --- a/hw/arm_timer.c +++ b/hw/arm_timer.c @@ -9,6 +9,7 @@ #include "sysbus.h" #include "qemu-timer.h" +#include "ptimer.h" /* Common timer implementation. */ diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c index b08e574..0a28c4c 100644 --- a/hw/etraxfs_timer.c +++ b/hw/etraxfs_timer.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "sysemu.h" #include "qemu-timer.h" +#include "ptimer.h" #define D(x) diff --git a/hw/grlib_apbuart.c b/hw/grlib_apbuart.c index c90b810..84d3d7a 100644 --- a/hw/grlib_apbuart.c +++ b/hw/grlib_apbuart.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "qemu-char.h" +#include "ptimer.h" #include "trace.h" diff --git a/hw/grlib_gptimer.c b/hw/grlib_gptimer.c index 85869b9..a0ae1c4 100644 --- a/hw/grlib_gptimer.c +++ b/hw/grlib_gptimer.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "qemu-timer.h" +#include "ptimer.h" #include "trace.h" diff --git a/hw/lan9118.c b/hw/lan9118.c index 73a8661..a562206 100644 --- a/hw/lan9118.c +++ b/hw/lan9118.c @@ -11,6 +11,7 @@ #include "net.h" #include "devices.h" #include "sysemu.h" +#include "ptimer.h" /* For crc32 */ #include diff --git a/hw/leon3.c b/hw/leon3.c index 607ec85..97a68f6 100644 --- a/hw/leon3.c +++ b/hw/leon3.c @@ -23,6 +23,7 @@ */ #include "hw.h" #include "qemu-timer.h" +#include "ptimer.h" #include "qemu-char.h" #include "sysemu.h" #include "boards.h" diff --git a/hw/lm32_timer.c b/hw/lm32_timer.c index 49cbb22..e355d80 100644 --- a/hw/lm32_timer.c +++ b/hw/lm32_timer.c @@ -25,6 +25,7 @@ #include "sysbus.h" #include "trace.h" #include "qemu-timer.h" +#include "ptimer.h" #include "qemu-error.h" #define DEFAULT_FREQUENCY (50*1000000) diff --git a/hw/mcf5206.c b/hw/mcf5206.c index 15d6f22..4ad3805 100644 --- a/hw/mcf5206.c +++ b/hw/mcf5206.c @@ -8,6 +8,7 @@ #include "hw.h" #include "mcf.h" #include "qemu-timer.h" +#include "ptimer.h" #include "sysemu.h" /* General purpose timer module. */ diff --git a/hw/mcf5208.c b/hw/mcf5208.c index 1c2c0c4..83c0c9e 100644 --- a/hw/mcf5208.c +++ b/hw/mcf5208.c @@ -8,6 +8,7 @@ #include "hw.h" #include "mcf.h" #include "qemu-timer.h" +#include "ptimer.h" #include "sysemu.h" #include "net.h" #include "boards.h" diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c index 7b2d544..5f8d4ad 100644 --- a/hw/milkymist-sysctl.c +++ b/hw/milkymist-sysctl.c @@ -26,6 +26,7 @@ #include "sysemu.h" #include "trace.h" #include "qemu-timer.h" +#include "ptimer.h" #include "qemu-error.h" enum { diff --git a/hw/musicpal.c b/hw/musicpal.c index 9b1f380..fd2e2ef 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -14,6 +14,7 @@ #include "boards.h" #include "pc.h" #include "qemu-timer.h" +#include "ptimer.h" #include "block.h" #include "flash.h" #include "console.h" diff --git a/hw/ptimer.c b/hw/ptimer.c index b6cabd5..de7d664 100644 --- a/hw/ptimer.c +++ b/hw/ptimer.c @@ -7,6 +7,7 @@ */ #include "hw.h" #include "qemu-timer.h" +#include "ptimer.h" #include "host-utils.h" struct ptimer_state diff --git a/hw/ptimer.h b/hw/ptimer.h new file mode 100644 index 0000000..69cdddc --- /dev/null +++ b/hw/ptimer.h @@ -0,0 +1,27 @@ +/* + * General purpose implementation of a simple periodic countdown timer. + * + * Copyright (c) 2007 CodeSourcery. + * + * This code is licensed under the GNU LGPL. + */ +#ifndef PTIMER_H +#define PTIMER_H + +#include "qemu-common.h" +#include "qemu-timer.h" + +/* ptimer.c */ +typedef struct ptimer_state ptimer_state; +typedef void (*ptimer_cb)(void *opaque); + +ptimer_state *ptimer_init(QEMUBH *bh); +void ptimer_set_period(ptimer_state *s, int64_t period); +void ptimer_set_freq(ptimer_state *s, uint32_t freq); +void ptimer_set_limit(ptimer_state *s, uint64_t limit, int reload); +uint64_t ptimer_get_count(ptimer_state *s); +void ptimer_set_count(ptimer_state *s, uint64_t count); +void ptimer_run(ptimer_state *s, int oneshot); +void ptimer_stop(ptimer_state *s); + +#endif diff --git a/hw/sh_timer.c b/hw/sh_timer.c index dca3c94..31bf975 100644 --- a/hw/sh_timer.c +++ b/hw/sh_timer.c @@ -11,6 +11,7 @@ #include "hw.h" #include "sh.h" #include "qemu-timer.h" +#include "ptimer.h" //#define DEBUG_TIMER diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c index 84449ba..b3a6745 100644 --- a/hw/slavio_timer.c +++ b/hw/slavio_timer.c @@ -24,6 +24,7 @@ #include "sun4m.h" #include "qemu-timer.h" +#include "ptimer.h" #include "sysbus.h" #include "trace.h" diff --git a/hw/syborg_timer.c b/hw/syborg_timer.c index 50c813e..c98484a 100644 --- a/hw/syborg_timer.c +++ b/hw/syborg_timer.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "qemu-timer.h" +#include "ptimer.h" #include "syborg.h" //#define DEBUG_SYBORG_TIMER diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c index 571a5b0..0bbeae3 100644 --- a/hw/xilinx_axidma.c +++ b/hw/xilinx_axidma.c @@ -25,6 +25,7 @@ #include "sysbus.h" #include "qemu-char.h" #include "qemu-timer.h" +#include "ptimer.h" #include "qemu-log.h" #include "qdev-addr.h" diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index 8779c56..a1cf440 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "qemu-timer.h" +#include "ptimer.h" #define D(x) diff --git a/qemu-timer.h b/qemu-timer.h index 0a43469..ea886cf 100644 --- a/qemu-timer.h +++ b/qemu-timer.h @@ -136,19 +136,6 @@ static inline int64_t get_clock(void) void qemu_get_timer(QEMUFile *f, QEMUTimer *ts); void qemu_put_timer(QEMUFile *f, QEMUTimer *ts); -/* ptimer.c */ -typedef struct ptimer_state ptimer_state; -typedef void (*ptimer_cb)(void *opaque); - -ptimer_state *ptimer_init(QEMUBH *bh); -void ptimer_set_period(ptimer_state *s, int64_t period); -void ptimer_set_freq(ptimer_state *s, uint32_t freq); -void ptimer_set_limit(ptimer_state *s, uint64_t limit, int reload); -uint64_t ptimer_get_count(ptimer_state *s); -void ptimer_set_count(ptimer_state *s, uint64_t count); -void ptimer_run(ptimer_state *s, int oneshot); -void ptimer_stop(ptimer_state *s); - /* icount */ int64_t qemu_icount_round(int64_t count); extern int64_t qemu_icount;