From patchwork Wed Jun 10 22:08:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 280820 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D5EDC433DF for ; Wed, 10 Jun 2020 22:17:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DA0D12072E for ; Wed, 10 Jun 2020 22:17:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R41BaKjv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA0D12072E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jj92L-0000SC-5k for qemu-devel@archiver.kernel.org; Wed, 10 Jun 2020 18:17:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jj8uR-0005rs-HE; Wed, 10 Jun 2020 18:09:23 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:37859) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jj8uQ-0008I3-OH; Wed, 10 Jun 2020 18:09:23 -0400 Received: by mail-wm1-x341.google.com with SMTP id y20so3242443wmi.2; Wed, 10 Jun 2020 15:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8b3HXRDRgYc7wWaPey7dft5cQmLY7o7QcJ77viT780g=; b=R41BaKjvg004OQwwfq6Wfmg/PhLdfgNsE4DLN9moitPuqqOmVkQUNMeeLXIrq1ZVyt XJfe16VgHJ+FmdnWdpzjEuipsVVHQt/Qu+WuwbOALkoWbe6IZbVIiZAJaF3LNGVfbyOk qpLu452YauclYygLIA2pekMKeETe9gTkHU5Lp1sBrp6fJWpkRLg9ylbXe29dTISIa4uQ v1XuQRqpnWMt+DQcjwnP2wqRU3RGCf4AP8yHMgoTkL9+tlWTJtBfbm5cepyBgZBwB8SE CeGj3IktshR/vXiyMJ98ukiGYnkxtDlh/3uZA9ygM0Xar2Ipb53aAP+EvpscOuGzNa1P 2+Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8b3HXRDRgYc7wWaPey7dft5cQmLY7o7QcJ77viT780g=; b=j3x28MrTPerbxQuaoTpImCKPCDn3Igtp6Sxe5XeOkr5hJ3IUVvH7B0Wx1KZ5ZF3Nqb CxxuD0DEKHnrbAuz8RJ3GrAOkpIF5yD4/zRpD/fGVZRTctM68f68LZMfpA4g7bSrHem7 u490iosOxw4LioqMKeSjndMdDP4/meLncgJusfHw3Io+2YvBv9bBkKnyhyNSWmAmFoiR 7s75iZaWB6z3dDUfD8gcHDD56j1qOENk2BaRsmv8BYIQHOrwLz1ulMtcL14NNxHxY0N5 zTRMi6am/VaZgIFgWeyXnDnostVR2iGy5s1BLDxfFs6e/scRkDzjbZYTC4XQyy5VNhpj RK3w== X-Gm-Message-State: AOAM533d25psIHuTrDy1u8pQlOT4niIV9IH9WBx3uwKvhbwfs9DQqif5 fgChB4V7mSIQc7BVDFu1ntKKrU8q X-Google-Smtp-Source: ABdhPJy/PXCVIXLyZ91JwPluaMDE1RpcYN7B5544kodAq1S9auUVfLDDk1aLaESgrAIG/BvYvvlMng== X-Received: by 2002:a1c:bc0a:: with SMTP id m10mr4925526wmf.173.1591826948426; Wed, 10 Jun 2020 15:09:08 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id 40sm1819354wrc.15.2020.06.10.15.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 15:09:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 08/11] hw/sh4: Extract timer definitions to 'hw/timer/tmu012.h' Date: Thu, 11 Jun 2020 00:08:50 +0200 Message-Id: <20200610220853.8558-9-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200610220853.8558-1-f4bug@amsat.org> References: <20200610220853.8558-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , Magnus Damm , Yoshinori Sato , qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Aleksandar Markovic , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Extract timer definitions to 'hw/timer/tmu012.h'. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/hw/sh4/sh.h | 9 --------- include/hw/timer/tmu012.h | 23 +++++++++++++++++++++++ hw/sh4/sh7750.c | 1 + hw/timer/sh_timer.c | 2 ++ 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 include/hw/timer/tmu012.h diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h index fe773cb01d..93f464bf4c 100644 --- a/include/hw/sh4/sh.h +++ b/include/hw/sh4/sh.h @@ -27,15 +27,6 @@ typedef struct { int sh7750_register_io_device(struct SH7750State *s, sh7750_io_device * device); -/* sh_timer.c */ -#define TMU012_FEAT_TOCR (1 << 0) -#define TMU012_FEAT_3CHAN (1 << 1) -#define TMU012_FEAT_EXTCLK (1 << 2) -void tmu012_init(MemoryRegion *sysmem, hwaddr base, - int feat, uint32_t freq, - qemu_irq ch0_irq, qemu_irq ch1_irq, - qemu_irq ch2_irq0, qemu_irq ch2_irq1); - /* sh_serial.c */ #define SH_SERIAL_FEAT_SCIF (1 << 0) diff --git a/include/hw/timer/tmu012.h b/include/hw/timer/tmu012.h new file mode 100644 index 0000000000..808ed8de1d --- /dev/null +++ b/include/hw/timer/tmu012.h @@ -0,0 +1,23 @@ +/* + * SuperH Timer + * + * Copyright (c) 2007 Magnus Damm + * + * This code is licensed under the GPL. + */ + +#ifndef HW_TIMER_TMU012_H +#define HW_TIMER_TMU012_H + +#include "exec/hwaddr.h" + +#define TMU012_FEAT_TOCR (1 << 0) +#define TMU012_FEAT_3CHAN (1 << 1) +#define TMU012_FEAT_EXTCLK (1 << 2) + +void tmu012_init(MemoryRegion *sysmem, hwaddr base, + int feat, uint32_t freq, + qemu_irq ch0_irq, qemu_irq ch1_irq, + qemu_irq ch2_irq0, qemu_irq ch2_irq1); + +#endif diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index d660714443..f8ac3ec6e3 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -30,6 +30,7 @@ #include "sh7750_regs.h" #include "sh7750_regnames.h" #include "hw/sh4/sh_intc.h" +#include "hw/timer/tmu012.h" #include "cpu.h" #include "exec/exec-all.h" diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c index 13c4051808..b9cbacf5d0 100644 --- a/hw/timer/sh_timer.c +++ b/hw/timer/sh_timer.c @@ -9,10 +9,12 @@ */ #include "qemu/osdep.h" +#include "exec/memory.h" #include "hw/hw.h" #include "hw/irq.h" #include "hw/sh4/sh.h" #include "qemu/timer.h" +#include "hw/timer/tmu012.h" #include "hw/ptimer.h" //#define DEBUG_TIMER