aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ObsoleteFiles.inc4
-rw-r--r--sys/i386/include/mptable.h146
-rw-r--r--sys/i386/xen/mptable.c2
-rw-r--r--sys/pc98/include/mptable.h6
-rw-r--r--sys/x86/include/mptable.h (renamed from sys/amd64/include/mptable.h)0
-rw-r--r--sys/x86/x86/mptable.c2
-rw-r--r--sys/x86/x86/mptable_pci.c2
7 files changed, 7 insertions, 155 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 8ddfc5e8e33c..97eea7e9e9a7 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,10 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20101109: headers moved to machine/ to x86/
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/include/machine/mptable.h
+.endif
# 20101101: headers moved to machine/ to x86/
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/include/machine/apicreg.h
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
deleted file mode 100644
index 451d9ce14d55..000000000000
--- a/sys/i386/include/mptable.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 1996, by Steve Passe
- * 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. The name of the developer may NOT be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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 THE 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_MPTABLE_H__
-#define __MACHINE_MPTABLE_H__
-
-enum busTypes {
- NOBUS = 0,
- EISA = 3,
- ISA = 6,
- MCA = 9,
- PCI = 13,
- MAX_BUSTYPE = 18,
- UNKNOWN_BUSTYPE = 0xff
-};
-
-/* MP Floating Pointer Structure */
-typedef struct MPFPS {
- char signature[4];
- u_int32_t pap;
- u_char length;
- u_char spec_rev;
- u_char checksum;
- u_char config_type;
- u_char mpfb2;
- u_char mpfb3;
- u_char mpfb4;
- u_char mpfb5;
-} *mpfps_t;
-
-#define MPFB2_IMCR_PRESENT 0x80
-#define MPFB2_MUL_CLK_SRCS 0x40
-
-/* MP Configuration Table Header */
-typedef struct MPCTH {
- char signature[4];
- u_short base_table_length;
- u_char spec_rev;
- u_char checksum;
- u_char oem_id[8];
- u_char product_id[12];
- u_int32_t oem_table_pointer;
- u_short oem_table_size;
- u_short entry_count;
- u_int32_t apic_address;
- u_short extended_table_length;
- u_char extended_table_checksum;
- u_char reserved;
-} *mpcth_t;
-
-#define MPCT_ENTRY_PROCESSOR 0
-#define MPCT_ENTRY_BUS 1
-#define MPCT_ENTRY_IOAPIC 2
-#define MPCT_ENTRY_INT 3
-#define MPCT_ENTRY_LOCAL_INT 4
-
-typedef struct PROCENTRY {
- u_char type;
- u_char apic_id;
- u_char apic_version;
- u_char cpu_flags;
- u_long cpu_signature;
- u_long feature_flags;
- u_long reserved1;
- u_long reserved2;
-} *proc_entry_ptr;
-
-#define PROCENTRY_FLAG_EN 0x01
-#define PROCENTRY_FLAG_BP 0x02
-
-typedef struct BUSENTRY {
- u_char type;
- u_char bus_id;
- char bus_type[6];
-} *bus_entry_ptr;
-
-typedef struct IOAPICENTRY {
- u_char type;
- u_char apic_id;
- u_char apic_version;
- u_char apic_flags;
- u_int32_t apic_address;
-} *io_apic_entry_ptr;
-
-#define IOAPICENTRY_FLAG_EN 0x01
-
-typedef struct INTENTRY {
- u_char type;
- u_char int_type;
- u_short int_flags;
- u_char src_bus_id;
- u_char src_bus_irq;
- u_char dst_apic_id;
- u_char dst_apic_int;
-} *int_entry_ptr;
-
-#define INTENTRY_TYPE_INT 0
-#define INTENTRY_TYPE_NMI 1
-#define INTENTRY_TYPE_SMI 2
-#define INTENTRY_TYPE_EXTINT 3
-
-#define INTENTRY_FLAGS_POLARITY 0x3
-#define INTENTRY_FLAGS_POLARITY_CONFORM 0x0
-#define INTENTRY_FLAGS_POLARITY_ACTIVEHI 0x1
-#define INTENTRY_FLAGS_POLARITY_ACTIVELO 0x3
-#define INTENTRY_FLAGS_TRIGGER 0xc
-#define INTENTRY_FLAGS_TRIGGER_CONFORM 0x0
-#define INTENTRY_FLAGS_TRIGGER_EDGE 0x4
-#define INTENTRY_FLAGS_TRIGGER_LEVEL 0xc
-
-/* descriptions of MP basetable entries */
-typedef struct BASETABLE_ENTRY {
- u_char type;
- u_char length;
- char name[16];
-} basetable_entry;
-
-#ifdef _KERNEL
-int mptable_pci_probe_table(int bus);
-int mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin);
-#endif
-#endif /* !__MACHINE_MPTABLE_H__ */
diff --git a/sys/i386/xen/mptable.c b/sys/i386/xen/mptable.c
index d9942aba0096..22019ea3d6f9 100644
--- a/sys/i386/xen/mptable.c
+++ b/sys/i386/xen/mptable.c
@@ -38,11 +38,11 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <x86/apicreg.h>
+#include <x86/mptable.h>
#include <machine/frame.h>
#include <machine/intr_machdep.h>
#include <machine/apicvar.h>
#include <machine/md_var.h>
-#include <machine/mptable.h>
#include <machine/specialreg.h>
#include <xen/hypervisor.h>
diff --git a/sys/pc98/include/mptable.h b/sys/pc98/include/mptable.h
deleted file mode 100644
index 2f6fb2d4aa65..000000000000
--- a/sys/pc98/include/mptable.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD$ */
-
-#include <i386/mptable.h>
diff --git a/sys/amd64/include/mptable.h b/sys/x86/include/mptable.h
index 451d9ce14d55..451d9ce14d55 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/x86/include/mptable.h
diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c
index b99e2b204b61..4b240a6cb606 100644
--- a/sys/x86/x86/mptable.c
+++ b/sys/x86/x86/mptable.c
@@ -39,11 +39,11 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <x86/apicreg.h>
+#include <x86/mptable.h>
#include <machine/frame.h>
#include <machine/intr_machdep.h>
#include <machine/apicvar.h>
#include <machine/md_var.h>
-#include <machine/mptable.h>
#include <machine/specialreg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/x86/x86/mptable_pci.c b/sys/x86/x86/mptable_pci.c
index 47a666d9781a..398444ce3141 100644
--- a/sys/x86/x86/mptable_pci.c
+++ b/sys/x86/x86/mptable_pci.c
@@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcib_private.h>
+#include <x86/mptable.h>
#include <machine/legacyvar.h>
-#include <machine/mptable.h>
#include <machine/pci_cfgreg.h>
#include "pcib_if.h"