summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Sommer <jan.sommer@dlr.de>2020-08-14 21:57:53 +0200
committerChris Johns <chrisj@rtems.org>2020-09-16 15:52:58 +1000
commit66019c3e788605ff63f210a677abd5c8edfb0aa0 (patch)
treec692b534899c69335a039506d67afd382e60251c
parent514ffab353bc06068bc80c218c418910dc3d5f89 (diff)
downloadrtems-libbsd-66019c3e788605ff63f210a677abd5c8edfb0aa0.tar.bz2
i386: Delete old machine dependent files
- The files in the i386 directory have been moved to common x86 directories by FreeBSD: - freebsd/sys/i386/include/machine/bus.h - freebsd/sys/x86/include/machine/legacyvar.h - freebsd/sys/x86/include/machine/specialreg.h - Add header files in rtemsbsd directory to direct compiler to new files
-rw-r--r--freebsd/sys/i386/include/machine/bus.h6
-rw-r--r--freebsd/sys/i386/include/machine/legacyvar.h63
-rw-r--r--freebsd/sys/i386/include/machine/specialreg.h6
-rw-r--r--rtemsbsd/include/x86/x86_var.h146
4 files changed, 1 insertions, 220 deletions
diff --git a/freebsd/sys/i386/include/machine/bus.h b/freebsd/sys/i386/include/machine/bus.h
deleted file mode 100644
index f1af2cf6..00000000
--- a/freebsd/sys/i386/include/machine/bus.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD$ */
-
-#include <x86/bus.h>
diff --git a/freebsd/sys/i386/include/machine/legacyvar.h b/freebsd/sys/i386/include/machine/legacyvar.h
deleted file mode 100644
index 14dd9e03..00000000
--- a/freebsd/sys/i386/include/machine/legacyvar.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
- * 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 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_LEGACYVAR_H_
-#define _MACHINE_LEGACYVAR_H_
-
-enum legacy_device_ivars {
- LEGACY_IVAR_PCIDOMAIN,
- LEGACY_IVAR_PCIBUS,
- LEGACY_IVAR_PCISLOT,
- LEGACY_IVAR_PCIFUNC
-};
-
-#define LEGACY_ACCESSOR(var, ivar, type) \
- __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
-
-LEGACY_ACCESSOR(pcidomain, PCIDOMAIN, uint32_t)
-LEGACY_ACCESSOR(pcibus, PCIBUS, uint32_t)
-LEGACY_ACCESSOR(pcislot, PCISLOT, int)
-LEGACY_ACCESSOR(pcifunc, PCIFUNC, int)
-
-#undef LEGACY_ACCESSOR
-
-int legacy_pcib_maxslots(device_t dev);
-uint32_t legacy_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func,
- u_int reg, int bytes);
-int legacy_pcib_read_ivar(device_t dev, device_t child, int which,
- uintptr_t *result);
-void legacy_pcib_write_config(device_t dev, u_int bus, u_int slot, u_int func,
- u_int reg, u_int32_t data, int bytes);
-int legacy_pcib_write_ivar(device_t dev, device_t child, int which,
- uintptr_t value);
-struct resource *legacy_pcib_alloc_resource(device_t dev, device_t child,
- int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
-int legacy_pcib_map_msi(device_t pcib, device_t dev, int irq,
- uint64_t *addr, uint32_t *data);
-
-#endif /* !_MACHINE_LEGACYVAR_H_ */
diff --git a/freebsd/sys/i386/include/machine/specialreg.h b/freebsd/sys/i386/include/machine/specialreg.h
deleted file mode 100644
index aace4bfd..00000000
--- a/freebsd/sys/i386/include/machine/specialreg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD$ */
-
-#include <x86/specialreg.h>
diff --git a/rtemsbsd/include/x86/x86_var.h b/rtemsbsd/include/x86/x86_var.h
index 2028d739..5819205a 100644
--- a/rtemsbsd/include/x86/x86_var.h
+++ b/rtemsbsd/include/x86/x86_var.h
@@ -1,145 +1 @@
-/*-
- * Copyright (c) 1995 Bruce D. Evans.
- * 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.
- * 3. Neither the name of the author nor the names of contributors
- * may 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 _X86_X86_VAR_H_
-#define _X86_X86_VAR_H_
-
-/*
- * Miscellaneous machine-dependent declarations.
- */
-
-extern long Maxmem;
-extern u_int basemem;
-extern int busdma_swi_pending;
-extern u_int cpu_exthigh;
-extern u_int cpu_feature;
-extern u_int cpu_feature2;
-extern u_int amd_feature;
-extern u_int amd_feature2;
-extern u_int amd_rascap;
-extern u_int amd_pminfo;
-extern u_int amd_extended_feature_extensions;
-extern u_int via_feature_rng;
-extern u_int via_feature_xcrypt;
-extern u_int cpu_clflush_line_size;
-extern u_int cpu_stdext_feature;
-extern u_int cpu_stdext_feature2;
-extern u_int cpu_stdext_feature3;
-extern uint64_t cpu_ia32_arch_caps;
-extern u_int cpu_fxsr;
-extern u_int cpu_high;
-extern u_int cpu_id;
-extern u_int cpu_max_ext_state_size;
-extern u_int cpu_mxcsr_mask;
-extern u_int cpu_procinfo;
-extern u_int cpu_procinfo2;
-extern char cpu_vendor[];
-extern u_int cpu_vendor_id;
-extern u_int cpu_mon_mwait_flags;
-extern u_int cpu_mon_min_size;
-extern u_int cpu_mon_max_size;
-extern u_int cpu_maxphyaddr;
-extern char ctx_switch_xsave[];
-extern u_int hv_base;
-extern u_int hv_high;
-extern char hv_vendor[];
-extern char kstack[];
-extern char sigcode[];
-extern int szsigcode;
-extern int vm_page_dump_size;
-extern int workaround_erratum383;
-extern int _udatasel;
-extern int _ucodesel;
-extern int _ucode32sel;
-extern int _ufssel;
-extern int _ugssel;
-extern int use_xsave;
-extern uint64_t xsave_mask;
-extern u_int max_apic_id;
-extern int i386_read_exec;
-extern int pti;
-extern int hw_ibrs_active;
-extern int hw_mds_disable;
-extern int hw_ssb_active;
-
-struct pcb;
-struct thread;
-struct reg;
-struct fpreg;
-struct dbreg;
-struct dumperinfo;
-struct trapframe;
-
-/*
- * The interface type of the interrupt handler entry point cannot be
- * expressed in C. Use simplest non-variadic function type as an
- * approximation.
- */
-typedef void alias_for_inthand_t(void);
-
-bool acpi_get_fadt_bootflags(uint16_t *flagsp);
-void *alloc_fpusave(int flags);
-void busdma_swi(void);
-vm_paddr_t cpu_getmaxphyaddr(void);
-bool cpu_mwait_usable(void);
-void cpu_probe_amdc1e(void);
-void cpu_setregs(void);
-bool disable_wp(void);
-void restore_wp(bool old_wp);
-void dump_add_page(vm_paddr_t);
-void dump_drop_page(vm_paddr_t);
-void finishidentcpu(void);
-void identify_cpu1(void);
-void identify_cpu2(void);
-void identify_cpu_fixup_bsp(void);
-void identify_hypervisor(void);
-void initializecpu(void);
-void initializecpucache(void);
-bool fix_cpuid(void);
-void fillw(int /*u_short*/ pat, void *base, size_t cnt);
-int is_physical_memory(vm_paddr_t addr);
-int isa_nmi(int cd);
-void handle_ibrs_entry(void);
-void handle_ibrs_exit(void);
-void hw_ibrs_recalculate(void);
-void hw_mds_recalculate(void);
-void hw_ssb_recalculate(bool all_cpus);
-void nmi_call_kdb(u_int cpu, u_int type, struct trapframe *frame);
-void nmi_call_kdb_smp(u_int type, struct trapframe *frame);
-void nmi_handle_intr(u_int type, struct trapframe *frame);
-void pagecopy(void *from, void *to);
-void printcpuinfo(void);
-int pti_get_default(void);
-int user_dbreg_trap(register_t dr6);
-int minidumpsys(struct dumperinfo *);
-struct pcb *get_pcb_td(struct thread *td);
-
-#endif
+#include <machine/x86_var.h>