Date: Thu, 20 Apr 2023 16:43:17 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: de4da6cd04bf - main - x86: Move i386 timerreg.h to x86 Message-ID: <202304201643.33KGhHpp094572@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=de4da6cd04bf299e46f0c65d4bfd9fa94bf00f08 commit de4da6cd04bf299e46f0c65d4bfd9fa94bf00f08 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2023-04-20 16:42:59 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2023-04-20 16:42:59 +0000 x86: Move i386 timerreg.h to x86 Reviewed by: emaste, jhb Differential Revision: https://reviews.freebsd.org/D39656 MFC after: 1 month --- sys/amd64/acpica/acpi_wakecode.S | 2 +- sys/amd64/vmm/io/vatpit.h | 2 +- sys/i386/acpica/acpi_wakecode.S | 2 +- sys/i386/include/timerreg.h | 56 ----------------------------------- sys/{amd64 => x86}/include/timerreg.h | 0 sys/x86/isa/clock.c | 2 +- 6 files changed, 4 insertions(+), 60 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakecode.S b/sys/amd64/acpica/acpi_wakecode.S index 6a112c5ea438..3828feeb35df 100644 --- a/sys/amd64/acpica/acpi_wakecode.S +++ b/sys/amd64/acpica/acpi_wakecode.S @@ -31,8 +31,8 @@ #include <machine/asmacros.h> #include <machine/specialreg.h> -#include <machine/timerreg.h> #include <x86/ppireg.h> +#include <x86/timerreg.h> #include "assym.inc" diff --git a/sys/amd64/vmm/io/vatpit.h b/sys/amd64/vmm/io/vatpit.h index 96ed9c231420..a026545263c0 100644 --- a/sys/amd64/vmm/io/vatpit.h +++ b/sys/amd64/vmm/io/vatpit.h @@ -32,7 +32,7 @@ #ifndef _VATPIT_H_ #define _VATPIT_H_ -#include <machine/timerreg.h> +#include <x86/timerreg.h> #define NMISC_PORT 0x61 diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S index ccbc67e5f588..af6567d9d0a8 100644 --- a/sys/i386/acpica/acpi_wakecode.S +++ b/sys/i386/acpica/acpi_wakecode.S @@ -31,8 +31,8 @@ #include <machine/asmacros.h> #include <machine/specialreg.h> -#include <machine/timerreg.h> #include <x86/ppireg.h> +#include <x86/timerreg.h> #include "assym.inc" diff --git a/sys/i386/include/timerreg.h b/sys/i386/include/timerreg.h deleted file mode 100644 index 77e6cad5775d..000000000000 --- a/sys/i386/include/timerreg.h +++ /dev/null @@ -1,56 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -/* - * The outputs of the three timers are connected as follows: - * - * timer 0 -> irq 0 - * timer 1 -> dma chan 0 (for dram refresh) - * timer 2 -> speaker (via keyboard controller) - * - * Timer 0 is used to call hardclock. - * Timer 2 is used to generate console beeps. - */ - -#ifndef _MACHINE_TIMERREG_H_ -#define _MACHINE_TIMERREG_H_ - -#ifdef _KERNEL - -#include <dev/ic/i8253reg.h> - -#define IO_TIMER1 0x40 /* 8253 Timer #1 */ -#define TIMER_CNTR0 (IO_TIMER1 + TIMER_REG_CNTR0) -#define TIMER_CNTR1 (IO_TIMER1 + TIMER_REG_CNTR1) -#define TIMER_CNTR2 (IO_TIMER1 + TIMER_REG_CNTR2) -#define TIMER_MODE (IO_TIMER1 + TIMER_REG_MODE) - -#endif /* _KERNEL */ - -#endif /* _MACHINE_TIMERREG_H_ */ diff --git a/sys/amd64/include/timerreg.h b/sys/x86/include/timerreg.h similarity index 100% rename from sys/amd64/include/timerreg.h rename to sys/x86/include/timerreg.h diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c index efd85a496e10..cd4117b14114 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -69,10 +69,10 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> #include <machine/cpu.h> #include <machine/intr_machdep.h> -#include <machine/timerreg.h> #include <x86/apicvar.h> #include <x86/init.h> #include <x86/ppireg.h> +#include <x86/timerreg.h> #include <isa/rtc.h> #ifdef DEV_ISA
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304201643.33KGhHpp094572>