From nobody Thu Apr 20 16:43:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2Nks25qXz46J2V; Thu, 20 Apr 2023 16:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2Nkr6Nw0z4Qsy; Thu, 20 Apr 2023 16:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682008996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YWGMCcMUHmSDFT5EcbXLkhpE7QB29VOlQeHmrP6ZHSA=; b=BHNkHwEezwbFJGH+d7MjrWhHGUFNImycPQNOtrZHU+1mv5cEdcARUI9AnRKj0MP04TcDz5 mldzWBODeAZEKUj3oqA3itto/FPzincCBy7KAH+u9+p454HueQwrZBXDt7RVL2CHvkO2aS d2GO3uUVl0wuDMG3El+OJJDh7jAIsvSq+89y6hfvmtv7y/iD7FG+fjIuM87Vg74AMC5zGu 8xKHtTRsIJ4MgsTzqyVAlsJrnbf/jRlFA3Nf5mMbTmOEFdNh5nXU4FgbroUHPaQyq+C0T/ LTaiao/855lqwnsZZSUG2Phnl+gP8/7xlmqyagQLMKQTyKfuc2CvrUh48yjiqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682008996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YWGMCcMUHmSDFT5EcbXLkhpE7QB29VOlQeHmrP6ZHSA=; b=hwDgvFP+R24icSNpaP2W5f3iDHz/IBOV6ZVCt4MdzLfrrm+BsWtEoBkLb1iROLMVKjlo6E ez9LLnxrC6wEsDy8HNCeu4ftSQytWiQp+EYzy70eAc+79g0Rh75kOB7kYaCdjAlR7Wk320 YnryJamRVebjw8cDk+r8+dcjXhyZBH0os9AoquVJehn82Y2yA4QDL+JuAMGIDEE/Kjcp8o T0Nxn9L28775N4kFAEtBAm5SnlcZP2wErRauJBz+QupzAwtdC7QXabhFZh8aaPzilOXlRn 1yDVAsaNgixmNak0kwQs9iO8ZNdzo36ngOMwPYcLeLrNDRh3/9Hsn08RZfU+yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682008996; a=rsa-sha256; cv=none; b=aMNucU+RwAsCpWZ9s1jJSJ/LheLKQtqSwaJUQXAFOmOhYNojpqtnFfYgM+wvsHcWnMy4V/ 27ro9ixJu2GrrMPDROofHk7mSoHgGyNEDEbkbTPSA0Z4lQsGZvTClrnMMKcOvqA4OUS2cM iJNf+rhfA0rvnSZCdX4sflFThRshqtoZ69Wn/qurstAKdTm0gXAHOIOeDRt6Tm64PilQdD nmSNHV0nPZoehZE8mA7cXvCFfeN4R0c/yvTbHjr+XFS7bF8didWJVBRn4Kns3jW1y/7192 SEsIYiSiztnJ+3O/ufO6q5jUirUMuKvkHrhhyKemLqrBIdAEuRCwdCKicC0YQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2Nkr5TshzlLR; Thu, 20 Apr 2023 16:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33KGhGvY094552; Thu, 20 Apr 2023 16:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KGhG8n094551; Thu, 20 Apr 2023 16:43:16 GMT (envelope-from git) Date: Thu, 20 Apr 2023 16:43:16 GMT Message-Id: <202304201643.33KGhG8n094551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: d1f4c44aa8af - main - x86: Move i386 ppireg.h to x86 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1f4c44aa8aff72671f7787ea956f3b0a8dca784 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d1f4c44aa8aff72671f7787ea956f3b0a8dca784 commit d1f4c44aa8aff72671f7787ea956f3b0a8dca784 Author: Dmitry Chagin AuthorDate: 2023-04-20 16:42:59 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-20 16:42:59 +0000 x86: Move i386 ppireg.h to x86 Differential Revision: https://reviews.freebsd.org/D39655 MFC after: 1 month --- sys/amd64/acpica/acpi_wakecode.S | 2 +- sys/i386/acpica/acpi_wakecode.S | 2 +- sys/i386/include/ppireg.h | 51 ------------------------------------- sys/{amd64 => x86}/include/ppireg.h | 0 sys/x86/isa/clock.c | 2 +- 5 files changed, 3 insertions(+), 54 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakecode.S b/sys/amd64/acpica/acpi_wakecode.S index d4dc8058a01b..6a112c5ea438 100644 --- a/sys/amd64/acpica/acpi_wakecode.S +++ b/sys/amd64/acpica/acpi_wakecode.S @@ -30,9 +30,9 @@ */ #include -#include #include #include +#include #include "assym.inc" diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S index 682dadbf359f..ccbc67e5f588 100644 --- a/sys/i386/acpica/acpi_wakecode.S +++ b/sys/i386/acpica/acpi_wakecode.S @@ -30,9 +30,9 @@ */ #include -#include #include #include +#include #include "assym.inc" diff --git a/sys/i386/include/ppireg.h b/sys/i386/include/ppireg.h deleted file mode 100644 index 9794504da499..000000000000 --- a/sys/i386/include/ppireg.h +++ /dev/null @@ -1,51 +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$ - */ - -#ifndef _MACHINE_PPIREG_H_ -#define _MACHINE_PPIREG_H_ - -#ifdef _KERNEL - -#define IO_PPI 0x61 /* Programmable Peripheral Interface */ - -/* - * PPI speaker control values - */ - -#define PIT_ENABLETMR2 0x01 /* Enable timer/counter 2 */ -#define PIT_SPKRDATA 0x02 /* Direct to speaker */ - -#define PIT_SPKR (PIT_ENABLETMR2 | PIT_SPKRDATA) - -#define ppi_spkr_on() outb(IO_PPI, inb(IO_PPI) | PIT_SPKR) -#define ppi_spkr_off() outb(IO_PPI, inb(IO_PPI) & ~PIT_SPKR) - -#endif /* _KERNEL */ - -#endif /* _MACHINE_PPIREG_H_ */ diff --git a/sys/amd64/include/ppireg.h b/sys/x86/include/ppireg.h similarity index 100% rename from sys/amd64/include/ppireg.h rename to sys/x86/include/ppireg.h diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c index f0074ccc87ae..efd85a496e10 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -69,10 +69,10 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include +#include #include #ifdef DEV_ISA