Date: Thu, 27 Mar 2014 13:57:01 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263815 - in head/sys: ia64/acpica ia64/ia64 ia64/include sys Message-ID: <201403271357.s2RDv1h1004609@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Thu Mar 27 13:57:00 2014 New Revision: 263815 URL: http://svnweb.freebsd.org/changeset/base/263815 Log: Move ia64 efi.h to sys in preparation for amd64 UEFI support Prototypes specific to ia64 have been left in this file for now, under __ia64__, rather than moving them to a new header under sys/ia64. I anticipate that (some of) the corresponding functions will be shared by the amd64, arm64, i386, and ia64 architectures, and we can adjust this as EFI support on other than ia64 continues to develop. Sponsored by: The FreeBSD Foundation Added: head/sys/sys/efi.h - copied, changed from r263814, head/sys/ia64/include/efi.h Deleted: head/sys/ia64/include/efi.h Modified: head/sys/ia64/acpica/OsdEnvironment.c head/sys/ia64/ia64/clock.c head/sys/ia64/ia64/dump_machdep.c head/sys/ia64/ia64/efi.c head/sys/ia64/ia64/iodev_machdep.c head/sys/ia64/ia64/machdep.c head/sys/ia64/ia64/nexus.c head/sys/ia64/ia64/pmap.c head/sys/ia64/ia64/sal.c head/sys/ia64/ia64/trap.c Modified: head/sys/ia64/acpica/OsdEnvironment.c ============================================================================== --- head/sys/ia64/acpica/OsdEnvironment.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/acpica/OsdEnvironment.c Thu Mar 27 13:57:00 2014 (r263815) @@ -29,8 +29,8 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> +#include <sys/efi.h> #include <sys/sysctl.h> -#include <machine/efi.h> #include <contrib/dev/acpica/include/acpi.h> Modified: head/sys/ia64/ia64/clock.c ============================================================================== --- head/sys/ia64/ia64/clock.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/clock.c Thu Mar 27 13:57:00 2014 (r263815) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/bus.h> +#include <sys/efi.h> #include <sys/interrupt.h> #include <sys/priority.h> #include <sys/proc.h> @@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <sys/pcpu.h> #include <machine/cpu.h> -#include <machine/efi.h> #include <machine/intr.h> #include <machine/intrcnt.h> #include <machine/md_var.h> Modified: head/sys/ia64/ia64/dump_machdep.c ============================================================================== --- head/sys/ia64/ia64/dump_machdep.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/dump_machdep.c Thu Mar 27 13:57:00 2014 (r263815) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/conf.h> #include <sys/cons.h> +#include <sys/efi.h> #include <sys/kernel.h> #include <sys/kerneldump.h> #ifdef SW_WATCHDOG @@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> #include <machine/bootinfo.h> -#include <machine/efi.h> #include <machine/elf.h> #include <machine/md_var.h> Modified: head/sys/ia64/ia64/efi.c ============================================================================== --- head/sys/ia64/ia64/efi.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/efi.c Thu Mar 27 13:57:00 2014 (r263815) @@ -29,9 +29,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/efi.h> #include <sys/systm.h> #include <machine/bootinfo.h> -#include <machine/efi.h> #include <machine/md_var.h> #include <machine/sal.h> #include <vm/vm.h> Modified: head/sys/ia64/ia64/iodev_machdep.c ============================================================================== --- head/sys/ia64/ia64/iodev_machdep.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/iodev_machdep.c Thu Mar 27 13:57:00 2014 (r263815) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/conf.h> +#include <sys/efi.h> #include <sys/fcntl.h> #include <sys/ioccom.h> #include <sys/malloc.h> @@ -37,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/bus.h> -#include <machine/efi.h> #include <machine/iodev.h> static int iodev_efivar_getvar(struct iodev_efivar_req *req); Modified: head/sys/ia64/ia64/machdep.c ============================================================================== --- head/sys/ia64/ia64/machdep.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/machdep.c Thu Mar 27 13:57:00 2014 (r263815) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/cons.h> #include <sys/cpu.h> +#include <sys/efi.h> #include <sys/eventhandler.h> #include <sys/exec.h> #include <sys/imgact.h> @@ -83,7 +84,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bootinfo.h> #include <machine/cpu.h> -#include <machine/efi.h> #include <machine/elf.h> #include <machine/fpu.h> #include <machine/intr.h> Modified: head/sys/ia64/ia64/nexus.c ============================================================================== --- head/sys/ia64/ia64/nexus.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/nexus.c Thu Mar 27 13:57:00 2014 (r263815) @@ -44,6 +44,7 @@ #include <sys/systm.h> #include <sys/bus.h> #include <sys/clock.h> +#include <sys/efi.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> @@ -55,7 +56,6 @@ #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/efi.h> #include <machine/intr.h> #include <machine/pmap.h> #include <machine/resource.h> Modified: head/sys/ia64/ia64/pmap.c ============================================================================== --- head/sys/ia64/ia64/pmap.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/pmap.c Thu Mar 27 13:57:00 2014 (r263815) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include "opt_pmap.h" #include <sys/param.h> +#include <sys/efi.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/lock.h> @@ -71,7 +72,6 @@ __FBSDID("$FreeBSD$"); #include <vm/uma.h> #include <machine/bootinfo.h> -#include <machine/efi.h> #include <machine/md_var.h> #include <machine/pal.h> Modified: head/sys/ia64/ia64/sal.c ============================================================================== --- head/sys/ia64/ia64/sal.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/sal.c Thu Mar 27 13:57:00 2014 (r263815) @@ -30,11 +30,11 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/efi.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <vm/vm.h> #include <vm/vm_kern.h> -#include <machine/efi.h> #include <machine/intr.h> #include <machine/md_var.h> #include <machine/sal.h> Modified: head/sys/ia64/ia64/trap.c ============================================================================== --- head/sys/ia64/ia64/trap.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/trap.c Thu Mar 27 13:57:00 2014 (r263815) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sysproto.h> #include <sys/kernel.h> #include <sys/proc.h> +#include <sys/efi.h> #include <sys/exec.h> #include <sys/lock.h> #include <sys/mutex.h> @@ -60,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include <machine/reg.h> #include <machine/pal.h> #include <machine/fpu.h> -#include <machine/efi.h> #include <machine/pcb.h> #ifdef SMP #include <machine/smp.h> Copied and modified: head/sys/sys/efi.h (from r263814, head/sys/ia64/include/efi.h) ============================================================================== --- head/sys/ia64/include/efi.h Thu Mar 27 13:15:22 2014 (r263814, copy source) +++ head/sys/sys/efi.h Thu Mar 27 13:57:00 2014 (r263815) @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#ifndef _MACHINE_EFI_H_ -#define _MACHINE_EFI_H_ +#ifndef _SYS_EFI_H_ +#define _SYS_EFI_H_ #include <sys/uuid.h> @@ -151,7 +151,7 @@ struct efi_systbl { uint64_t st_cfgtbl; }; -#ifdef _KERNEL +#if defined(_KERNEL) && defined(__ia64__) typedef u_long (*ia64_efi_f)(u_long, u_long, u_long, u_long); @@ -172,6 +172,6 @@ int efi_var_get(efi_char *, struct uuid int efi_var_nextname(size_t *, efi_char *, struct uuid *); int efi_var_set(efi_char *, struct uuid *, uint32_t, size_t, void *); -#endif /* _KERNEL */ +#endif /* _KERNEL && __ia64__ */ -#endif /* _MACHINE_EFI_H_ */ +#endif /* _SYS_EFI_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403271357.s2RDv1h1004609>