Page MenuHomeFreeBSD
Files F131770836

D39655.id120565.diff
No OneTemporary
Actions

D39655.id120565.diff
View Options

diff --git a/sys/amd64/acpica/acpi_wakecode.S b/sys/amd64/acpica/acpi_wakecode.S
--- 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
--- 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
--- 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
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
--- a/sys/x86/isa/clock.c
+++ b/sys/x86/isa/clock.c
@@ -69,10 +69,10 @@
#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

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 12, 1:01 AM (1 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23593948
Default Alt Text
D39655.id120565.diff (3 KB)

Event Timeline