From d1f4c44aa8aff72671f7787ea956f3b0a8dca784 Mon Sep 17 00:00:00 2001
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Thu, 20 Apr 2023 19:42:59 +0300
Subject: [PATCH] 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(-)
 delete mode 100644 sys/i386/include/ppireg.h
 rename sys/{amd64 => x86}/include/ppireg.h (100%)

diff --git a/sys/amd64/acpica/acpi_wakecode.S b/sys/amd64/acpica/acpi_wakecode.S
index d4dc8058a01..6a112c5ea43 100644
--- a/sys/amd64/acpica/acpi_wakecode.S
+++ b/sys/amd64/acpica/acpi_wakecode.S
@@ -30,9 +30,9 @@
  */
 
 #include <machine/asmacros.h>
-#include <machine/ppireg.h>
 #include <machine/specialreg.h>
 #include <machine/timerreg.h>
+#include <x86/ppireg.h>
 
 #include "assym.inc"
 
diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S
index 682dadbf359..ccbc67e5f58 100644
--- a/sys/i386/acpica/acpi_wakecode.S
+++ b/sys/i386/acpica/acpi_wakecode.S
@@ -30,9 +30,9 @@
  */
 
 #include <machine/asmacros.h>
-#include <machine/ppireg.h>
 #include <machine/specialreg.h>
 #include <machine/timerreg.h>
+#include <x86/ppireg.h>
 
 #include "assym.inc"
 
diff --git a/sys/i386/include/ppireg.h b/sys/i386/include/ppireg.h
deleted file mode 100644
index 9794504da49..00000000000
--- 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 f0074ccc87a..efd85a496e1 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/ppireg.h>
 #include <machine/timerreg.h>
 #include <x86/apicvar.h>
 #include <x86/init.h>
+#include <x86/ppireg.h>
 
 #include <isa/rtc.h>
 #ifdef DEV_ISA